ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/pmapsrc.c
(Generate patch)

Comparing ray/src/rt/pmapsrc.c (file contents):
Revision 2.4 by greg, Thu May 21 13:54:59 2015 UTC vs.
Revision 2.9 by rschregle, Tue Sep 22 15:08:31 2015 UTC

# Line 1 | Line 1
1 + #ifndef lint
2 + static const char RCSid[] = "$Id$";
3 + #endif
4   /*
5     ==================================================================
6     Photon map support routines for emission from light sources
# Line 7 | Line 10
10     (c) Lucerne University of Applied Sciences and Arts,
11     supported by the Swiss National Science Foundation (SNSF, #147053)
12     ==================================================================
13 <  
11 <   $Id$
13 >
14   */
15  
16  
# Line 532 | Line 534 | void getPhotonPorts ()
534     for (i = 0; i < nobjects; i++) {
535        obj = objptr(i);
536        
537 <      if (inset(ambset, obj -> omod)) {
537 >      /* Check if object is a surface and resolve its material via any
538 >       * aliases, then check for inclusion in port modifier list */
539 >      if (issurface(obj -> otype) &&
540 >          inset(ambset, objndx(findmaterial(obj)))) {
541           /* Add photon port */
542           photonPorts = (SRCREC*)realloc(photonPorts,
543                                          (numPhotonPorts + 1) *
# Line 671 | Line 676 | void initPhotonEmission (EmissionMap *emap, float numP
676          
677        VCOPY(r.rorg, emap -> photonOrg);
678        VCOPY(r.rop, emap -> photonOrg);
679 <      r.rmax = FHUGE;
679 >      r.rmax = 0;
680        
681        for (t = 0; t < emap -> numTheta; t++) {
682           for (p = 0; p < emap -> numPhi; p++) {
# Line 746 | Line 751 | void emitPhoton (const EmissionMap* emap, RAY* ray)
751     /* Choose a new origin within current partition for every
752        emitted photon to break up clustering artifacts */
753     photonOrigin [emap -> src -> so -> otype] ((EmissionMap*)emap);
754 +   /* If we have a local glow source with a maximum radius, then
755 +      restrict our photon to the specified distance (otherwise no limit) */
756 +   if (mod -> otype == MAT_GLOW && !(emap -> src -> sflags & SDISTANT)
757 +                && mod -> oargs.farg[3] > FTINY)
758 +      ray -> rmax = mod -> oargs.farg[3];
759 +   else
760 +      ray -> rmax = 0;
761     rayorigin(ray, PRIMARY, NULL, NULL);
750 –   ray -> rmax = FHUGE;
762    
763     if (!emap -> numSamples) {
764        /* Source is unmodified and has no port, and either local with

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)