ViewVC Help

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

root/Development/ray/src/gen/mkillum2.c

Comparing ray/src/gen/mkillum2.c (file contents):
Revision 1.12 by greg, Fri Aug 23 12:30:33 1991 UTC vs.
Revision 2.6 by greg, Fri Jan 7 14:51:46 1994 UTC

#	Line 26 | Line 26 | char  *nm;
26		sprintf(errmsg, "(%s): cannot make illum for %s \"%s\"",
27		nm, ofun[ob->otype].funame, ob->oname);
28		error(WARNING, errmsg);
29	<	if (!(il->flags & IL_LIGHT))
30	<	printobj(il->altmat, ob);
29	>	printobj(il->altmat, ob);
30		}
31
32
#	Line 67 | Line 66 | char  *nm;
66		distarr = (float *)calloc(n, 3*sizeof(float));
67		if (distarr == NULL)
68		error(SYSTEM, "out of memory in o_face");
69	<	mkaxes(u, v, fa->norm);
69	>	/* take first edge longer than sqrt(area) */
70	>	for (j = fa->nv-1, i = 0; i < fa->nv; j = i++) {
71	>	u[0] = VERTEX(fa,i)[0] - VERTEX(fa,j)[0];
72	>	u[1] = VERTEX(fa,i)[1] - VERTEX(fa,j)[1];
73	>	u[2] = VERTEX(fa,i)[2] - VERTEX(fa,j)[2];
74	>	if ((r1 = DOT(u,u)) >= fa->area-FTINY)
75	>	break;
76	>	}
77	>	if (i < fa->nv) {       /* got one! -- let's align our axes */
78	>	r2 = 1.0/sqrt(r1);
79	>	u[0] *= r2; u[1] *= r2; u[2] *= r2;
80	>	fcross(v, fa->norm, u);
81	>	} else                  /* oh well, we'll just have to wing it */
82	>	mkaxes(u, v, fa->norm);
83	>	/* now, find limits in (u,v) coordinates */
84		ur[0] = vr[0] = FHUGE;
85		ur[1] = vr[1] = -FHUGE;
86		for (i = 0; i < fa->nv; i++) {
#	Line 88 | Line 101 | char  *nm;
101		h = ilhash(dim, 3) + i;
102		multisamp(sp, 2, urand(h));
103		r1 = (dim[1] + sp[0])/nalt;
104	<	r2 = (dim[2] + sp[1])/nazi;
104	>	r2 = (dim[2] + sp[1] - .5)/nazi;
105		flatdir(dn, r1, r2);
106		for (j = 0; j < 3; j++)
107		dir[j] = -dn[0]*u[j] - dn[1]*v[j] - dn[2]*fa->norm[j];
#	Line 120 | Line 133 | char  *nm;
133		if (il->sampdens > 0)
134		flatout(il, distarr, nalt, nazi, u, v, fa->norm);
135		illumout(il, ob);
136	<	} else if (!(il->flags & IL_LIGHT))
136	>	} else
137		printobj(il->altmat, ob);
138		/* clean up */
139		freeface(ob);
#	Line 166 | Line 179 | char  *nm;
179		multisamp(sp, 4, urand(ilhash(dim,3)+i));
180		/* random direction */
181		r1 = (dim[1] + sp[0])/nalt;
182	<	r2 = (dim[2] + sp[1])/nazi;
182	>	r2 = (dim[2] + sp[1] - .5)/nazi;
183		rounddir(dir, r1, r2);
184		/* random location */
185		mkaxes(u, v, dir);          /* yuck! */
#	Line 191 | Line 204 | char  *nm;
204		else
205		objerror(ob, WARNING, "diffuse distribution");
206		illumout(il, ob);
207	<	} else if (!(il->flags & IL_LIGHT))
207	>	} else
208		printobj(il->altmat, ob);
209		/* clean up */
210		free((char *)distarr);
#	Line 236 | Line 249 | char  *nm;
249		multisamp(sp, 4, urand(ilhash(dim,3)+i));
250		/* random direction */
251		r1 = (dim[1] + sp[0])/nalt;
252	<	r2 = (dim[2] + sp[1])/nalt;
252	>	r2 = (dim[2] + sp[1] - .5)/nazi;
253		flatdir(dn, r1, r2);
254		for (j = 0; j < 3; j++)
255		dir[j] = -dn[0]*u[j] - dn[1]*v[j] - dn[2]*co->ad[j];
#	Line 247 | Line 260 | char  *nm;
260		r1 = r3*cos(r2);
261		r2 = r3*sin(r2);
262		for (j = 0; j < 3; j++)
263	<	org[j] = CO_P0(co)[j] + r1*u[j] + r1*v[j] +
263	>	org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] +
264		.001*co->ad[j];
265
266		/* send sample */
#	Line 259 | Line 272 | char  *nm;
272		if (il->sampdens > 0)
273		flatout(il, distarr, nalt, nazi, u, v, co->ad);
274		illumout(il, ob);
275	<	} else if (!(il->flags & IL_LIGHT))
275	>	} else
276		printobj(il->altmat, ob);
277		/* clean up */
278		freecone(ob);
#	Line 291 | Line 304 | register struct rtproc  *rt;
304		if (rt->nrays <= 0)
305		return;
306		bzero(rt->buf+6*rt->nrays, 6*sizeof(float));
307	+	errno = 0;
308		if ( process(rt->pd, (char *)rt->buf, (char *)rt->buf,
309		3*sizeof(float)*rt->nrays,
310		6*sizeof(float)*(rt->nrays+1)) <

Diff Legend

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