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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.38 by greg, Tue Mar 11 19:29:05 2003 UTC vs.
Revision 2.42 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 20 | Line 20 | static const char RCSid[] = "$Id$";
20   unsigned long  raynum = 0;              /* next unique ray number */
21   unsigned long  nrays = 0;               /* number of calls to localhit */
22  
23 < static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
23 > static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
24   OBJREC  Lamb = {
25          OVOID, MAT_PLASTIC, "Lambertian",
26          {0, 5, NULL, Lambfa}, NULL,
# Line 228 | Line 228 | register RAY  *r;
228   }
229  
230  
231 + void
232   raytexture(r, mod)                      /* get material modifiers */
233   RAY  *r;
234 < int  mod;
234 > OBJECT  mod;
235   {
236          register OBJREC  *m;
237   #if  MAXLOOP
# Line 277 | Line 278 | double  coef;
278                                          /* compute foreground and background */
279          foremat = backmat = 0;
280                                          /* foreground */
281 <        copystruct(&fr, r);
281 >        fr = *r;
282          if (coef > FTINY)
283                  foremat = rayshade(&fr, fore);
284                                          /* background */
285 <        copystruct(&br, r);
285 >        br = *r;
286          if (coef < 1.0-FTINY)
287                  backmat = rayshade(&br, back);
288                                          /* check for transparency */
289 <        if (backmat ^ foremat)
289 >        if (backmat ^ foremat) {
290                  if (backmat && coef > FTINY)
291                          raytrans(&fr);
292                  else if (foremat && coef < 1.0-FTINY)
293                          raytrans(&br);
294 +        }
295                                          /* mix perturbations */
296          for (i = 0; i < 3; i++)
297                  r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
# Line 486 | Line 488 | register CUBE  *scene;
488          }
489          cxset[0] = 0;
490          raymove(curpos, cxset, sflags, r, scene);
491 <        return(r->ro != NULL & r->ro != &Aftplane);
491 >        return((r->ro != NULL) & (r->ro != &Aftplane));
492   }
493  
494  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines