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

Comparing ray/src/common/bsdf_m.c (file contents):
Revision 3.7 by greg, Wed Feb 23 21:58:31 2011 UTC vs.
Revision 3.8 by greg, Thu Feb 24 20:14:26 2011 UTC

# Line 157 | Line 157 | SDnewMatrix(int ni, int no)
157   /* Free a BSDF matrix */
158   #define SDfreeMatrix            free
159  
160 < /* get vector for this angle basis index */
160 > /* get vector for this angle basis index (front exiting) */
161   static int
162 < ab_getvec(FVECT v, int ndx, double randX, void *p)
162 > fo_getvec(FVECT v, int ndx, double randX, void *p)
163   {
164          ANGLE_BASIS  *ab = (ANGLE_BASIS *)p;
165          double          rx[2];
# Line 181 | Line 181 | ab_getvec(FVECT v, int ndx, double randX, void *p)
181          return RC_GOOD;
182   }
183  
184 < /* get index corresponding to the given vector */
184 > /* get index corresponding to the given vector (front exiting) */
185   static int
186 < ab_getndx(const FVECT v, void *p)
186 > fo_getndx(const FVECT v, void *p)
187   {
188          ANGLE_BASIS  *ab = (ANGLE_BASIS *)p;
189          int     li, ndx;
# Line 210 | Line 210 | ab_getndx(const FVECT v, void *p)
210   /* compute square of real value */
211   static double sq(double x) { return x*x; }
212  
213 < /* get projected solid angle for this angle basis index */
213 > /* get projected solid angle for this angle basis index (universal) */
214   static double
215 < ab_getohm(int ndx, void *p)
215 > io_getohm(int ndx, void *p)
216   {
217          static int      last_li = -1;
218          static double   last_ohm;
# Line 235 | Line 235 | ab_getohm(int ndx, void *p)
235                                  (double)ab->lat[li].nphis;
236   }
237  
238 < /* get reverse vector for this angle basis index */
238 > /* get vector for this angle basis index (back incident) */
239   static int
240 < ab_getvecR(FVECT v, int ndx, double randX, void *p)
240 > bi_getvec(FVECT v, int ndx, double randX, void *p)
241   {
242 <        int     na = (*(ANGLE_BASIS *)p).nangles;
243 <
244 <        if (!ab_getvec(v, ndx, randX, p))
242 >        if (!fo_getvec(v, ndx, randX, p))
243                  return RC_FAIL;
244  
245          v[0] = -v[0];
# Line 251 | Line 249 | ab_getvecR(FVECT v, int ndx, double randX, void *p)
249          return RC_GOOD;
250   }
251  
252 < /* get index corresponding to the reverse vector */
252 > /* get index corresponding to the vector (back incident) */
253   static int
254 < ab_getndxR(const FVECT v, void *p)
254 > bi_getndx(const FVECT v, void *p)
255   {
256          FVECT  v2;
257          
# Line 261 | Line 259 | ab_getndxR(const FVECT v, void *p)
259          v2[1] = -v[1];
260          v2[2] = -v[2];
261  
262 <        return ab_getndx(v2, p);
262 >        return fo_getndx(v2, p);
263   }
264  
265 + /* get vector for this angle basis index (back exiting) */
266 + static int
267 + bo_getvec(FVECT v, int ndx, double randX, void *p)
268 + {
269 +        if (!fo_getvec(v, ndx, randX, p))
270 +                return RC_FAIL;
271 +
272 +        v[2] = -v[2];
273 +
274 +        return RC_GOOD;
275 + }
276 +
277 + /* get index corresponding to the vector (back exiting) */
278 + static int
279 + bo_getndx(const FVECT v, void *p)
280 + {
281 +        FVECT  v2;
282 +        
283 +        v2[0] = v[0];
284 +        v2[1] = v[1];
285 +        v2[2] = -v[2];
286 +
287 +        return fo_getndx(v2, p);
288 + }
289 +
290 + /* get vector for this angle basis index (front incident) */
291 + static int
292 + fi_getvec(FVECT v, int ndx, double randX, void *p)
293 + {
294 +        if (!fo_getvec(v, ndx, randX, p))
295 +                return RC_FAIL;
296 +
297 +        v[0] = -v[0];
298 +        v[1] = -v[1];
299 +
300 +        return RC_GOOD;
301 + }
302 +
303 + /* get index corresponding to the vector (front incident) */
304 + static int
305 + fi_getndx(const FVECT v, void *p)
306 + {
307 +        FVECT  v2;
308 +        
309 +        v2[0] = -v[0];
310 +        v2[1] = -v[1];
311 +        v2[2] = v[2];
312 +
313 +        return fo_getndx(v2, p);
314 + }
315 +
316   /* load custom BSDF angle basis */
317   static int
318   load_angle_basis(ezxml_t wab)
# Line 362 | Line 411 | load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
411          SDSpectralDF    *df;
412          SDMat           *dp;
413          char            *sdata;
414 <        int             tback;
414 >        int             tfront;
415          int             inbi, outbi;
416          int             i;
417                                          /* allocate BSDF component */
418          sdata = ezxml_txt(ezxml_child(wdb, "WavelengthDataDirection"));
419 <        if ((tback = !strcasecmp(sdata, "Transmission Back")) ||
419 >        /*
420 >         * Remember that front and back are reversed from WINDOW 6 orientations
421 >         */
422 >        if ((tfront = !strcasecmp(sdata, "Transmission Back")) ||
423                          (sd->tf == NULL &&
424                                  !strcasecmp(sdata, "Transmission Front"))) {
425                  if (sd->tf != NULL)
# Line 424 | Line 476 | load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
476          dp->ib_priv = &abase_list[inbi];
477          dp->ob_priv = &abase_list[outbi];
478          if (df == sd->tf) {
479 <                if (tback) {
480 <                        dp->ib_vec = &ab_getvecR;
481 <                        dp->ib_ndx = &ab_getndxR;
482 <                        dp->ob_vec = &ab_getvec;
483 <                        dp->ob_ndx = &ab_getndx;
479 >                if (tfront) {
480 >                        dp->ib_vec = &fi_getvec;
481 >                        dp->ib_ndx = &fi_getndx;
482 >                        dp->ob_vec = &bo_getvec;
483 >                        dp->ob_ndx = &bo_getndx;
484                  } else {
485 <                        dp->ib_vec = &ab_getvec;
486 <                        dp->ib_ndx = &ab_getndx;
487 <                        dp->ob_vec = &ab_getvecR;
488 <                        dp->ob_ndx = &ab_getndxR;
485 >                        dp->ib_vec = &bi_getvec;
486 >                        dp->ib_ndx = &bi_getndx;
487 >                        dp->ob_vec = &fo_getvec;
488 >                        dp->ob_ndx = &fo_getndx;
489                  }
490          } else if (df == sd->rf) {
491 <                dp->ib_vec = &ab_getvec;
492 <                dp->ib_ndx = &ab_getndx;
493 <                dp->ob_vec = &ab_getvec;
494 <                dp->ob_ndx = &ab_getndx;
491 >                dp->ib_vec = &fi_getvec;
492 >                dp->ib_ndx = &fi_getndx;
493 >                dp->ob_vec = &fo_getvec;
494 >                dp->ob_ndx = &fo_getndx;
495          } else /* df == sd->rb */ {
496 <                dp->ib_vec = &ab_getvecR;
497 <                dp->ib_ndx = &ab_getndxR;
498 <                dp->ob_vec = &ab_getvecR;
499 <                dp->ob_ndx = &ab_getndxR;
496 >                dp->ib_vec = &bi_getvec;
497 >                dp->ib_ndx = &bi_getndx;
498 >                dp->ob_vec = &bo_getvec;
499 >                dp->ob_ndx = &bo_getndx;
500          }
501 <        dp->ib_ohm = &ab_getohm;
502 <        dp->ob_ohm = &ab_getohm;
501 >        dp->ib_ohm = &io_getohm;
502 >        dp->ob_ohm = &io_getohm;
503          df->comp[0].cspec[0] = c_dfcolor; /* XXX monochrome for now */
504          df->comp[0].dist = dp;
505          df->comp[0].func = &SDhandleMtx;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines