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

Comparing ray/src/common/rglsurf.c (file contents):
Revision 3.11 by schorsch, Fri Nov 14 17:22:06 2003 UTC vs.
Revision 3.13 by greg, Wed Apr 25 22:21:06 2012 UTC

# Line 115 | Line 115 | newtess()                      /* allocate GLU tessellation object */
115          gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin);
116          gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv);
117          gluTessCallback(gluto, GLU_TESS_END, glEnd);
118 <        gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine);
119 <        gluTessCallback(gluto, GLU_TESS_ERROR, glu_error);
118 >        gluTessCallback(gluto, GLU_TESS_COMBINE, (void*)myCombine);
119 >        gluTessCallback(gluto, GLU_TESS_ERROR, (void*)glu_error);
120          gluTessProperty(gluto, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_NONZERO);
121   }
122  
# Line 127 | Line 127 | newquadric()                   /* allocate GLU quadric structure */
127          if ((gluqo = gluNewQuadric()) == NULL)
128                  error(INTERNAL, "gluNewQuadric failed");
129          gluQuadricDrawStyle(gluqo, GLU_FILL);
130 <        gluQuadricCallback(gluqo, GLU_ERROR, glu_error);
130 >        gluQuadricCallback(gluqo, GLU_ERROR, (void*)glu_error);
131   }
132  
133  
# Line 253 | Line 253 | register OBJREC *o;
253          } else if (!iscyl && o->oargs.farg[7] < -FTINY)
254                  objerror(o, USER, "illegal radii");
255          if (o->oargs.farg[6] <= FTINY && (iscyl || o->oargs.farg[7] <= FTINY))
256 <                return; /* XXX we should return a value here */
256 >                return(0);
257          if (!iscyl) {
258                  if (o->oargs.farg[6] < 0.)      /* complains for tiny neg's */
259                          o->oargs.farg[6] = 0.;
# Line 262 | Line 262 | register OBJREC *o;
262          }
263          h = sqrt(dist2(o->oargs.farg,o->oargs.farg+3));
264          if (h <= FTINY)
265 <                return; /* XXX we should return a value here */
265 >                return(0);
266          cent[0] = .5*(o->oargs.farg[0] + o->oargs.farg[3]);
267          cent[1] = .5*(o->oargs.farg[1] + o->oargs.farg[4]);
268          cent[2] = .5*(o->oargs.farg[2] + o->oargs.farg[5]);
# Line 315 | Line 315 | register OBJREC        *o;
315          if (o->oargs.farg[6] < 0.)              /* complains for tiny neg's */
316                  o->oargs.farg[6] = 0.;
317          if (o->oargs.farg[7] - o->oargs.farg[6] <= FTINY)
318 <                return; /* XXX we should return a value here */
318 >                return(0);
319          h = VLEN(o->oargs.farg+3);
320          if (h <= FTINY)
321 <                return; /* XXX we should return a value here */
321 >                return(0);
322          if (dolights)
323                  doflatsrc((MATREC *)o->os, o->oargs.farg, o->oargs.farg+3,
324                                  PI*(o->oargs.farg[7]*o->oargs.farg[7] -

Diff Legend

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