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.12 by greg, Thu Jan 13 10:43:34 1994 UTC vs.
Revision 2.16 by greg, Tue Dec 20 20:18:22 1994 UTC

#	Line 34 | Line 34 | OBJREC  Lamb = {
34		{0, 5, NULL, Lambfa}, NULL,
35		};                                      /* a Lambertian surface */
36
37	+	static OBJREC  Aftplane;                /* aft clipping plane object */
38	+
39		static int  raymove(), checkset(), checkhit();
40
41		#define  MAXLOOP        128             /* modifier loop detection */
#	Line 67 | Line 69 | double  rw;
69		r->rweight = ro->rweight * rw;
70		r->crtype = ro->crtype | (r->rtype = rt);
71		VCOPY(r->rorg, ro->rop);
72	+	r->rmax = 0.0;
73		}
74		rayclear(r);
75		return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
#	Line 78 | Line 81 | register RAY  *r;
81		{
82		r->rno = raynum++;
83		r->newcset = r->clipset;
84	<	r->ro = NULL;
85	<	r->rot = FHUGE;
84	>	if (r->rmax > FTINY) {
85	>	r->ro = &Aftplane;
86	>	r->rot = r->rmax;
87	>	r->rop[0] = r->rorg[0] + r->rot*r->rdir[0];
88	>	r->rop[1] = r->rorg[1] + r->rot*r->rdir[1];
89	>	r->rop[2] = r->rorg[2] + r->rot*r->rdir[2];
90	>	} else {
91	>	r->ro = NULL;
92	>	r->rot = FHUGE;
93	>	}
94		r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
95		setcolor(r->pcol, 1.0, 1.0, 1.0);
96		setcolor(r->rcol, 0.0, 0.0, 0.0);
#	Line 95 | Line 106 | RAY  *r;
106
107		if (localhit(r, &thescene))
108		gotmat = raycont(r);
109	<	else if (sourcehit(r))
109	>	else if (r->ro == &Aftplane) {
110	>	r->ro = NULL;
111	>	r->rot = FHUGE;
112	>	} else if (sourcehit(r))
113		gotmat = rayshade(r, r->ro->omod);
114
115	<	if (!gotmat)
115	>	if (r->ro != NULL && !gotmat)
116		objerror(r->ro, USER, "material not found");
117
118		if (trace != NULL)
#	Line 156 | Line 170 | int  mod;
170		if (irr_ignore(m->otype)) {
171		depth--;
172		raytrans(r);
173	<	return;
173	>	return(1);
174		}
175		if (!islight(m->otype))
176		m = &Lamb;
#	Line 207 | Line 221 | double  coef;
221		coef = 1.0;
222		else if (coef < 0.0)
223		coef = 0.0;
224	+	/* compute foreground and background */
225	+	foremat = backmat = -1;
226		/* foreground */
227		copystruct(&fr, r);
228		if (fore != OVOID && coef > FTINY)
229		foremat = rayshade(&fr, fore);
214	–	else
215	–	foremat = 0;
230		/* background */
231		copystruct(&br, r);
232		if (back != OVOID && coef < 1.0-FTINY)
233		backmat = rayshade(&br, back);
220	–	else
221	–	backmat = foremat;
234		/* check */
235	+	if (foremat < 0)
236	+	if (backmat < 0)
237	+	foremat = backmat = 0;
238	+	else
239	+	foremat = backmat;
240	+	else if (backmat < 0)
241	+	backmat = foremat;
242		if ((foremat==0) != (backmat==0))
243		objerror(r->ro, USER, "mixing material with non-material");
244		/* mix perturbations */
#	Line 373 | Line 392 | register CUBE  *scene;
392		return(0);
393		}
394		cxset[0] = 0;
395	<	return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT);
395	>	return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT &&
396	>	r->ro != &Aftplane);
397		}
398
399

Diff Legend

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