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

Comparing ray/src/rt/normal.c (file contents):
Revision 2.10 by greg, Thu Jan 30 11:37:00 1992 UTC vs.
Revision 2.11 by greg, Fri Feb 21 14:53:16 1992 UTC

# Line 43 | Line 43 | extern double  specjitter;             /* specular sampling jitte
43                                  /* specularity flags */
44   #define  SP_REFL        01              /* has reflected specular component */
45   #define  SP_TRAN        02              /* has transmitted specular */
46 < #define  SP_PURE        010             /* purely specular (zero roughness) */
47 < #define  SP_FLAT        020             /* flat reflecting surface */
48 < #define  SP_RBLT        040             /* reflection below sample threshold */
49 < #define  SP_TBLT        0100            /* transmission below threshold */
46 > #define  SP_PURE        04              /* purely specular (zero roughness) */
47 > #define  SP_FLAT        010             /* flat reflecting surface */
48 > #define  SP_RBLT        020             /* reflection below sample threshold */
49 > #define  SP_TBLT        040             /* transmission below threshold */
50  
51   typedef struct {
52          OBJREC  *mp;            /* material pointer */
# Line 254 | Line 254 | register RAY  *r;
254                          transtest *= bright(lr.rcol);
255                          transdist = r->rot + lr.rt;
256                  }
257 <        }
257 >        } else
258 >                transtest = 0;
259  
260          if (r->crtype & SHADOW)                 /* the rest is shadow */
261                  return;
# Line 364 | Line 365 | register NORMDAT  *np;
365                  else
366                          VCOPY(sr.rdir, np->prdir);      /* else no jitter */
367                  rayvalue(&sr);
368 <                multcolor(sr.rcol, np->scolor);
368 >                scalecolor(sr.rcol, np->tspec);
369 >                multcolor(sr.rcol, np->mcolor);         /* modified by color */
370                  addcolor(r->rcol, sr.rcol);
371                  ndims--;
372          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines