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 1.2 by greg, Tue Apr 11 13:30:31 1989 UTC vs.
Revision 1.4 by greg, Sun May 7 17:50:51 1989 UTC

# Line 22 | Line 22 | extern double  minweight;              /* minimum ray weight */
22  
23   long  nrays = 0L;                       /* number of rays traced */
24  
25 < #define  MAXLOOP        32              /* modifier loop detection */
25 > #define  MAXLOOP        1024            /* modifier loop detection */
26  
27   #define  RAYHIT         (-1)            /* return value for intercepted ray */
28  
# Line 56 | Line 56 | double  rw;
56          r->newcset = r->clipset;
57          r->ro = NULL;
58          r->rot = FHUGE;
59        r->rofs = 1.0; setident4(r->rofx);
60        r->robs = 1.0; setident4(r->robx);
59          r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
60          setcolor(r->pcol, 1.0, 1.0, 1.0);
61          setcolor(r->rcol, 0.0, 0.0, 0.0);
# Line 104 | Line 102 | int  mod;
102          register OBJREC  *m;
103                                          /* check for infinite loop */
104          if (depth++ >= MAXLOOP)
105 <                objerror(r->ro, USER, "material loop");
105 >                objerror(r->ro, USER, "possible modifier loop");
106          for ( ; mod != OVOID; mod = m->omod) {
107                  m = objptr(mod);
108 +                /****** unnecessary test since modifier() is always called
109                  if (!ismodifier(m->otype)) {
110                          sprintf(errmsg, "illegal modifier \"%s\"", m->oname);
111                          error(USER, errmsg);
112                  }
113 +                ******/
114                  (*ofun[m->otype].funp)(m, r);   /* execute function */
115                  m->lastrno = r->rno;
116                  if (ismaterial(m->otype)) {     /* materials call raytexture */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines