ViewVC Help

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

root/Development/ray/src/rt/raytrace.c

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.38 by greg, Tue Mar 11 19:29:05 2003 UTC vs.
Revision 2.44 by greg, Wed Dec 31 01:50:02 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 31 | Line 31 | OBJREC  Aftplane;                      /* aft clipping plane object */
31		static int  raymove(), checkhit();
32		static void  checkset();
33
34	–	#ifndef  MAXLOOP
35	–	#define  MAXLOOP        0               /* modifier loop detection */
36	–	#endif
37	–
34		#define  RAYHIT         (-1)            /* return value for intercepted ray */
35
36
#	Line 158 | Line 154 | int  mod;
154		{
155		int  gotmat;
156		register OBJREC  *m;
161	–	#if  MAXLOOP
162	–	static int  depth = 0;
163	–	/* check for infinite loop */
164	–	if (depth++ >= MAXLOOP)
165	–	objerror(r->ro, USER, "possible modifier loop");
166	–	#endif
157		r->rt = r->rot;                 /* set effective ray length */
158		for (gotmat = 0; !gotmat && mod != OVOID; mod = m->omod) {
159		m = objptr(mod);
#	Line 175 | Line 165 | int  mod;
165		******/
166		/* hack for irradiance calculation */
167		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
168	+	m->otype != MAT_CLIP &&
169		(ofun[m->otype].flags & (T_M|T_X))) {
170		if (irr_ignore(m->otype)) {
180	–	#if  MAXLOOP
181	–	depth--;
182	–	#endif
171		raytrans(r);
172		return(1);
173		}
#	Line 189 | Line 177 | int  mod;
177		/* materials call raytexture */
178		gotmat = (*ofun[m->otype].funp)(m, r);
179		}
192	–	#if  MAXLOOP
193	–	depth--;
194	–	#endif
180		return(gotmat);
181		}
182
#	Line 228 | Line 213 | register RAY  *r;
213		}
214
215
216	+	void
217		raytexture(r, mod)                      /* get material modifiers */
218		RAY  *r;
219	<	int  mod;
219	>	OBJECT  mod;
220		{
221		register OBJREC  *m;
236	–	#if  MAXLOOP
237	–	static int  depth = 0;
238	–	/* check for infinite loop */
239	–	if (depth++ >= MAXLOOP)
240	–	objerror(r->ro, USER, "modifier loop");
241	–	#endif
222		/* execute textures and patterns */
223		for ( ; mod != OVOID; mod = m->omod) {
224		m = objptr(mod);
#	Line 254 | Line 234 | int  mod;
234		objerror(r->ro, USER, errmsg);
235		}
236		}
257	–	#if  MAXLOOP
258	–	depth--;                        /* end here */
259	–	#endif
237		}
238
239
#	Line 277 | Line 254 | double  coef;
254		/* compute foreground and background */
255		foremat = backmat = 0;
256		/* foreground */
257	<	copystruct(&fr, r);
257	>	fr = *r;
258		if (coef > FTINY)
259		foremat = rayshade(&fr, fore);
260		/* background */
261	<	copystruct(&br, r);
261	>	br = *r;
262		if (coef < 1.0-FTINY)
263		backmat = rayshade(&br, back);
264		/* check for transparency */
265	<	if (backmat ^ foremat)
265	>	if (backmat ^ foremat) {
266		if (backmat && coef > FTINY)
267		raytrans(&fr);
268		else if (foremat && coef < 1.0-FTINY)
269		raytrans(&br);
270	+	}
271		/* mix perturbations */
272		for (i = 0; i < 3; i++)
273		r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
#	Line 486 | Line 464 | register CUBE  *scene;
464		}
465		cxset[0] = 0;
466		raymove(curpos, cxset, sflags, r, scene);
467	<	return(r->ro != NULL & r->ro != &Aftplane);
467	>	return((r->ro != NULL) & (r->ro != &Aftplane));
468		}
469
470

Diff Legend

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