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

Comparing ray/src/rt/pmapsrc.c (file contents):
Revision 2.5 by greg, Fri May 22 11:38:26 2015 UTC vs.
Revision 2.15 by rschregle, Tue Mar 20 19:55:33 2018 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 18 | Line 20
20   #include "pmaprand.h"
21   #include "otypes.h"
22  
23 <
24 <
25 < SRCREC *photonPorts = NULL;             /* Photon port list */
23 > /* List of photon port modifier names */
24 > char *photonPortList [MAXSET + 1] = {NULL};
25 > /* Photon port objects (with modifiers in photonPortMods) */
26 > SRCREC *photonPorts = NULL;
27   unsigned numPhotonPorts = 0;
28  
29   void (*photonPartition [NUMOTYPE]) (EmissionMap*);
30   void (*photonOrigin [NUMOTYPE]) (EmissionMap*);
31  
29 extern OBJECT ambset [];
30
32    
33  
34   static int flatPhotonPartition2 (EmissionMap* emap, unsigned long mp,
# Line 519 | Line 520 | static void cylPhotonOrigin (EmissionMap* emap)
520  
521  
522  
523 < void getPhotonPorts ()
524 < /* Find geometry declared as photon ports */
523 > void getPhotonPorts (char **portList)
524 > /* Find geometry declared as photon ports from modifiers in portList */
525   {
526     OBJECT i;
527 <   OBJREC* obj;
527 >   OBJREC *obj, *mat;
528 >   char **lp;  
529    
530     /* Check for missing port modifiers */
531 <   if (!ambset [0])
532 <      error(USER, "no photon ports found");
531 >   if (!portList [0])
532 >      error(USER, "no photon ports");
533    
534     for (i = 0; i < nobjects; i++) {
535        obj = objptr(i);
536 +      mat = findmaterial(obj);
537        
538 <      if (inset(ambset, obj -> omod)) {
539 <         /* Add photon port */
540 <         photonPorts = (SRCREC*)realloc(photonPorts,
541 <                                        (numPhotonPorts + 1) *
542 <                                        sizeof(SRCREC));
540 <         if (!photonPorts)
541 <            error(USER, "can't allocate photon ports");
542 <            
543 <         photonPorts [numPhotonPorts].so = obj;
544 <         photonPorts [numPhotonPorts].sflags = 0;
538 >      /* Check if object is a surface and NOT a light source (duh) and
539 >       * resolve its material via any aliases, then check for inclusion in
540 >       * modifier list */
541 >      if (issurface(obj -> otype) && mat && !islight(mat -> otype)) {
542 >         for (lp = portList; *lp && strcmp(mat -> oname, *lp); lp++);
543          
544 <         if (!sfun [obj -> otype].of || !sfun[obj -> otype].of -> setsrc)
545 <            objerror(obj, USER, "illegal photon port");
544 >         if (*lp) {
545 >            /* Add photon port */
546 >            photonPorts = (SRCREC*)realloc(photonPorts,
547 >                                           (numPhotonPorts + 1) *
548 >                                           sizeof(SRCREC));
549 >            if (!photonPorts)
550 >               error(USER, "can't allocate photon ports");
551              
552 <         setsource(photonPorts + numPhotonPorts, obj);
553 <         numPhotonPorts++;
552 >            photonPorts [numPhotonPorts].so = obj;
553 >            photonPorts [numPhotonPorts].sflags = 0;
554 >        
555 >            if (!sfun [obj -> otype].of || !sfun[obj -> otype].of -> setsrc)
556 >               objerror(obj, USER, "illegal photon port");
557 >        
558 >            setsource(photonPorts + numPhotonPorts, obj);
559 >            numPhotonPorts++;
560 >         }
561        }
562     }
563 +  
564 +   if (!numPhotonPorts)
565 +      error(USER, "no valid photon ports found");
566   }
567  
568  
# Line 747 | Line 760 | void emitPhoton (const EmissionMap* emap, RAY* ray)
760        emitted photon to break up clustering artifacts */
761     photonOrigin [emap -> src -> so -> otype] ((EmissionMap*)emap);
762     /* If we have a local glow source with a maximum radius, then
763 <      restrict our photon to the specified distance (otherwise no limit) */
764 <   if (mod -> otype == MAT_GLOW && emap -> src -> so -> otype != OBJ_SOURCE
763 >      restrict our photon to the specified distance, otherwise we set
764 >      the limit imposed by photonMaxDist (or no limit if 0) */
765 >   if (mod -> otype == MAT_GLOW && !(emap -> src -> sflags & SDISTANT)
766                  && mod -> oargs.farg[3] > FTINY)
767        ray -> rmax = mod -> oargs.farg[3];
768     else
769 <      ray -> rmax = 0;
769 >      ray -> rmax = photonMaxDist;
770     rayorigin(ray, PRIMARY, NULL, NULL);
771    
772     if (!emap -> numSamples) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines