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.13 by greg, Mon Jan 24 11:51:31 1994 UTC vs.
Revision 2.19 by greg, Thu Jan 26 15:34:55 1995 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1994 Regents of the University of California */
1	>	/* Copyright (c) 1995 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 34 | Line 34 | OBJREC  Lamb = {
34		{0, 5, NULL, Lambfa}, NULL,
35		};                                      /* a Lambertian surface */
36
37	+	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 95 | Line 98 | RAY  *r;
98
99		if (localhit(r, &thescene))
100		gotmat = raycont(r);
101	<	else if (sourcehit(r))
101	>	else if (r->ro == &Aftplane) {
102	>	r->ro = NULL;
103	>	r->rot = FHUGE;
104	>	} else if (sourcehit(r))
105		gotmat = rayshade(r, r->ro->omod);
106
107	<	if (!gotmat)
107	>	if (r->ro != NULL && !gotmat)
108		objerror(r->ro, USER, "material not found");
109
110		if (trace != NULL)
#	Line 125 | Line 131 | register RAY  *r;
131
132		if (rayorigin(&tr, r, TRANS, 1.0) == 0) {
133		VCOPY(tr.rdir, r->rdir);
134	+	if (r->rmax > FTINY)
135	+	tr.rmax = r->rmax - r->rot;
136		rayvalue(&tr);
137		copycolor(r->rcol, tr.rcol);
138		r->rt = r->rot + tr.rt;
#	Line 156 | Line 164 | int  mod;
164		if (irr_ignore(m->otype)) {
165		depth--;
166		raytrans(r);
167	<	return;
167	>	return(1);
168		}
169		if (!islight(m->otype))
170		m = &Lamb;
#	Line 353 | Line 361 | register CUBE  *scene;
361		}
362		if (sflags == 0)
363		error(CONSISTENCY, "zero ray direction in localhit");
364	+	/* start off assuming nothing hit */
365	+	if (r->rmax > FTINY) {          /* except aft plane if one */
366	+	r->ro = &Aftplane;
367	+	r->rot = r->rmax;
368	+	for (i = 0; i < 3; i++)
369	+	r->rop[i] = r->rorg[i] + r->rot*r->rdir[i];
370	+	}
371	+	/* find global cube entrance point */
372		t = 0.0;
373		if (!incube(scene, curpos)) {
374		/* find distance to entry */
#	Line 370 | Line 386 | register CUBE  *scene;
386		t = dt; /* farthest face is the one */
387		}
388		t += FTINY;             /* fudge to get inside cube */
389	+	if (t >= r->rot)        /* clipped already */
390	+	return(0);
391		/* advance position */
392		for (i = 0; i < 3; i++)
393		curpos[i] += r->rdir[i]*t;
#	Line 378 | Line 396 | register CUBE  *scene;
396		return(0);
397		}
398		cxset[0] = 0;
399	<	return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT);
399	>	raymove(curpos, cxset, sflags, r, scene);
400	>	return(r->ro != NULL & r->ro != &Aftplane);
401		}
402
403
#	Line 433 | Line 452 | register CUBE  *cu;
452		}
453		/*NOTREACHED*/
454		}
455	<	if (isfull(cu->cutree) && checkhit(r, cu, cxs))
455	>	if (isfull(cu->cutree)) {
456	>	if (checkhit(r, cu, cxs))
457	>	return(RAYHIT);
458	>	} else if (r->ro == &Aftplane && incube(cu, r->rop))
459		return(RAYHIT);
460		/* advance to next cube */
461		if (dirf&0x11) {

Diff Legend

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