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.21 by greg, Thu Nov 2 17:38:02 1995 UTC vs.
Revision 2.24 by greg, Thu Mar 21 15:33:05 1996 UTC

#	Line 24 | Line 24 | extern CUBE  thescene;                 /* our scene */
24		extern int  maxdepth;                   /* maximum recursion depth */
25		extern double  minweight;               /* minimum ray weight */
26		extern int  do_irrad;                   /* compute irradiance? */
27	+	extern COLOR  ambval;                   /* ambient value */
28
29	+	extern COLOR  cextinction;              /* global extinction coefficient */
30	+	extern double  salbedo;                 /* global scattering albedo */
31	+	extern double  seccg;                   /* global scattering eccentricity */
32	+	extern double  ssampdist;               /* scatter sampling distance */
33	+
34		unsigned long  raynum = 0;              /* next unique ray number */
35		unsigned long  nrays = 0;               /* number of calls to localhit */
36
#	Line 55 | Line 61 | double  rw;
61		r->rsrc = -1;
62		r->clipset = NULL;
63		r->revf = raytrace;
64	+	copycolor(r->cext, cextinction);
65	+	r->albedo = salbedo;
66	+	r->gecc = seccg;
67	+	r->slights = NULL;
68		} else {                                /* spawned ray */
69		r->rlvl = ro->rlvl;
70		if (rt & RAYREFL) {
71		r->rlvl++;
72		r->rsrc = -1;
73		r->clipset = ro->clipset;
74	+	r->rmax = 0.0;
75		} else {
76		r->rsrc = ro->rsrc;
77		r->clipset = ro->newcset;
78	+	r->rmax = ro->rmax <= FTINY ? 0.0 : ro->rmax - ro->rot;
79		}
80		r->revf = ro->revf;
81	+	copycolor(r->cext, ro->cext);
82	+	r->albedo = ro->albedo;
83	+	r->gecc = ro->gecc;
84	+	r->slights = ro->slights;
85		r->rweight = ro->rweight * rw;
86		r->crtype = ro->crtype | (r->rtype = rt);
87		VCOPY(r->rorg, ro->rop);
72	–	r->rmax = 0.0;
88		}
89		rayclear(r);
90		return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
#	Line 94 | Line 109 | raytrace(r)                    /* trace a ray and compute its value */
109		RAY  *r;
110		{
111		extern int  (*trace)();
97	–	int  gotmat;
112
113		if (localhit(r, &thescene))
114	<	gotmat = raycont(r);
114	>	raycont(r);             /* hit local surface, evaluate */
115		else if (r->ro == &Aftplane) {
116	<	r->ro = NULL;
116	>	r->ro = NULL;           /* hit aft clipping plane */
117		r->rot = FHUGE;
118		} else if (sourcehit(r))
119	<	gotmat = rayshade(r, r->ro->omod);
119	>	rayshade(r, r->ro->omod);       /* distant source */
120
121	<	if (r->ro != NULL && !gotmat)
108	<	objerror(r->ro, USER, "material not found");
121	>	rayparticipate(r);              /* for participating medium */
122
123		if (trace != NULL)
124		(*trace)(r);            /* trace execution */
#	Line 116 | Line 129 | raycont(r)                     /* check for clipped object and continue
129		register RAY  *r;
130		{
131		if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) ||
132	<	r->ro->omod == OVOID) {
132	>	!rayshade(r, r->ro->omod))
133		raytrans(r);
121	–	return(1);
122	–	}
123	–	return(rayshade(r, r->ro->omod));
134		}
135
136
#	Line 131 | Line 141 | register RAY  *r;
141
142		if (rayorigin(&tr, r, TRANS, 1.0) == 0) {
143		VCOPY(tr.rdir, r->rdir);
134	–	if (r->rmax > FTINY)
135	–	tr.rmax = r->rmax - r->rot;
144		rayvalue(&tr);
145		copycolor(r->rcol, tr.rcol);
146		r->rt = r->rot + tr.rt;
#	Line 177 | Line 185 | int  mod;
185		}
186
187
188	+	rayparticipate(r)                       /* compute ray medium participation */
189	+	register RAY  *r;
190	+	{
191	+	COLOR   ce, ca;
192	+	double  dist;
193	+	double  re, ge, be;
194	+
195	+	if (intens(r->cext) <= 1./FHUGE)
196	+	return;                         /* no medium */
197	+	if ((dist = r->rot) >= FHUGE)
198	+	dist = 2.*thescene.cusize;      /* what to use for infinity? */
199	+	if (r->crtype & SHADOW)
200	+	dist *= 1. - salbedo;           /* no scattering for sources */
201	+	if (dist <= FTINY)
202	+	return;                         /* no effective ray travel */
203	+	re = dist*colval(r->cext,RED);
204	+	ge = dist*colval(r->cext,GRN);
205	+	be = dist*colval(r->cext,BLU);
206	+	setcolor(ce,    re>92. ? 0. : exp(-re),
207	+	ge>92. ? 0. : exp(-ge),
208	+	be>92. ? 0. : exp(-be));
209	+	multcolor(r->rcol, ce);                 /* path absorption */
210	+	if (r->albedo <= FTINY || r->crtype & SHADOW)
211	+	return;                         /* no scattering */
212	+	setcolor(ca,    salbedo*colval(ambval,RED)*(1.-colval(ce,RED)),
213	+	salbedo*colval(ambval,GRN)*(1.-colval(ce,GRN)),
214	+	salbedo*colval(ambval,BLU)*(1.-colval(ce,BLU)));
215	+	addcolor(r->rcol, ca);                  /* ambient in scattering */
216	+	srcscatter(r);                          /* source in scattering */
217	+	}
218	+
219	+
220		raytexture(r, mod)                      /* get material modifiers */
221		RAY  *r;
222		int  mod;
#	Line 213 | Line 253 | double  coef;
253		RAY  fr, br;
254		int  foremat, backmat;
255		register int  i;
256	<	/* clip coefficient */
256	>	/* bound coefficient */
257		if (coef > 1.0)
258		coef = 1.0;
259		else if (coef < 0.0)
260		coef = 0.0;
261		/* compute foreground and background */
262	<	foremat = backmat = -1;
262	>	foremat = backmat = 0;
263		/* foreground */
264		copystruct(&fr, r);
265	<	if (fore != OVOID && coef > FTINY)
265	>	if (coef > FTINY)
266		foremat = rayshade(&fr, fore);
267		/* background */
268		copystruct(&br, r);
269	<	if (back != OVOID && coef < 1.0-FTINY)
269	>	if (coef < 1.0-FTINY)
270		backmat = rayshade(&br, back);
271	<	/* check */
272	<	if (foremat < 0)
273	<	if (backmat < 0)
274	<	foremat = backmat = 0;
271	>	/* check for transparency */
272	>	if (backmat ^ foremat)
273	>	if (backmat)
274	>	raytrans(&fr);
275		else
276	<	foremat = backmat;
237	<	else if (backmat < 0)
238	<	backmat = foremat;
239	<	if ((foremat==0) != (backmat==0))
240	<	objerror(r->ro, USER, "mixing material with non-material");
276	>	raytrans(&br);
277		/* mix perturbations */
278		for (i = 0; i < 3; i++)
279		r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
#	Line 246 | Line 282 | double  coef;
282		scalecolor(br.pcol, 1.0-coef);
283		copycolor(r->pcol, fr.pcol);
284		addcolor(r->pcol, br.pcol);
249	–	/* mix returned ray values */
250	–	if (foremat) {
251	–	scalecolor(fr.rcol, coef);
252	–	scalecolor(br.rcol, 1.0-coef);
253	–	copycolor(r->rcol, fr.rcol);
254	–	addcolor(r->rcol, br.rcol);
255	–	r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt;
256	–	}
285		/* return value tells if material */
286	<	return(foremat);
286	>	if (!foremat & !backmat)
287	>	return(0);
288	>	/* mix returned ray values */
289	>	scalecolor(fr.rcol, coef);
290	>	scalecolor(br.rcol, 1.0-coef);
291	>	copycolor(r->rcol, fr.rcol);
292	>	addcolor(r->rcol, br.rcol);
293	>	r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt;
294	>	return(1);
295		}
296
297

Diff Legend

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