[ViewVC] Diff of: radiance/ray/src/rt/rv2.c

Comparing ray/src/rt/rv2.c (file contents):
Revision 2.4 by greg, Mon Dec 23 23:18:31 1991 UTC vs.
Revision 2.60 by greg, Fri Oct 8 22:55:49 2010 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1991 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* rv2.c - command routines used in tracing a view.
6		*
7	<	* 3/24/87
7	>	* External symbols declared in rpaint.h
8		*/
9
10	<	#include "ray.h"
10	>	#include "copyright.h"
11
12	<	#include "octree.h"
12	>	#include <ctype.h>
13	>	#include <string.h>
14
15	+	#include "platform.h"
16	+	#include "ray.h"
17	+	#include "source.h"
18	+	#include "ambient.h"
19		#include "otypes.h"
18	–
20		#include "rpaint.h"
21
22	<	#include "resolu.h"
22	>	extern int psample; /* pixel sample size */
23	>	extern double maxdiff; /* max. sample difference */
24
23	–	#include <ctype.h>
24	–
25		#define CTRL(c) ((c)-'@')
26
27	<	extern char VersionID[];
27	>	#ifdef SMLFLT
28	>	#define sscanvec(s,v) (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
29	>	#else
30	>	#define sscanvec(s,v) (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
31	>	#endif
32	>
33	>	extern char rifname[128]; /* rad input file name */
34	>
35		extern char *progname;
36		extern char *octname;
37
38
39	<	getframe(s) /* get a new frame */
40	<	char *s;
39	>	void
40	>	getframe( /* get a new frame */
41	>	char *s
42	>	)
43		{
44		if (getrect(s, &pframe) < 0)
45		return;
#	Line 38 \| Line 47 \| *char s;**
47		}
48
49
50	<	getrepaint(s) /* get area and repaint */
51	<	char *s;
50	>	void
51	>	getrepaint( /* get area and repaint */
52	>	char *s
53	>	)
54		{
55		RECT box;
56
57		if (getrect(s, &box) < 0)
58		return;
59	<	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
59	>	paintrect(&ptrunk, &box);
60		}
61
62
63	<	getview(s) /* get/show view parameters */
64	<	char *s;
63	>	void
64	>	getview( /* get/show view parameters */
65	>	char *s
66	>	)
67		{
68		FILE *fp;
69		char buf[128];
70		char *fname;
71		int change = 0;
72	<	VIEW nv;
72	>	VIEW nv = ourview;
73
74	+	while (isspace(*s))
75	+	s++;
76	+	if (s == '-') { / command line parameters */
77	+	if (sscanview(&nv, s))
78	+	newview(&nv);
79	+	else
80	+	error(COMMAND, "bad view option(s)");
81	+	return;
82	+	}
83		if (sscanf(s, "%s", buf) == 1) { /* write parameters to a file */
84		if ((fname = getpath(buf, NULL, 0)) == NULL \|\|
85		(fp = fopen(fname, "a")) == NULL) {
#	Line 68 \| Line 90 \| *char s;**
90		fputs(progname, fp);
91		fprintview(&ourview, fp);
92		fputs(sskip(s), fp);
93	<	fputs("\n", fp);
93	>	putc('\n', fp);
94		fclose(fp);
95		return;
96		}
#	Line 79 \| Line 101 \| *char s;**
101		if (buf[0] && buf[0] != ourview.type) {
102		nv.type = buf[0];
103		change++;
104	<	} else
83	<	nv.type = ourview.type;
104	>	}
105		sprintf(buf, "view point (%.6g %.6g %.6g): ",
106		ourview.vp[0], ourview.vp[1], ourview.vp[2]);
107		(*dev->comout)(buf);
108		(*dev->comin)(buf, NULL);
109		if (buf[0] == CTRL('C')) return;
110	<	if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3)
110	>	if (sscanvec(buf, nv.vp))
111		change++;
91	–	else
92	–	VCOPY(nv.vp, ourview.vp);
112		sprintf(buf, "view direction (%.6g %.6g %.6g): ",
113	<	ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
113	>	ourview.vdir[0]*ourview.vdist,
114	>	ourview.vdir[1]*ourview.vdist,
115	>	ourview.vdir[2]*ourview.vdist);
116		(*dev->comout)(buf);
117		(*dev->comin)(buf, NULL);
118		if (buf[0] == CTRL('C')) return;
119	<	if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3)
119	>	if (sscanvec(buf, nv.vdir)) {
120	>	nv.vdist = 1.;
121		change++;
122	<	else
101	<	VCOPY(nv.vdir, ourview.vdir);
122	>	}
123		sprintf(buf, "view up (%.6g %.6g %.6g): ",
124		ourview.vup[0], ourview.vup[1], ourview.vup[2]);
125		(*dev->comout)(buf);
126		(*dev->comin)(buf, NULL);
127		if (buf[0] == CTRL('C')) return;
128	<	if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3)
128	>	if (sscanvec(buf, nv.vup))
129		change++;
109	–	else
110	–	VCOPY(nv.vup, ourview.vup);
130		sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
131		ourview.horiz, ourview.vert);
132		(*dev->comout)(buf);
#	Line 115 \| Line 134 \| *char s;**
134		if (buf[0] == CTRL('C')) return;
135		if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
136		change++;
137	<	else {
138	<	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
139	<	}
137	>	sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
138	>	ourview.vfore, ourview.vaft);
139	>	(*dev->comout)(buf);
140	>	(*dev->comin)(buf, NULL);
141	>	if (buf[0] == CTRL('C')) return;
142	>	if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
143	>	change++;
144		sprintf(buf, "view shift and lift (%.6g %.6g): ",
145		ourview.hoff, ourview.voff);
146		(*dev->comout)(buf);
#	Line 125 \| Line 148 \| *char s;**
148		if (buf[0] == CTRL('C')) return;
149		if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
150		change++;
128	–	else {
129	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
130	–	}
151		if (change)
152		newview(&nv);
153		}
154
155
156	<	lastview(s) /* return to a previous view */
157	<	char *s;
156	>	void
157	>	lastview( /* return to a previous view */
158	>	char *s
159	>	)
160		{
161		char buf[128];
162		char *fname;
#	Line 142 \| Line 164 \| *char s;**
164		VIEW nv;
165
166		if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */
167	<	copystruct(&nv, &stdview);
168	<	if ((fname = getpath(buf, NULL, 0)) == NULL \|\|
167	>	nv = stdview;
168	>	if ((fname = getpath(buf, "", R_OK)) == NULL \|\|
169		(success = viewfile(fname, &nv, NULL)) == -1) {
170		sprintf(errmsg, "cannot open \"%s\"", buf);
171		error(COMMAND, errmsg);
#	Line 159 \| Line 181 \| *char s;**
181		error(COMMAND, "no previous view");
182		return;
183		}
184	<	copystruct(&nv, &ourview);
185	<	copystruct(&ourview, &oldview);
186	<	copystruct(&oldview, &nv);
187	<	newimage();
184	>	nv = ourview;
185	>	ourview = oldview;
186	>	oldview = nv;
187	>	newimage(NULL);
188		}
189
190
191	<	getaim(s) /* aim camera */
192	<	char *s;
191	>	void
192	>	saveview( /* save view to rad file */
193	>	char *s
194	>	)
195		{
196	<	extern double tan(), atan();
197	<	double zfact;
196	>	char view[64];
197	>	char *fname;
198	>	FILE *fp;
199	>
200	>	if (*atos(view, sizeof(view), s)) {
201	>	if (isint(view)) {
202	>	error(COMMAND, "cannot write view by number");
203	>	return;
204	>	}
205	>	s = sskip(s);
206	>	}
207	>	while (isspace(*s))
208	>	s++;
209	>	if (*s)
210	>	atos(rifname, sizeof(rifname), s);
211	>	else if (rifname[0] == '\0') {
212	>	error(COMMAND, "no previous rad file");
213	>	return;
214	>	}
215	>	if ((fname = getpath(rifname, NULL, 0)) == NULL \|\|
216	>	(fp = fopen(fname, "a")) == NULL) {
217	>	sprintf(errmsg, "cannot open \"%s\"", rifname);
218	>	error(COMMAND, errmsg);
219	>	return;
220	>	}
221	>	fputs("view= ", fp);
222	>	fputs(view, fp);
223	>	fprintview(&ourview, fp);
224	>	putc('\n', fp);
225	>	fclose(fp);
226	>	}
227	>
228	>
229	>	void
230	>	loadview( /* load view from rad file */
231	>	char *s
232	>	)
233	>	{
234	>	char buf[512];
235	>	char *fname;
236	>	FILE *fp;
237		VIEW nv;
238
239	+	strcpy(buf, "rad -n -s -V -v ");
240	+	if (sscanf(s, "%s", buf+strlen(buf)) == 1)
241	+	s = sskip(s);
242	+	else
243	+	strcat(buf, "1");
244	+	if (*s)
245	+	atos(rifname, sizeof(rifname), s);
246	+	else if (rifname[0] == '\0') {
247	+	error(COMMAND, "no previous rad file");
248	+	return;
249	+	}
250	+	if ((fname = getpath(rifname, "", R_OK)) == NULL) {
251	+	sprintf(errmsg, "cannot access \"%s\"", rifname);
252	+	error(COMMAND, errmsg);
253	+	return;
254	+	}
255	+	sprintf(buf+strlen(buf), " %s", fname);
256	+	if ((fp = popen(buf, "r")) == NULL) {
257	+	error(COMMAND, "cannot run rad");
258	+	return;
259	+	}
260	+	buf[0] = '\0';
261	+	fgets(buf, sizeof(buf), fp);
262	+	pclose(fp);
263	+	nv = stdview;
264	+	if (!sscanview(&nv, buf)) {
265	+	error(COMMAND, "rad error -- no such view?");
266	+	return;
267	+	}
268	+	newview(&nv);
269	+	}
270	+
271	+
272	+	void
273	+	getaim( /* aim camera */
274	+	char *s
275	+	)
276	+	{
277	+	VIEW nv = ourview;
278	+	double zfact;
279	+
280		if (getinterest(s, 1, nv.vdir, &zfact) < 0)
281		return;
178	–	nv.type = ourview.type;
179	–	VCOPY(nv.vp, ourview.vp);
180	–	VCOPY(nv.vup, ourview.vup);
181	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
182	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
282		zoomview(&nv, zfact);
283		newview(&nv);
284		}
285
286
287	<	getmove(s) /* move camera */
288	<	char *s;
287	>	void
288	>	getfocus( /* set focus distance */
289	>	char *s
290	>	)
291		{
292	+	char buf[64];
293	+	double dist;
294	+
295	+	if (sscanf(s, "%lf", &dist) < 1) {
296	+	int x, y;
297	+	RAY thisray;
298	+	if (dev->getcur == NULL)
299	+	return;
300	+	(*dev->comout)("Pick focus point\n");
301	+	if ((*dev->getcur)(&x, &y) == ABORT)
302	+	return;
303	+	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
304	+	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
305	+	error(COMMAND, "not on image");
306	+	return;
307	+	}
308	+	rayorigin(&thisray, PRIMARY, NULL, NULL);
309	+	if (!localhit(&thisray, &thescene)) {
310	+	error(COMMAND, "not a local object");
311	+	return;
312	+	}
313	+	dist = thisray.rot;
314	+	} else if (dist <= .0) {
315	+	error(COMMAND, "focus distance must be positive");
316	+	return;
317	+	}
318	+	ourview.vdist = dist;
319	+	sprintf(buf, "Focus distance set to %f\n", dist);
320	+	(*dev->comout)(buf);
321	+	}
322	+
323	+
324	+	void
325	+	getmove( /* move camera */
326	+	char *s
327	+	)
328	+	{
329		FVECT vc;
330		double mag;
331
#	Line 197 \| Line 335 \| *char s;**
335		}
336
337
338	<	getrotate(s) /* rotate camera */
339	<	char *s;
338	>	void
339	>	getrotate( /* rotate camera */
340	>	char *s
341	>	)
342		{
343	<	extern double normalize(), tan(), atan();
204	<	VIEW nv;
343	>	VIEW nv = ourview;
344		FVECT v1;
345		double angle, elev, zfact;
346
#	Line 210 \| Line 349 \| *char s;**
349		error(COMMAND, "missing angle");
350		return;
351		}
213	–	nv.type = ourview.type;
214	–	VCOPY(nv.vp, ourview.vp);
215	–	VCOPY(nv.vup, ourview.vup);
216	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
352		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
353		if (elev != 0.0) {
354		fcross(v1, nv.vdir, ourview.vup);
355		normalize(v1);
356		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
357		}
223	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
358		zoomview(&nv, zfact);
359		newview(&nv);
360		}
361
362
363	<	getpivot(s) /* pivot viewpoint */
364	<	register char *s;
363	>	void
364	>	getpivot( /* pivot viewpoint */
365	>	char *s
366	>	)
367		{
368		FVECT vc;
369		double angle, elev, mag;
#	Line 237 \| Line 373 \| *register char s;**
373		error(COMMAND, "missing angle");
374		return;
375		}
376	<	if (getinterest(sskip(sskip(s)), 0, vc, &mag) < 0)
376	>	if (getinterest(sskip2(s,2), 0, vc, &mag) < 0)
377		return;
378		moveview(angle, elev, mag, vc);
379		}
380
381
382	<	getexposure(s) /* get new exposure */
383	<	char *s;
382	>	void
383	>	getexposure( /* get new exposure */
384	>	char *s
385	>	)
386		{
387		char buf[128];
388	<	register char *cp;
251	<	register PNODE *p;
252	<	RECT r;
388	>	char *cp;
389		int x, y;
390	<	double e;
390	>	PNODE *p = &ptrunk;
391	>	int adapt = 0;
392	>	double e = 1.0;
393
394		for (cp = s; isspace(*cp); cp++)
395		;
396	+	if (*cp == '@') {
397	+	adapt++;
398	+	while (isspace(*++cp))
399	+	;
400	+	}
401		if (cp == '\0') { / normalize to point */
402		if (dev->getcur == NULL)
403		return;
404		(*dev->comout)("Pick point for exposure\n");
405		if ((*dev->getcur)(&x, &y) == ABORT)
406		return;
407	<	r.l = r.d = 0;
265	<	r.r = hresolu; r.u = vresolu;
266	<	p = findrect(x, y, &ptrunk, &r, -1);
267	<	e = 1.0;
407	>	p = findrect(x, y, &ptrunk, -1);
408		} else {
409		if (cp == '=') { / absolute setting */
410		p = NULL;
#	Line 272 \| Line 412 \| *char s;**
412		for (cp++; isspace(*cp); cp++)
413		;
414		if (cp == '\0') { / interactive */
415	<	sprintf(buf, "exposure (%lf): ", exposure);
415	>	sprintf(buf, "exposure (%f): ", exposure);
416		(*dev->comout)(buf);
417		(*dev->comin)(buf, NULL);
418		for (cp = buf; isspace(*cp); cp++)
#	Line 280 \| Line 420 \| *char s;**
420		if (*cp == '\0')
421		return;
422		}
283	–	} else { /* normalize to average */
284	–	p = &ptrunk;
285	–	e = 1.0;
423		}
424		if (cp == '+' \|\| cp == '-') /* f-stops */
425		e *= pow(2.0, atof(cp));
#	Line 290 \| Line 427 \| *char s;**
427		e *= atof(cp);
428		}
429		if (p != NULL) { /* relative setting */
430	<	if (bright(p->v) <= FTINY) {
430	>	compavg(p);
431	>	if (bright(p->v) < 1e-15) {
432		error(COMMAND, "cannot normalize to zero");
433		return;
434		}
435	<	e *= 0.5 / bright(p->v);
435	>	if (adapt)
436	>	e *= 106./pow(1.219+pow(luminance(p->v)/exposure,.4),2.5)/exposure;
437	>	else
438	>	e *= 0.5 / bright(p->v);
439		}
440		if (e <= FTINY \|\| fabs(1.0 - e) <= FTINY)
441		return;
#	Line 303 \| Line 444 \| *char s;**
444		redraw();
445		}
446
447	+	typedef union {int i; double d; COLOR C;} *MyUptr;
448	+	#define FEQ(x,y) (fabs((x)-(y)) <= FTINY)
449
450	<	getparam(str, dsc, typ, ptr) /* get variable from user */
451	<	char str, dsc;
452	<	int typ;
453	<	register union {int i; double d; COLOR C;} *ptr;
450	>	int
451	>	getparam( /* get variable from user */
452	>	char *str,
453	>	char *dsc,
454	>	int typ,
455	>	void *p
456	>	)
457		{
458	<	extern char *index();
458	>	MyUptr ptr = (MyUptr)p;
459		int i0;
460		double d0, d1, d2;
461		char buf[48];
#	Line 324 \| Line 470 \| *register union {int i; double d; COLOR C;} ptr;**
470		if (sscanf(buf, "%d", &i0) != 1)
471		return(0);
472		}
473	+	if (ptr->i == i0)
474	+	return(0);
475		ptr->i = i0;
476	<	return(1);
476	>	break;
477		case 'r': /* real */
478		if (sscanf(str, "%lf", &d0) != 1) {
479		(*dev->comout)(dsc);
#	Line 335 \| Line 483 \| *register union {int i; double d; COLOR C;} ptr;**
483		if (sscanf(buf, "%lf", &d0) != 1)
484		return(0);
485		}
486	+	if (FEQ(ptr->d, d0))
487	+	return(0);
488		ptr->d = d0;
489	<	return(1);
489	>	break;
490		case 'b': /* boolean */
491		if (sscanf(str, "%1s", buf) != 1) {
492		(*dev->comout)(dsc);
493		sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
494		(*dev->comout)(buf);
495		(*dev->comin)(buf, NULL);
496	<	if (buf[0] == '\0' \|\|
347	<	index("yY+1tTnN-0fF", buf[0]) == NULL)
496	>	if (buf[0] == '\0')
497		return(0);
498		}
499	<	ptr->i = index("yY+1tT", buf[0]) != NULL;
500	<	return(1);
499	>	if (strchr("yY+1tTnN-0fF", buf[0]) == NULL)
500	>	return(0);
501	>	i0 = strchr("yY+1tT", buf[0]) != NULL;
502	>	if (ptr->i == i0)
503	>	return(0);
504	>	ptr->i = i0;
505	>	break;
506		case 'C': /* color */
507		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
508		(*dev->comout)(dsc);
#	Line 361 \| Line 515 \| *register union {int i; double d; COLOR C;} ptr;**
515		if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
516		return(0);
517		}
518	+	if (FEQ(colval(ptr->C,RED), d0) &&
519	+	FEQ(colval(ptr->C,GRN), d1) &&
520	+	FEQ(colval(ptr->C,BLU), d2))
521	+	return(0);
522		setcolor(ptr->C, d0, d1, d2);
523	<	return(1);
523	>	break;
524	>	default:
525	>	return(0); /* shouldn't happen */
526		}
527	+	newparam++;
528	+	return(1);
529		}
530
531
532	<	setparam(s) /* get/set program parameter */
533	<	register char *s;
532	>	void
533	>	setparam( /* get/set program parameter */
534	>	char *s
535	>	)
536		{
537	<	extern int psample;
374	<	extern double maxdiff;
375	<	extern double minweight;
376	<	extern int maxdepth;
377	<	extern double dstrsrc;
378	<	extern double shadthresh;
379	<	extern double shadcert;
380	<	extern COLOR ambval;
381	<	extern double ambacc;
382	<	extern double minarad;
383	<	extern int ambres;
384	<	extern int ambdiv;
385	<	extern int ambssamp;
386	<	extern int ambounce;
387	<	extern int directinvis;
388	<	extern double srcsizerat;
389	<	extern int do_irrad;
537	>	int prev_newp = newparam;
538		char buf[128];
539
540		if (s[0] == '\0') {
541		(*dev->comout)(
542	<	"aa ab ad ar as av b dc di dj ds dt i lr lw sp st: ");
542	>	"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt ss st u: ");
543		(*dev->comin)(buf, NULL);
544		s = buf;
545		}
546		switch (s[0]) {
547	+	case 'u': /* uncorrelated sampling */
548	+	getparam(s+1, "uncorrelated sampling", 'b',
549	+	(void *)&rand_samp);
550	+	break;
551		case 'l': /* limit */
552		switch (s[1]) {
553		case 'w': /* weight */
554	<	getparam(s+2, "limit weight", 'r', &minweight);
554	>	getparam(s+2, "limit weight", 'r',
555	>	(void *)&minweight);
556		break;
557		case 'r': /* reflection */
558	<	getparam(s+2, "limit reflection", 'i', &maxdepth);
558	>	getparam(s+2, "limit reflection", 'i',
559	>	(void *)&maxdepth);
560		break;
561		default:
562		goto badparam;
#	Line 411 \| Line 565 \| *register char s;**
565		case 'd': /* direct */
566		switch (s[1]) {
567		case 'j': /* jitter */
568	<	getparam(s+2, "direct jitter", 'r', &dstrsrc);
568	>	getparam(s+2, "direct jitter", 'r',
569	>	(void *)&dstrsrc);
570		break;
571		case 'c': /* certainty */
572	<	getparam(s+2, "direct certainty", 'r', &shadcert);
572	>	getparam(s+2, "direct certainty", 'r',
573	>	(void *)&shadcert);
574		break;
575		case 't': /* threshold */
576	<	getparam(s+2, "direct threshold", 'r', &shadthresh);
576	>	getparam(s+2, "direct threshold", 'r',
577	>	(void *)&shadthresh);
578		break;
579	<	case 'i': /* invisibility */
580	<	getparam(s+2, "direct invisibility",
581	<	'b', &directinvis);
579	>	case 'v': /* visibility */
580	>	getparam(s+2, "direct visibility", 'b',
581	>	(void *)&directvis);
582		break;
583		case 's': /* sampling */
584	<	getparam(s+2, "direct sampling", 'r', &srcsizerat);
584	>	getparam(s+2, "direct sampling", 'r',
585	>	(void *)&srcsizerat);
586		break;
587		default:
588		goto badparam;
589		}
590		break;
591	<	case 'b': /* black and white */
592	<	getparam(s+1, "black and white", 'b', &greyscale);
591	>	case 'b': /* back faces or black and white */
592	>	switch (s[1]) {
593	>	case 'v': /* back face visibility */
594	>	getparam(s+2, "back face visibility", 'b',
595	>	(void *)&backvis);
596	>	break;
597	>	case '\0': /* black and white */
598	>	case ' ':
599	>	case 'y': case 'Y': case 't': case 'T': case '1': case '+':
600	>	case 'n': case 'N': case 'f': case 'F': case '0': case '-':
601	>	getparam(s+1, "black and white", 'b',
602	>	(void *)&greyscale);
603	>	newparam = prev_newp;
604	>	break;
605	>	default:
606	>	goto badparam;
607	>	}
608		break;
609		case 'i': /* irradiance */
610	<	getparam(s+1, "irradiance", 'b', &do_irrad);
610	>	getparam(s+1, "irradiance", 'b',
611	>	(void *)&do_irrad);
612		break;
613		case 'a': /* ambient */
614		switch (s[1]) {
615		case 'v': /* value */
616	<	getparam(s+2, "ambient value", 'C', ambval);
616	>	getparam(s+2, "ambient value", 'C',
617	>	(void *)ambval);
618		break;
619	+	case 'w': /* weight */
620	+	getparam(s+2, "ambient value weight", 'i',
621	+	(void *)&ambvwt);
622	+	break;
623		case 'a': /* accuracy */
624	<	getparam(s+2, "ambient accuracy", 'r', &ambacc);
624	>	if (getparam(s+2, "ambient accuracy", 'r',
625	>	(void *)&ambacc))
626	>	setambacc(ambacc);
627		break;
628		case 'd': /* divisions */
629	<	getparam(s+2, "ambient divisions", 'i', &ambdiv);
629	>	getparam(s+2, "ambient divisions", 'i',
630	>	(void *)&ambdiv);
631		break;
632		case 's': /* samples */
633	<	getparam(s+2, "ambient super-samples", 'i', &ambssamp);
633	>	getparam(s+2, "ambient super-samples", 'i',
634	>	(void *)&ambssamp);
635		break;
636		case 'b': /* bounces */
637	<	getparam(s+2, "ambient bounces", 'i', &ambounce);
637	>	getparam(s+2, "ambient bounces", 'i',
638	>	(void *)&ambounce);
639		break;
640		case 'r':
641	<	if (getparam(s+2, "ambient resolution", 'i', &ambres))
642	<	minarad = ambres > 0 ?
643	<	thescene.cusize/ambres : 0.0;
641	>	if (getparam(s+2, "ambient resolution", 'i',
642	>	(void *)&ambres))
643	>	setambres(ambres);
644		break;
645		default:
646		goto badparam;
647		}
648		break;
649	<	case 's': /* sample */
649	>	case 'm': /* medium */
650		switch (s[1]) {
651	<	case 'p': /* pixel */
652	<	if (getparam(s+2, "sample pixel", 'i', &psample))
651	>	case 'e': /* extinction coefficient */
652	>	getparam(s+2, "extinction coefficient", 'C',
653	>	(void *)cextinction);
654	>	break;
655	>	case 'a': /* scattering albedo */
656	>	getparam(s+2, "scattering albedo", 'C',
657	>	(void *)salbedo);
658	>	break;
659	>	case 'g': /* scattering eccentricity */
660	>	getparam(s+2, "scattering eccentricity", 'r',
661	>	(void *)&seccg);
662	>	break;
663	>	case 's': /* sampling distance */
664	>	getparam(s+2, "mist sampling distance", 'r',
665	>	(void *)&ssampdist);
666	>	break;
667	>	default:
668	>	goto badparam;
669	>	}
670	>	break;
671	>	case 'p': /* pixel */
672	>	switch (s[1]) {
673	>	case 's': /* sample */
674	>	if (getparam(s+2, "pixel sample", 'i',
675	>	(void *)&psample))
676		pdepth = 0;
677		break;
678		case 't': /* threshold */
679	<	if (getparam(s+2, "sample threshold", 'r', &maxdiff))
679	>	if (getparam(s+2, "pixel threshold", 'r',
680	>	(void *)&maxdiff))
681		pdepth = 0;
682		break;
683		default:
684		goto badparam;
685		}
686	+	newparam = prev_newp;
687		break;
688	+	case 's': /* specular */
689	+	switch (s[1]) {
690	+	case 's': /* sampling */
691	+	getparam(s+2, "specular sampling", 'r',
692	+	(void *)&specjitter);
693	+	break;
694	+	case 't': /* threshold */
695	+	getparam(s+2, "specular threshold", 'r',
696	+	(void *)&specthresh);
697	+	break;
698	+	default:
699	+	goto badparam;
700	+	}
701	+	break;
702		case '\0': /* nothing */
703		break;
704		default:;
#	Line 488 \| Line 711 \| badparam:
711		}
712
713
714	<	traceray(s) /* trace a single ray */
715	<	char *s;
714	>	void
715	>	traceray( /* trace a single ray */
716	>	char *s
717	>	)
718		{
719		char buf[128];
720		int x, y;
721	+	OBJREC *ino;
722		RAY thisray;
723
724	<	if (sscanf(s, "%lf %lf %lf %lf %lf %lf",
499	<	&thisray.rorg[0], &thisray.rorg[1], &thisray.rorg[2],
500	<	&thisray.rdir[0], &thisray.rdir[1], &thisray.rdir[2]) != 6) {
724	>	thisray.rmax = 0.0;
725
726	+	if (!sscanvec(s, thisray.rorg) \|\|
727	+	!sscanvec(sskip2(s,3), thisray.rdir)) {
728	+
729		if (dev->getcur == NULL)
730		return;
731		(*dev->comout)("Pick ray\n");
732		if ((*dev->getcur)(&x, &y) == ABORT)
733		return;
734
735	<	if (viewray(thisray.rorg, thisray.rdir, &ourview,
736	<	(x+.5)/hresolu, (y+.5)/vresolu) < 0) {
735	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
736	>	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
737		error(COMMAND, "not on image");
738		return;
739		}
#	Line 516 \| Line 743 \| *char s;**
743		return;
744		}
745
746	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
520	<
521	<	rayvalue(&thisray);
746	>	ray_trace(&thisray);
747
748		if (thisray.ro == NULL)
749		(*dev->comout)("ray hit nothing");
750		else {
751	<	sprintf(buf, "ray hit %s %s \"%s\"",
752	<	objptr(thisray.ro->omod)->oname,
751	>	OBJREC *mat = NULL;
752	>	OBJREC *mod = NULL;
753	>	char matspec[256];
754	>	matspec[0] = '\0';
755	>	if (thisray.ro->omod != OVOID) {
756	>	mod = objptr(thisray.ro->omod);
757	>	mat = findmaterial(mod);
758	>	}
759	>	if (thisray.rod < 0.0)
760	>	strcpy(matspec, "back of ");
761	>	if (mod != NULL) {
762	>	strcat(matspec, mod->oname);
763	>	if (mat != mod && mat != NULL)
764	>	sprintf(matspec+strlen(matspec),
765	>	" (%s)", mat->oname);
766	>	} else
767	>	strcat(matspec, VOIDID);
768	>	sprintf(buf, "ray hit %s %s \"%s\"", matspec,
769		ofun[thisray.ro->otype].funame,
770		thisray.ro->oname);
771	+	if ((ino = objptr(thisray.robj)) != thisray.ro)
772	+	sprintf(buf+strlen(buf), " in %s \"%s\"",
773	+	ofun[ino->otype].funame, ino->oname);
774		(*dev->comout)(buf);
775		(*dev->comin)(buf, NULL);
776		if (thisray.rot >= FHUGE)
777		(*dev->comout)("at infinity");
778		else {
779	<	sprintf(buf, "at (%.6g %.6g %.6g)", thisray.rop[0],
780	<	thisray.rop[1], thisray.rop[2]);
779	>	sprintf(buf, "at (%.6g %.6g %.6g) (%.6g)",
780	>	thisray.rop[0], thisray.rop[1],
781	>	thisray.rop[2], thisray.rt);
782		(*dev->comout)(buf);
783		}
784		(*dev->comin)(buf, NULL);
785	<	sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)",
785	>	sprintf(buf, "value (%.5g %.5g %.5g) (%.3gL)",
786		colval(thisray.rcol,RED),
787		colval(thisray.rcol,GRN),
788		colval(thisray.rcol,BLU),
#	Line 548 \| Line 793 \| *char s;**
793		}
794
795
796	<	writepict(s) /* write the picture to a file */
797	<	char *s;
796	>	void
797	>	writepict( /* write the picture to a file */
798	>	char *s
799	>	)
800		{
801		static char buf[128];
802		char *fname;
#	Line 557 \| Line 804 \| *char s;**
804		COLR *scanline;
805		int y;
806
807	<	if (sscanf(s, "%s", buf) != 1 && buf[0] == '\0') {
807	>	while (isspace(*s))
808	>	s++;
809	>	if (*s)
810	>	atos(buf, sizeof(buf), s);
811	>	else if (buf[0] == '\0') {
812		error(COMMAND, "no file");
813		return;
814		}
#	Line 567 \| Line 818 \| *char s;**
818		error(COMMAND, errmsg);
819		return;
820		}
821	+	SET_FILE_BINARY(fp);
822		(*dev->comout)("writing \"");
823		(*dev->comout)(fname);
824		(*dev->comout)("\"...\n");
825		/* write header */
826	+	newheader("RADIANCE", fp);
827		fputs(progname, fp);
828		fprintview(&ourview, fp);
829		if (octname != NULL)
#	Line 578 \| Line 831 \| *char s;**
831		else
832		putc('\n', fp);
833		fprintf(fp, "SOFTWARE= %s\n", VersionID);
834	+	fputnow(fp);
835		if (exposure != 1.0)
836		fputexpos(exposure, fp);
837		if (dev->pixaspect != 1.0)
#	Line 598 \| Line 852 \| *char s;**
852		if (fwritecolrs(scanline, hresolu, fp) < 0)
853		break;
854		}
855	<	free((char *)scanline);
855	>	free((void *)scanline);
856		if (fclose(fp) < 0)
857		error(COMMAND, "write error");
858		}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/rt/rv2.c (file contents): Revision 2.4 by greg, Mon Dec 23 23:18:31 1991 UTC vs. Revision 2.60 by greg, Fri Oct 8 22:55:49 2010 UTC

Diff Legend

Comparing ray/src/rt/rv2.c (file contents):
Revision 2.4 by greg, Mon Dec 23 23:18:31 1991 UTC vs.
Revision 2.60 by greg, Fri Oct 8 22:55:49 2010 UTC