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 1.15 by greg, Wed May 1 11:17:01 1991 UTC vs.
Revision 1.23 by greg, Wed Oct 23 13:43:45 1991 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1990 Regents of the University of California */
1	>	/* Copyright (c) 1991 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 23 | Line 23 | extern int  maxdepth;                  /* maximum recursion depth */
23		extern double  minweight;               /* minimum ray weight */
24		extern int  do_irrad;                   /* compute irradiance? */
25
26	<	long  nrays = 0L;                       /* number of rays traced */
26	>	long  raynum = 0L;                      /* next unique ray number */
27	>	long  nrays = 0L;                       /* number of calls to localhit */
28
29	<	static double  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
29	>	static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
30		OBJREC  Lamb = {
31		OVOID, MAT_PLASTIC, "Lambertian",
32		{0, 5, NULL, Lambfa}, NULL, -1,
#	Line 47 | Line 48 | double  rw;
48		r->crtype = r->rtype = rt;
49		r->rsrc = -1;
50		r->clipset = NULL;
51	+	r->revf = raytrace;
52		} else {                                /* spawned ray */
53		r->rlvl = ro->rlvl;
54		if (rt & RAYREFL) {
#	Line 57 | Line 59 | double  rw;
59		r->rsrc = ro->rsrc;
60		r->clipset = ro->newcset;
61		}
62	+	r->revf = ro->revf;
63		r->rweight = ro->rweight * rw;
64		r->crtype = ro->crtype | (r->rtype = rt);
65		VCOPY(r->rorg, ro->rop);
66		}
67	<	r->rno = nrays;
67	>	rayclear(r);
68	>	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
69	>	}
70	>
71	>
72	>	rayclear(r)                     /* clear a ray for (re)evaluation */
73	>	register RAY  *r;
74	>	{
75	>	r->rno = raynum++;
76		r->newcset = r->clipset;
77		r->ro = NULL;
78		r->rot = FHUGE;
#	Line 69 | Line 80 | double  rw;
80		setcolor(r->pcol, 1.0, 1.0, 1.0);
81		setcolor(r->rcol, 0.0, 0.0, 0.0);
82		r->rt = 0.0;
72	–	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
83		}
84
85
86	<	rayvalue(r)                     /* compute a ray's value */
86	>	raytrace(r)                     /* trace a ray and compute its value */
87		RAY  *r;
88		{
89		extern int  (*trace)();
#	Line 118 | Line 128 | int  mod;
128		{
129		static int  depth = 0;
130		register OBJREC  *m;
121	–	/* check for irradiance calc. */
122	–	if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) {
123	–	if (irr_ignore(objptr(mod)->otype))
124	–	raytrans(r);
125	–	else
126	–	(*ofun[Lamb.otype].funp)(&Lamb, r);
127	–	return;
128	–	}
131		/* check for infinite loop */
132		if (depth++ >= MAXLOOP)
133		objerror(r->ro, USER, "possible modifier loop");
134	+	r->rt = r->rot;                 /* set effective ray length */
135		for ( ; mod != OVOID; mod = m->omod) {
136		m = objptr(mod);
137		/****** unnecessary test since modifier() is always called
#	Line 137 | Line 140 | int  mod;
140		error(USER, errmsg);
141		}
142		******/
143	+	/* hack for irradiance calculation */
144	+	if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) {
145	+	if (irr_ignore(m->otype)) {
146	+	depth--;
147	+	raytrans(r);
148	+	return;
149	+	}
150	+	if (!islight(m->otype))
151	+	m = &Lamb;
152	+	}
153		(*ofun[m->otype].funp)(m, r);   /* execute function */
154		m->lastrno = r->rno;
155		if (ismaterial(m->otype)) {     /* materials call raytexture */
#	Line 311 | Line 324 | register CUBE  *scene;
324		register int  i;
325
326		nrays++;                        /* increment trace counter */
314	–
327		sflags = 0;
328		for (i = 0; i < 3; i++) {
329		curpos[i] = r->rorg[i];
#	Line 320 | Line 332 | register CUBE  *scene;
332		else if (r->rdir[i] < -FTINY)
333		sflags |= 0x10 << i;
334		}
335	+	if (sflags == 0)
336	+	error(CONSISTENCY, "zero ray direction in localhit");
337		t = 0.0;
338		if (!incube(scene, curpos)) {
339		/* find distance to entry */

Diff Legend

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