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

Comparing ray/src/rt/rv2.c (file contents):
Revision 1.7 by greg, Wed Jun 7 22:22:40 1989 UTC vs.
Revision 2.38 by greg, Sat Feb 22 02:07:29 2003 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1987 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	+	/* ====================================================================
11	+	* The Radiance Software License, Version 1.0
12	+	*
13	+	* Copyright (c) 1990 - 2002 The Regents of the University of California,
14	+	* through Lawrence Berkeley National Laboratory. All rights reserved.
15	+	*
16	+	* Redistribution and use in source and binary forms, with or without
17	+	* modification, are permitted provided that the following conditions
18	+	* are met:
19	+	*
20	+	* 1. Redistributions of source code must retain the above copyright
21	+	* notice, this list of conditions and the following disclaimer.
22	+	*
23	+	* 2. Redistributions in binary form must reproduce the above copyright
24	+	* notice, this list of conditions and the following disclaimer in
25	+	* the documentation and/or other materials provided with the
26	+	* distribution.
27	+	*
28	+	* 3. The end-user documentation included with the redistribution,
29	+	* if any, must include the following acknowledgment:
30	+	* "This product includes Radiance software
31	+	* (http://radsite.lbl.gov/)
32	+	* developed by the Lawrence Berkeley National Laboratory
33	+	* (http://www.lbl.gov/)."
34	+	* Alternately, this acknowledgment may appear in the software itself,
35	+	* if and wherever such third-party acknowledgments normally appear.
36	+	*
37	+	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38	+	* and "The Regents of the University of California" must
39	+	* not be used to endorse or promote products derived from this
40	+	* software without prior written permission. For written
41	+	* permission, please contact [email protected].
42	+	*
43	+	* 5. Products derived from this software may not be called "Radiance",
44	+	* nor may "Radiance" appear in their name, without prior written
45	+	* permission of Lawrence Berkeley National Laboratory.
46	+	*
47	+	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48	+	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49	+	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50	+	* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51	+	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52	+	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53	+	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54	+	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55	+	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56	+	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57	+	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58	+	* SUCH DAMAGE.
59	+	* ====================================================================
60	+	*
61	+	* This software consists of voluntary contributions made by many
62	+	* individuals on behalf of Lawrence Berkeley National Laboratory. For more
63	+	* information on Lawrence Berkeley National Laboratory, please see
64	+	* <http://www.lbl.gov/>.
65	+	*/
66	+
67		#include "ray.h"
68
15	–	#include "octree.h"
16	–
69		#include "otypes.h"
70
71		#include "rpaint.h"
72
73		#include <ctype.h>
74
75	<	#define CTRL(c) ('c'-'@')
75	>	extern int psample; /* pixel sample size */
76	>	extern double maxdiff; /* max. sample difference */
77
78	+	#define CTRL(c) ((c)-'@')
79	+
80	+	#ifdef SMLFLT
81	+	#define sscanvec(s,v) (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
82	+	#else
83	+	#define sscanvec(s,v) (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
84	+	#endif
85	+
86	+	extern char rifname[128]; /* rad input file name */
87	+
88		extern char *progname;
89	+	extern char *octname;
90
91
92	+	void
93		getframe(s) /* get a new frame */
94		char *s;
95		{
96	<	int x0, y0, x1, y1;
32	<
33	<	if (!strcmp("all", s)) {
34	<	pframe.l = pframe.d = 0;
35	<	pframe.r = ourview.hresolu;
36	<	pframe.u = ourview.vresolu;
37	<	pdepth = 0;
96	>	if (getrect(s, &pframe) < 0)
97		return;
39	–	}
40	–	if (sscanf(s, "%d %d %d %d", &x0, &y0, &x1, &y1) != 4) {
41	–	if (dev->getcur == NULL)
42	–	return;
43	–	(*dev->comout)("Pick first corner\n");
44	–	if ((*dev->getcur)(&x0, &y0) == ABORT)
45	–	return;
46	–	(*dev->comout)("Pick second corner\n");
47	–	if ((*dev->getcur)(&x1, &y1) == ABORT)
48	–	return;
49	–	}
50	–	if (x0 < x1) {
51	–	pframe.l = x0;
52	–	pframe.r = x1;
53	–	} else {
54	–	pframe.l = x1;
55	–	pframe.r = x0;
56	–	}
57	–	if (y0 < y1) {
58	–	pframe.d = y0;
59	–	pframe.u = y1;
60	–	} else {
61	–	pframe.d = y1;
62	–	pframe.u = y0;
63	–	}
64	–	if (pframe.l < 0) pframe.l = 0;
65	–	if (pframe.d < 0) pframe.d = 0;
66	–	if (pframe.r > ourview.hresolu) pframe.r = ourview.hresolu;
67	–	if (pframe.u > ourview.vresolu) pframe.u = ourview.vresolu;
98		pdepth = 0;
99		}
100
101
102	+	void
103	+	getrepaint(s) /* get area and repaint */
104	+	char *s;
105	+	{
106	+	RECT box;
107	+
108	+	if (getrect(s, &box) < 0)
109	+	return;
110	+	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
111	+	}
112	+
113	+
114	+	void
115		getview(s) /* get/show view parameters */
116		char *s;
117		{
118		FILE *fp;
119		char buf[128];
120	<	char fname, getpath();
120	>	char *fname;
121		int change = 0;
122		VIEW nv;
123
124	+	while (isspace(*s))
125	+	s++;
126	+	if (s == '-') { / command line parameters */
127	+	copystruct(&nv, &ourview);
128	+	if (sscanview(&nv, s))
129	+	newview(&nv);
130	+	else
131	+	error(COMMAND, "bad view option(s)");
132	+	return;
133	+	}
134		if (sscanf(s, "%s", buf) == 1) { /* write parameters to a file */
135	<	if ((fname = getpath(buf, NULL)) == NULL \|\|
135	>	if ((fname = getpath(buf, NULL, 0)) == NULL \|\|
136		(fp = fopen(fname, "a")) == NULL) {
137		sprintf(errmsg, "cannot open \"%s\"", buf);
138		error(COMMAND, errmsg);
#	Line 87 \| Line 140 \| *char s;**
140		}
141		fputs(progname, fp);
142		fprintview(&ourview, fp);
143	<	fputs("\n", fp);
143	>	fputs(sskip(s), fp);
144	>	putc('\n', fp);
145		fclose(fp);
146		return;
147		}
148		sprintf(buf, "view type (%c): ", ourview.type);
149		(*dev->comout)(buf);
150	<	(*dev->comin)(buf);
151	<	if (buf[0] == CTRL(C)) return;
150	>	(*dev->comin)(buf, NULL);
151	>	if (buf[0] == CTRL('C')) return;
152		if (buf[0] && buf[0] != ourview.type) {
153		nv.type = buf[0];
154		change++;
#	Line 103 \| Line 157 \| *char s;**
157		sprintf(buf, "view point (%.6g %.6g %.6g): ",
158		ourview.vp[0], ourview.vp[1], ourview.vp[2]);
159		(*dev->comout)(buf);
160	<	(*dev->comin)(buf);
161	<	if (buf[0] == CTRL(C)) return;
162	<	if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3)
160	>	(*dev->comin)(buf, NULL);
161	>	if (buf[0] == CTRL('C')) return;
162	>	if (sscanvec(buf, nv.vp))
163		change++;
164		else
165		VCOPY(nv.vp, ourview.vp);
166		sprintf(buf, "view direction (%.6g %.6g %.6g): ",
167		ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
168		(*dev->comout)(buf);
169	<	(*dev->comin)(buf);
170	<	if (buf[0] == CTRL(C)) return;
171	<	if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3)
169	>	(*dev->comin)(buf, NULL);
170	>	if (buf[0] == CTRL('C')) return;
171	>	if (sscanvec(buf, nv.vdir))
172		change++;
173		else
174		VCOPY(nv.vdir, ourview.vdir);
175		sprintf(buf, "view up (%.6g %.6g %.6g): ",
176		ourview.vup[0], ourview.vup[1], ourview.vup[2]);
177		(*dev->comout)(buf);
178	<	(*dev->comin)(buf);
179	<	if (buf[0] == CTRL(C)) return;
180	<	if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3)
178	>	(*dev->comin)(buf, NULL);
179	>	if (buf[0] == CTRL('C')) return;
180	>	if (sscanvec(buf, nv.vup))
181		change++;
182		else
183		VCOPY(nv.vup, ourview.vup);
184		sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
185		ourview.horiz, ourview.vert);
186		(*dev->comout)(buf);
187	<	(*dev->comin)(buf);
188	<	if (buf[0] == CTRL(C)) return;
187	>	(*dev->comin)(buf, NULL);
188	>	if (buf[0] == CTRL('C')) return;
189		if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
190		change++;
191		else {
192		nv.horiz = ourview.horiz; nv.vert = ourview.vert;
193		}
194	<	sprintf(buf, "x and y resolution (%d %d): ",
195	<	ourview.hresolu, ourview.vresolu);
194	>	sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
195	>	ourview.vfore, ourview.vaft);
196		(*dev->comout)(buf);
197	<	(*dev->comin)(buf);
198	<	if (buf[0] == CTRL(C)) return;
199	<	if (sscanf(buf, "%d %d", &nv.hresolu, &nv.vresolu) == 2)
197	>	(*dev->comin)(buf, NULL);
198	>	if (buf[0] == CTRL('C')) return;
199	>	if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
200		change++;
201		else {
202	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
202	>	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
203		}
204	+	sprintf(buf, "view shift and lift (%.6g %.6g): ",
205	+	ourview.hoff, ourview.voff);
206	+	(*dev->comout)(buf);
207	+	(*dev->comin)(buf, NULL);
208	+	if (buf[0] == CTRL('C')) return;
209	+	if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
210	+	change++;
211	+	else {
212	+	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
213	+	}
214		if (change)
215		newview(&nv);
216		}
217
218
219	+	void
220		lastview(s) /* return to a previous view */
221		char *s;
222		{
223		char buf[128];
224	<	char fname, getpath();
224	>	char *fname;
225		int success;
226		VIEW nv;
227
228		if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */
229	<	bcopy(&stdview, &nv, sizeof(VIEW));
230	<	if ((fname = getpath(buf, NULL)) == NULL \|\|
231	<	(success = viewfile(fname, &nv)) == -1) {
229	>	copystruct(&nv, &stdview);
230	>	if ((fname = getpath(buf, "", R_OK)) == NULL \|\|
231	>	(success = viewfile(fname, &nv, NULL)) == -1) {
232		sprintf(errmsg, "cannot open \"%s\"", buf);
233		error(COMMAND, errmsg);
234		return;
#	Line 174 \| Line 239 \| *char s;**
239		newview(&nv);
240		return;
241		}
242	<	if (oldview.hresolu == 0) { /* no old view! */
242	>	if (oldview.type == 0) { /* no old view! */
243		error(COMMAND, "no previous view");
244		return;
245		}
246	<	bcopy(&ourview, &nv, sizeof(VIEW));
247	<	bcopy(&oldview, &ourview, sizeof(VIEW));
248	<	bcopy(&nv, &oldview, sizeof(VIEW));
246	>	copystruct(&nv, &ourview);
247	>	copystruct(&ourview, &oldview);
248	>	copystruct(&oldview, &nv);
249		newimage();
250		}
251
252
253	<	getinterest(s, direc, vec, mp) /* get area of interest */
253	>	void
254	>	saveview(s) /* save view to rad file */
255		char *s;
190	–	int direc;
191	–	FVECT vec;
192	–	double *mp;
256		{
257	<	int x, y;
258	<	RAY thisray;
259	<	register int i;
257	>	char view[64];
258	>	char *fname;
259	>	FILE *fp;
260
261	<	if (sscanf(s, "%lf", mp) != 1)
262	<	*mp = 1.0;
263	<	else if (mp < -FTINY) / negative zoom is reduction */
264	<	mp = -1.0 / mp;
202	<	else if (mp <= FTINY) { / too small */
203	<	error(COMMAND, "illegal magnification");
204	<	return(-1);
205	<	}
206	<	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
207	<	if (dev->getcur == NULL)
208	<	return(-1);
209	<	(*dev->comout)("Pick view center\n");
210	<	if ((*dev->getcur)(&x, &y) == ABORT)
211	<	return(-1);
212	<	rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
213	<	if (!direc \|\| ourview.type == VT_PAR) {
214	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
215	<	if (!localhit(&thisray, &thescene)) {
216	<	error(COMMAND, "not a local object");
217	<	return(-1);
218	<	}
261	>	if (*atos(view, sizeof(view), s)) {
262	>	if (isint(view)) {
263	>	error(COMMAND, "cannot write view by number");
264	>	return;
265		}
266	<	if (direc)
267	<	if (ourview.type == VT_PAR)
268	<	for (i = 0; i < 3; i++)
269	<	vec[i] = thisray.rop[i] - ourview.vp[i];
270	<	else
271	<	VCOPY(vec, thisray.rdir);
272	<	else
273	<	VCOPY(vec, thisray.rop);
274	<	} else if (direc)
275	<	for (i = 0; i < 3; i++)
276	<	vec[i] -= ourview.vp[i];
277	<	return(0);
266	>	s = sskip(s);
267	>	}
268	>	while (isspace(*s))
269	>	s++;
270	>	if (*s)
271	>	atos(rifname, sizeof(rifname), s);
272	>	else if (rifname[0] == '\0') {
273	>	error(COMMAND, "no previous rad file");
274	>	return;
275	>	}
276	>	if ((fname = getpath(rifname, NULL, 0)) == NULL \|\|
277	>	(fp = fopen(fname, "a")) == NULL) {
278	>	sprintf(errmsg, "cannot open \"%s\"", rifname);
279	>	error(COMMAND, errmsg);
280	>	return;
281	>	}
282	>	fputs("view= ", fp);
283	>	fputs(view, fp);
284	>	fprintview(&ourview, fp);
285	>	putc('\n', fp);
286	>	fclose(fp);
287		}
288
289
290	+	void
291	+	loadview(s) /* load view from rad file */
292	+	char *s;
293	+	{
294	+	char buf[512];
295	+	char *fname;
296	+	FILE *fp;
297	+	VIEW nv;
298	+
299	+	strcpy(buf, "rad -n -s -V -v ");
300	+	if (sscanf(s, "%s", buf+strlen(buf)) == 1)
301	+	s = sskip(s);
302	+	else
303	+	strcat(buf, "1");
304	+	if (*s)
305	+	atos(rifname, sizeof(rifname), s);
306	+	else if (rifname[0] == '\0') {
307	+	error(COMMAND, "no previous rad file");
308	+	return;
309	+	}
310	+	if ((fname = getpath(rifname, "", R_OK)) == NULL) {
311	+	sprintf(errmsg, "cannot access \"%s\"", rifname);
312	+	error(COMMAND, errmsg);
313	+	return;
314	+	}
315	+	sprintf(buf+strlen(buf), " %s", fname);
316	+	if ((fp = popen(buf, "r")) == NULL) {
317	+	error(COMMAND, "cannot run rad");
318	+	return;
319	+	}
320	+	buf[0] = '\0';
321	+	fgets(buf, sizeof(buf), fp);
322	+	pclose(fp);
323	+	copystruct(&nv, &stdview);
324	+	if (!sscanview(&nv, buf)) {
325	+	error(COMMAND, "rad error -- no such view?");
326	+	return;
327	+	}
328	+	newview(&nv);
329	+	}
330	+
331	+
332	+	void
333		getaim(s) /* aim camera */
334		char *s;
335		{
238	–	extern double tan(), atan();
336		double zfact;
337		VIEW nv;
338
339		if (getinterest(s, 1, nv.vdir, &zfact) < 0)
340		return;
341	+	nv.type = ourview.type;
342		VCOPY(nv.vp, ourview.vp);
343		VCOPY(nv.vup, ourview.vup);
344	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
345	<	if ((nv.type = ourview.type) == VT_PAR) {
346	<	nv.horiz = ourview.horiz / zfact;
347	<	nv.vert = ourview.vert / zfact;
250	<	} else {
251	<	nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) /
252	<	(PI/180./2.);
253	<	nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) /
254	<	(PI/180./2.);
255	<	}
344	>	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
345	>	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
346	>	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
347	>	zoomview(&nv, zfact);
348		newview(&nv);
349		}
350
351
352	+	void
353		getmove(s) /* move camera */
354		char *s;
355		{
#	Line 269 \| Line 362 \| *char s;**
362		}
363
364
365	+	void
366		getrotate(s) /* rotate camera */
367		char *s;
368		{
275	–	extern double normalize(), tan(), atan();
369		VIEW nv;
370		FVECT v1;
371		double angle, elev, zfact;
#	Line 282 \| Line 375 \| *char s;**
375		error(COMMAND, "missing angle");
376		return;
377		}
378	+	nv.type = ourview.type;
379		VCOPY(nv.vp, ourview.vp);
380		VCOPY(nv.vup, ourview.vup);
381	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
381	>	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
382	>	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
383		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
384		if (elev != 0.0) {
385		fcross(v1, nv.vdir, ourview.vup);
386		normalize(v1);
387		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
388		}
389	<	if ((nv.type = ourview.type) == VT_PAR) {
390	<	nv.horiz = ourview.horiz / zfact;
296	<	nv.vert = ourview.vert / zfact;
297	<	} else {
298	<	nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) /
299	<	(PI/180./2.);
300	<	nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) /
301	<	(PI/180./2.);
302	<	}
389	>	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
390	>	zoomview(&nv, zfact);
391		newview(&nv);
392		}
393
394
395	+	void
396		getpivot(s) /* pivot viewpoint */
397		register char *s;
398		{
#	Line 315 \| Line 404 \| *register char s;**
404		error(COMMAND, "missing angle");
405		return;
406		}
407	<	if (getinterest(sskip(sskip(s)), 0, vc, &mag) < 0)
407	>	if (getinterest(sskip2(s,2), 0, vc, &mag) < 0)
408		return;
409		moveview(angle, elev, mag, vc);
410		}
411
412
413	+	void
414		getexposure(s) /* get new exposure */
415		char *s;
416		{
327	–	double atof(), pow(), fabs();
417		char buf[128];
418		register char *cp;
330	–	register PNODE *p;
419		RECT r;
420		int x, y;
421	<	double e;
421	>	register PNODE *p = &ptrunk;
422	>	int adapt = 0;
423	>	double e = 1.0;
424
425		for (cp = s; isspace(*cp); cp++)
426		;
427	+	if (*cp == '@') {
428	+	adapt++;
429	+	while (isspace(*++cp))
430	+	;
431	+	}
432		if (cp == '\0') { / normalize to point */
433		if (dev->getcur == NULL)
434		return;
#	Line 341 \| Line 436 \| *char s;**
436		if ((*dev->getcur)(&x, &y) == ABORT)
437		return;
438		r.l = r.d = 0;
439	<	r.r = ourview.hresolu; r.u = ourview.vresolu;
439	>	r.r = hresolu; r.u = vresolu;
440		p = findrect(x, y, &ptrunk, &r, -1);
346	–	e = 1.0;
441		} else {
442		if (cp == '=') { / absolute setting */
443		p = NULL;
#	Line 351 \| Line 445 \| *char s;**
445		for (cp++; isspace(*cp); cp++)
446		;
447		if (cp == '\0') { / interactive */
448	<	sprintf(buf, "exposure (%lf): ", exposure);
448	>	sprintf(buf, "exposure (%f): ", exposure);
449		(*dev->comout)(buf);
450	<	(*dev->comin)(buf);
450	>	(*dev->comin)(buf, NULL);
451		for (cp = buf; isspace(*cp); cp++)
452		;
453		if (*cp == '\0')
454		return;
455		}
362	–	} else { /* normalize to average */
363	–	p = &ptrunk;
364	–	e = 1.0;
456		}
457		if (cp == '+' \|\| cp == '-') /* f-stops */
458		e *= pow(2.0, atof(cp));
#	Line 369 \| Line 460 \| *char s;**
460		e *= atof(cp);
461		}
462		if (p != NULL) { /* relative setting */
463	<	if (bright(p->v) <= FTINY) {
463	>	if (bright(p->v) < 1e-15) {
464		error(COMMAND, "cannot normalize to zero");
465		return;
466		}
467	<	e *= 0.5 / bright(p->v);
467	>	if (adapt)
468	>	e *= 106./pow(1.219+pow(luminance(p->v)/exposure,.4),2.5)/exposure;
469	>	else
470	>	e *= 0.5 / bright(p->v);
471		}
472		if (e <= FTINY \|\| fabs(1.0 - e) <= FTINY)
473		return;
#	Line 382 \| Line 476 \| *char s;**
476		redraw();
477		}
478
479	+	typedef union {int i; double d; COLOR C;} *MyUptr;
480
481	<	setparam(s) /* get/set program parameter */
482	<	register char *s;
481	>	int
482	>	getparam(str, dsc, typ, p) /* get variable from user */
483	>	char str, dsc;
484	>	int typ;
485	>	void *p;
486		{
487	<	extern int psample;
390	<	extern double maxdiff;
391	<	extern double minweight;
392	<	extern int maxdepth;
393	<	extern double dstrsrc;
394	<	extern double shadthresh;
395	<	extern COLOR ambval;
396	<	extern double ambacc;
397	<	extern double minarad;
398	<	extern int ambres;
399	<	extern int ambdiv;
400	<	extern int ambssamp;
401	<	extern int ambounce;
487	>	register MyUptr ptr = (MyUptr)p;
488		int i0;
489		double d0, d1, d2;
490	+	char buf[48];
491	+
492	+	switch (typ) {
493	+	case 'i': /* integer */
494	+	if (sscanf(str, "%d", &i0) != 1) {
495	+	(*dev->comout)(dsc);
496	+	sprintf(buf, " (%d): ", ptr->i);
497	+	(*dev->comout)(buf);
498	+	(*dev->comin)(buf, NULL);
499	+	if (sscanf(buf, "%d", &i0) != 1)
500	+	return(0);
501	+	}
502	+	ptr->i = i0;
503	+	return(1);
504	+	case 'r': /* real */
505	+	if (sscanf(str, "%lf", &d0) != 1) {
506	+	(*dev->comout)(dsc);
507	+	sprintf(buf, " (%.6g): ", ptr->d);
508	+	(*dev->comout)(buf);
509	+	(*dev->comin)(buf, NULL);
510	+	if (sscanf(buf, "%lf", &d0) != 1)
511	+	return(0);
512	+	}
513	+	ptr->d = d0;
514	+	return(1);
515	+	case 'b': /* boolean */
516	+	if (sscanf(str, "%1s", buf) != 1) {
517	+	(*dev->comout)(dsc);
518	+	sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
519	+	(*dev->comout)(buf);
520	+	(*dev->comin)(buf, NULL);
521	+	if (buf[0] == '\0' \|\|
522	+	index("yY+1tTnN-0fF", buf[0]) == NULL)
523	+	return(0);
524	+	}
525	+	ptr->i = index("yY+1tT", buf[0]) != NULL;
526	+	return(1);
527	+	case 'C': /* color */
528	+	if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
529	+	(*dev->comout)(dsc);
530	+	sprintf(buf, " (%.6g %.6g %.6g): ",
531	+	colval(ptr->C,RED),
532	+	colval(ptr->C,GRN),
533	+	colval(ptr->C,BLU));
534	+	(*dev->comout)(buf);
535	+	(*dev->comin)(buf, NULL);
536	+	if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
537	+	return(0);
538	+	}
539	+	setcolor(ptr->C, d0, d1, d2);
540	+	return(1);
541	+	}
542	+	}
543	+
544	+
545	+	void
546	+	setparam(s) /* get/set program parameter */
547	+	register char *s;
548	+	{
549		char buf[128];
550
551		if (s[0] == '\0') {
552	<	(*dev->comout)("aa ab ad ar as av dj dt lr lw sd sp: ");
553	<	(*dev->comin)(buf);
552	>	(*dev->comout)(
553	>	"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: ");
554	>	(*dev->comin)(buf, NULL);
555		s = buf;
556		}
557		switch (s[0]) {
558		case 'l': /* limit */
559		switch (s[1]) {
560		case 'w': /* weight */
561	<	if (sscanf(s+2, "%lf", &d0) != 1) {
562	<	sprintf(buf, "limit weight (%.6g): ",
417	<	minweight);
418	<	(*dev->comout)(buf);
419	<	(*dev->comin)(buf);
420	<	if (sscanf(buf, "%lf", &d0) != 1)
421	<	break;
422	<	}
423	<	minweight = d0;
561	>	getparam(s+2, "limit weight", 'r',
562	>	(void *)&minweight);
563		break;
564		case 'r': /* reflection */
565	<	if (sscanf(s+2, "%d", &i0) != 1) {
566	<	sprintf(buf, "limit reflection (%d): ",
428	<	maxdepth);
429	<	(*dev->comout)(buf);
430	<	(*dev->comin)(buf);
431	<	if (sscanf(buf, "%d", &i0) != 1)
432	<	break;
433	<	}
434	<	maxdepth = i0;
565	>	getparam(s+2, "limit reflection", 'i',
566	>	(void *)&maxdepth);
567		break;
568		default:
569		goto badparam;
#	Line 440 \| Line 572 \| *register char s;**
572		case 'd': /* direct */
573		switch (s[1]) {
574		case 'j': /* jitter */
575	<	if (sscanf(s+2, "%lf", &d0) != 1) {
576	<	sprintf(buf, "direct jitter (%.6g): ",
445	<	dstrsrc);
446	<	(*dev->comout)(buf);
447	<	(*dev->comin)(buf);
448	<	if (sscanf(buf, "%lf", &d0) != 1)
449	<	break;
450	<	}
451	<	dstrsrc = d0;
575	>	getparam(s+2, "direct jitter", 'r',
576	>	(void *)&dstrsrc);
577		break;
578	<	case 't': /* tolerance */
579	<	if (sscanf(s+2, "%lf", &d0) != 1) {
580	<	sprintf(buf, "direct tolerance (%.6g): ",
456	<	shadthresh);
457	<	(*dev->comout)(buf);
458	<	(*dev->comin)(buf);
459	<	if (sscanf(buf, "%lf", &d0) != 1)
460	<	break;
461	<	}
462	<	shadthresh = d0;
578	>	case 'c': /* certainty */
579	>	getparam(s+2, "direct certainty", 'r',
580	>	(void *)&shadcert);
581		break;
582	+	case 't': /* threshold */
583	+	getparam(s+2, "direct threshold", 'r',
584	+	(void *)&shadthresh);
585	+	break;
586	+	case 'v': /* visibility */
587	+	getparam(s+2, "direct visibility", 'b',
588	+	(void *)&directvis);
589	+	break;
590	+	case 's': /* sampling */
591	+	getparam(s+2, "direct sampling", 'r',
592	+	(void *)&srcsizerat);
593	+	break;
594		default:
595		goto badparam;
596		}
597		break;
598	+	case 'b': /* back faces or black and white */
599	+	switch (s[1]) {
600	+	case 'v': /* back face visibility */
601	+	getparam(s+2, "back face visibility", 'b',
602	+	(void *)&backvis);
603	+	break;
604	+	case '\0': /* black and white */
605	+	case ' ':
606	+	case 'y': case 'Y': case 't': case 'T': case '1': case '+':
607	+	case 'n': case 'N': case 'f': case 'F': case '0': case '-':
608	+	getparam(s+1, "black and white", 'b',
609	+	(void *)&greyscale);
610	+	break;
611	+	default:
612	+	goto badparam;
613	+	}
614	+	break;
615	+	case 'i': /* irradiance */
616	+	getparam(s+1, "irradiance", 'b',
617	+	(void *)&do_irrad);
618	+	break;
619		case 'a': /* ambient */
620		switch (s[1]) {
621		case 'v': /* value */
622	<	if (sscanf(s+2, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
623	<	sprintf(buf,
473	<	"ambient value (%.6g %.6g %.6g): ",
474	<	colval(ambval,RED),
475	<	colval(ambval,GRN),
476	<	colval(ambval,BLU));
477	<	(*dev->comout)(buf);
478	<	(*dev->comin)(buf);
479	<	if (sscanf(buf, "%lf %lf %lf",
480	<	&d0, &d1, &d2) != 3)
481	<	break;
482	<	}
483	<	setcolor(ambval, d0, d1, d2);
622	>	getparam(s+2, "ambient value", 'C',
623	>	(void *)ambval);
624		break;
625	+	case 'w': /* weight */
626	+	getparam(s+2, "ambient value weight", 'i',
627	+	(void *)&ambvwt);
628	+	break;
629		case 'a': /* accuracy */
630	<	if (sscanf(s+2, "%lf", &d0) != 1) {
631	<	sprintf(buf, "ambient accuracy (%.6g): ",
632	<	ambacc);
489	<	(*dev->comout)(buf);
490	<	(*dev->comin)(buf);
491	<	if (sscanf(buf, "%lf", &d0) != 1)
492	<	break;
493	<	}
494	<	ambacc = d0;
630	>	if (getparam(s+2, "ambient accuracy", 'r',
631	>	(void *)&ambacc))
632	>	setambacc(ambacc);
633		break;
634		case 'd': /* divisions */
635	<	if (sscanf(s+2, "%d", &i0) != 1) {
636	<	sprintf(buf, "ambient divisions (%d): ",
499	<	ambdiv);
500	<	(*dev->comout)(buf);
501	<	(*dev->comin)(buf);
502	<	if (sscanf(buf, "%d", &i0) != 1)
503	<	break;
504	<	}
505	<	ambdiv = i0;
635	>	getparam(s+2, "ambient divisions", 'i',
636	>	(void *)&ambdiv);
637		break;
638		case 's': /* samples */
639	<	if (sscanf(s+2, "%d", &i0) != 1) {
640	<	sprintf(buf, "ambient super-samples (%d): ",
510	<	ambssamp);
511	<	(*dev->comout)(buf);
512	<	(*dev->comin)(buf);
513	<	if (sscanf(buf, "%d", &i0) != 1)
514	<	break;
515	<	}
516	<	ambssamp = i0;
639	>	getparam(s+2, "ambient super-samples", 'i',
640	>	(void *)&ambssamp);
641		break;
642		case 'b': /* bounces */
643	<	if (sscanf(s+2, "%d", &i0) != 1) {
644	<	sprintf(buf, "ambient bounces (%d): ",
521	<	ambounce);
522	<	(*dev->comout)(buf);
523	<	(*dev->comin)(buf);
524	<	if (sscanf(buf, "%d", &i0) != 1)
525	<	break;
526	<	}
527	<	ambounce = i0;
643	>	getparam(s+2, "ambient bounces", 'i',
644	>	(void *)&ambounce);
645		break;
646		case 'r':
647	<	if (sscanf(s+2, "%d", &i0) != 1) {
648	<	sprintf(buf, "ambient resolution (%d): ",
649	<	ambres);
533	<	(*dev->comout)(buf);
534	<	(*dev->comin)(buf);
535	<	if (sscanf(buf, "%d", &i0) != 1)
536	<	break;
537	<	}
538	<	ambres = i0;
539	<	minarad = ambres > 0 ? thescene.cusize/ambres : 0.0;
647	>	if (getparam(s+2, "ambient resolution", 'i',
648	>	(void *)&ambres))
649	>	setambres(ambres);
650		break;
651		default:
652		goto badparam;
653		}
654		break;
655	<	case 's': /* sample */
655	>	case 'm': /* medium */
656		switch (s[1]) {
657	<	case 'p': /* pixel */
658	<	if (sscanf(s+2, "%d", &i0) != 1) {
659	<	sprintf(buf, "sample pixel (%d): ", psample);
550	<	(*dev->comout)(buf);
551	<	(*dev->comin)(buf);
552	<	if (sscanf(buf, "%d", &i0) != 1)
553	<	break;
554	<	}
555	<	psample = i0;
556	<	pdepth = 0;
657	>	case 'e': /* extinction coefficient */
658	>	getparam(s+2, "extinction coefficient", 'C',
659	>	(void *)cextinction);
660		break;
661	<	case 'd': /* difference */
662	<	if (sscanf(s+2, "%lf", &d0) != 1) {
663	<	sprintf(buf, "sample difference (%.6g): ",
561	<	maxdiff);
562	<	(*dev->comout)(buf);
563	<	(*dev->comin)(buf);
564	<	if (sscanf(buf, "%lf", &d0) != 1)
565	<	break;
566	<	}
567	<	maxdiff = d0;
568	<	pdepth = 0;
661	>	case 'a': /* scattering albedo */
662	>	getparam(s+2, "scattering albedo", 'C',
663	>	(void *)salbedo);
664		break;
665	+	case 'g': /* scattering eccentricity */
666	+	getparam(s+2, "scattering eccentricity", 'r',
667	+	(void *)&seccg);
668	+	break;
669	+	case 's': /* sampling distance */
670	+	getparam(s+2, "mist sampling distance", 'r',
671	+	(void *)&ssampdist);
672	+	break;
673		default:
674		goto badparam;
675		}
676		break;
677	+	case 'p': /* pixel */
678	+	switch (s[1]) {
679	+	case 's': /* sample */
680	+	if (getparam(s+2, "pixel sample", 'i',
681	+	(void *)&psample))
682	+	pdepth = 0;
683	+	break;
684	+	case 't': /* threshold */
685	+	if (getparam(s+2, "pixel threshold", 'r',
686	+	(void *)&maxdiff))
687	+	pdepth = 0;
688	+	break;
689	+	default:
690	+	goto badparam;
691	+	}
692	+	break;
693	+	case 's': /* specular */
694	+	switch (s[1]) {
695	+	case 'j': /* jitter */
696	+	getparam(s+2, "specular jitter", 'r',
697	+	(void *)&specjitter);
698	+	break;
699	+	case 't': /* threshold */
700	+	getparam(s+2, "specular threshold", 'r',
701	+	(void *)&specthresh);
702	+	break;
703	+	default:
704	+	goto badparam;
705	+	}
706	+	break;
707		case '\0': /* nothing */
708		break;
709		default:;
710		badparam:
711	+	*sskip(s) = '\0';
712		sprintf(errmsg, "%s: unknown variable", s);
713		error(COMMAND, errmsg);
714		break;
#	Line 582 \| Line 716 \| badparam:
716		}
717
718
719	+	void
720		traceray(s) /* trace a single ray */
721		char *s;
722		{
723		char buf[128];
724		int x, y;
725	+	OBJREC *ino;
726		RAY thisray;
727
728	<	if (sscanf(s, "%lf %lf %lf %lf %lf %lf",
593	<	&thisray.rorg[0], &thisray.rorg[1], &thisray.rorg[2],
594	<	&thisray.rdir[0], &thisray.rdir[1], &thisray.rdir[2]) != 6) {
728	>	thisray.rmax = 0.0;
729
730	+	if (!sscanvec(s, thisray.rorg) \|\|
731	+	!sscanvec(sskip2(s,3), thisray.rdir)) {
732	+
733		if (dev->getcur == NULL)
734		return;
735		(*dev->comout)("Pick ray\n");
736		if ((*dev->getcur)(&x, &y) == ABORT)
737		return;
738
739	<	rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
740	<
739	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
740	>	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
741	>	error(COMMAND, "not on image");
742	>	return;
743	>	}
744	>
745		} else if (normalize(thisray.rdir) == 0.0) {
746		error(COMMAND, "zero ray direction");
747		return;
#	Line 613 \| Line 754 \| *char s;**
754		if (thisray.ro == NULL)
755		(*dev->comout)("ray hit nothing");
756		else {
757	<	sprintf(buf, "ray hit %s %s \"%s\"",
758	<	objptr(thisray.ro->omod)->oname,
757	>	sprintf(buf, "ray hit %s%s %s \"%s\"",
758	>	thisray.rod < 0.0 ? "back of " : "",
759	>	thisray.ro->omod == OVOID ? VOIDID :
760	>	objptr(thisray.ro->omod)->oname,
761		ofun[thisray.ro->otype].funame,
762		thisray.ro->oname);
763	+	if ((ino = objptr(thisray.robj)) != thisray.ro)
764	+	sprintf(buf+strlen(buf), " in %s \"%s\"",
765	+	ofun[ino->otype].funame, ino->oname);
766		(*dev->comout)(buf);
767	<	(*dev->comin)(buf);
767	>	(*dev->comin)(buf, NULL);
768		if (thisray.rot >= FHUGE)
769		(*dev->comout)("at infinity");
770		else {
771	<	sprintf(buf, "at (%.6g %.6g %.6g)", thisray.rop[0],
772	<	thisray.rop[1], thisray.rop[2]);
771	>	sprintf(buf, "at (%.6g %.6g %.6g) (%.6g)",
772	>	thisray.rop[0], thisray.rop[1],
773	>	thisray.rop[2], thisray.rt);
774		(*dev->comout)(buf);
775		}
776	<	(*dev->comin)(buf);
777	<	sprintf(buf, "with value (%.6g %.6g %.6g)",
776	>	(*dev->comin)(buf, NULL);
777	>	sprintf(buf, "value (%.5g %.5g %.5g) (%.3gL)",
778		colval(thisray.rcol,RED),
779		colval(thisray.rcol,GRN),
780	<	colval(thisray.rcol,BLU));
780	>	colval(thisray.rcol,BLU),
781	>	luminance(thisray.rcol));
782		(*dev->comout)(buf);
783		}
784	<	(*dev->comin)(buf);
784	>	(*dev->comin)(buf, NULL);
785		}
786
787
788	+	void
789		writepict(s) /* write the picture to a file */
790		char *s;
791		{
792		static char buf[128];
793	<	char fname, getpath();
793	>	char *fname;
794		FILE *fp;
795		COLR *scanline;
796		int y;
797
798	<	if (sscanf(s, "%s", buf) != 1 && buf[0] == '\0') {
798	>	while (isspace(*s))
799	>	s++;
800	>	if (*s)
801	>	atos(buf, sizeof(buf), s);
802	>	else if (buf[0] == '\0') {
803		error(COMMAND, "no file");
804		return;
805		}
806	<	if ((fname = getpath(buf, NULL)) == NULL \|\|
806	>	if ((fname = getpath(buf, NULL, 0)) == NULL \|\|
807		(fp = fopen(fname, "w")) == NULL) {
808		sprintf(errmsg, "cannot open \"%s\"", buf);
809		error(COMMAND, errmsg);
810		return;
811		}
812	+	#ifdef MSDOS
813	+	setmode(fileno(fp), O_BINARY);
814	+	#endif
815		(*dev->comout)("writing \"");
816		(*dev->comout)(fname);
817		(*dev->comout)("\"...\n");
818		/* write header */
819	+	newheader("RADIANCE", fp);
820		fputs(progname, fp);
821		fprintview(&ourview, fp);
822	<	fputs("\n", fp);
822	>	if (octname != NULL)
823	>	fprintf(fp, " %s\n", octname);
824	>	else
825	>	putc('\n', fp);
826	>	fprintf(fp, "SOFTWARE= %s\n", VersionID);
827	>	fputnow(fp);
828		if (exposure != 1.0)
829	<	fprintf(fp, "EXPOSURE=%e\n", exposure);
830	<	fprintf(fp, "\n-Y %d +X %d\n", ourview.vresolu, ourview.hresolu);
829	>	fputexpos(exposure, fp);
830	>	if (dev->pixaspect != 1.0)
831	>	fputaspect(dev->pixaspect, fp);
832	>	fputformat(COLRFMT, fp);
833	>	putc('\n', fp);
834	>	fprtresolu(hresolu, vresolu, fp);
835
836	<	scanline = (COLR )malloc(ourview.hresolusizeof(COLR));
837	<	if (scanline == NULL)
838	<	error(SYSTEM, "out of memory in writepict");
839	<	for (y = ourview.vresolu-1; y >= 0; y--) {
840	<	getpictcolrs(y, scanline, &ptrunk,
841	<	ourview.hresolu, ourview.vresolu);
842	<	if (fwritecolrs(scanline, ourview.hresolu, fp) < 0)
836	>	scanline = (COLR )malloc(hresolusizeof(COLR));
837	>	if (scanline == NULL) {
838	>	error(COMMAND, "not enough memory!");
839	>	fclose(fp);
840	>	unlink(fname);
841	>	return;
842	>	}
843	>	for (y = vresolu-1; y >= 0; y--) {
844	>	getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu);
845	>	if (fwritecolrs(scanline, hresolu, fp) < 0)
846		break;
847		}
848	+	free((void *)scanline);
849		if (fclose(fp) < 0)
850		error(COMMAND, "write error");
681	–	free((char *)scanline);
851		}

Diff Legend

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

Comparing ray/src/rt/rv2.c (file contents): Revision 1.7 by greg, Wed Jun 7 22:22:40 1989 UTC vs. Revision 2.38 by greg, Sat Feb 22 02:07:29 2003 UTC

Diff Legend

Comparing ray/src/rt/rv2.c (file contents):
Revision 1.7 by greg, Wed Jun 7 22:22:40 1989 UTC vs.
Revision 2.38 by greg, Sat Feb 22 02:07:29 2003 UTC