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

Comparing ray/src/rt/pmutil.c (file contents):
Revision 2.3 by rschregle, Fri Feb 9 14:57:42 2018 UTC vs.
Revision 2.4 by rschregle, Thu Jan 23 18:27:02 2020 UTC

# Line 75 | Line 75 | void loadPmaps (PhotonMap **pmaps, const PhotonMapPara
75           /* Assign to appropriate photon map type (deleting previously
76            * loaded photon map of same type if necessary) */
77           if (pmaps [type]) {
78 +            sprintf(errmsg, "multiple %s photon maps, dropping previous",
79 +                    pmapName [type]);
80 +            error(WARNING, errmsg);
81              deletePhotons(pmaps [type]);
82              free(pmaps [type]);
83           }
84           pmaps [type] = pm;
85          
86 <         /* Check for invalid density estimate bandwidth */                            
86 >         /* Check for valid density estimate bandwidths */
87 >         if ((pm -> minGather > 1 || pm -> maxGather > 1) &&
88 >             (type == PMAP_TYPE_PRECOMP)) {
89 >            /* Force bwidth to 1 for precomputed pmap */
90 >            error(WARNING, "ignoring bandwidth for precomp photon map");
91 >            pm -> minGather = pm -> maxGather = 1;
92 >         }
93 >                    
94 >         if ((pm -> maxGather > pm -> minGather) &&
95 >             (type == PMAP_TYPE_VOLUME)) {            
96 >            /* Biascomp for volume pmaps (see volumePhotonDensity() below)
97 >               is considered redundant, and there's probably no point in
98 >               recovering by using the lower bandwidth, since it's probably
99 >               not what the user wants, so bail out. */
100 >            sprintf(errmsg,
101 >                    "bias compensation is not available with %s photon maps",
102 >                    pmapName [type]);
103 >            error(USER, errmsg);
104 >         }
105 >        
106           if (pm -> maxGather > pm -> numPhotons) {
107              error(WARNING, "adjusting density estimate bandwidth");
108              pm -> minGather = pm -> maxGather = pm -> numPhotons;
109 <         }
109 >         }            
110        }
111   }
112  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines