ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/rglsurf.c

Comparing ray/src/common/rglsurf.c (file contents):
Revision 3.8 by greg, Sun May 25 06:09:44 2003 UTC vs.
Revision 3.9 by greg, Sun May 25 15:41:31 2003 UTC

#	Line 259 | Line 259 | register OBJREC *o;
259		if (o->oargs.farg[7] < 0.)
260		o->oargs.farg[7] = 0.;
261		}
262	+	h = sqrt(dist2(o->oargs.farg,o->oargs.farg+3));
263	+	if (h <= FTINY)
264	+	return;
265		cent[0] = .5*(o->oargs.farg[0] + o->oargs.farg[3]);
266		cent[1] = .5*(o->oargs.farg[1] + o->oargs.farg[4]);
267		cent[2] = .5*(o->oargs.farg[2] + o->oargs.farg[5]);
#	Line 274 | Line 277 | register OBJREC *o;
277		glTranslated((GLdouble)o->oargs.farg[0], (GLdouble)o->oargs.farg[1],
278		(GLdouble)o->oargs.farg[2]);
279		/* compute height & rotation angle */
277	–	h = sqrt(dist2(o->oargs.farg,o->oargs.farg+3));
278	–	if (h <= FTINY)
279	–	return;
280		x1 = o->oargs.farg[1] - o->oargs.farg[4];
281		y1 = o->oargs.farg[3] - o->oargs.farg[0];
282		/* z1 = 0; */
#	Line 315 | Line 315 | register OBJREC        *o;
315		o->oargs.farg[6] = 0.;
316		if (o->oargs.farg[7] - o->oargs.farg[6] <= FTINY)
317		return;
318	+	h = VLEN(o->oargs.farg+3);
319	+	if (h <= FTINY)
320	+	return;
321		if (dolights)
322		doflatsrc((MATREC *)o->os, o->oargs.farg, o->oargs.farg+3,
323		PI*(o->oargs.farg[7]*o->oargs.farg[7] -
#	Line 329 | Line 332 | register OBJREC        *o;
332		glTranslated((GLdouble)o->oargs.farg[0], (GLdouble)o->oargs.farg[1],
333		(GLdouble)o->oargs.farg[2]);
334		/* compute rotation angle */
332	–	h = VLEN(o->oargs.farg+3);
333	–	if (h <= FTINY)
334	–	return;
335		x1 = -o->oargs.farg[4];
336		y1 = o->oargs.farg[3];
337		/* z1 = 0; */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)