ViewVC Help

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

root/Development/ray/src/rt/rview.c

Comparing ray/src/rt/rview.c (file contents):
Revision 1.17 by greg, Mon Jun 24 16:10:49 1991 UTC vs.
Revision 2.8 by greg, Mon Sep 21 12:08:00 1992 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1987 Regents of the University of California */
1	>	/* Copyright (c) 1992 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 26 | Line 26 | int  ndims = 0;                                /* number of sampling dimensions */
26		int  samplendx = 0;                     /* index for this sample */
27
28		int  psample = 8;                       /* pixel sample size */
29	<	double  maxdiff = .15;                  /* max. sample difference */
29	>	double  maxdiff = .15;                  /* max. sample difference */
30
31	<	double  exposure = 1.0;                 /* exposure for scene */
31	>	double  exposure = 1.0;                 /* exposure for scene */
32
33	<	double  dstrsrc = 0.0;                  /* square source distribution */
34	<	double  shadthresh = .1;                /* shadow threshold */
35	<	double  shadcert = .25;                 /* shadow certainty */
33	>	double  dstrsrc = 0.0;                  /* square source distribution */
34	>	double  shadthresh = .1;                /* shadow threshold */
35	>	double  shadcert = .25;                 /* shadow certainty */
36		int  directrelay = 0;                   /* number of source relays */
37	<	int  vspretest = 32;                    /* virtual source pretest density */
37	>	int  vspretest = 128;                   /* virtual source pretest density */
38	>	int  directinvis = 0;                   /* sources invisible? */
39	>	double  srcsizerat = 0.;                /* maximum ratio source size/dist. */
40
41	+	double  specthresh = .3;                /* specular sampling threshold */
42	+	double  specjitter = 1.;                /* specular sampling jitter */
43	+
44		int  maxdepth = 4;                      /* maximum recursion depth */
45	<	double  minweight = 1e-2;               /* minimum ray weight */
45	>	double  minweight = 1e-2;               /* minimum ray weight */
46
47		COLOR  ambval = BLKCOLOR;               /* ambient value */
48	<	double  ambacc = 0.2;                   /* ambient accuracy */
48	>	double  ambacc = 0.2;                   /* ambient accuracy */
49		int  ambres = 8;                        /* ambient resolution */
50		int  ambdiv = 32;                       /* ambient divisions */
51		int  ambssamp = 0;                      /* ambient super-samples */
#	Line 61 | Line 66 | int  pdepth;                           /* image depth in current frame */
66
67		static char  *reserve_mem = NULL;       /* pre-allocated reserve memory */
68
69	<	#define RESERVE_AMT     8192            /* amount of memory to reserve */
69	>	#define RESERVE_AMT     32768           /* amount of memory to reserve */
70
71	<	#define  CTRL(c)        ('c'-'@')
71	>	#define  CTRL(c)        ((c)-'@')
72
73
74		quit(code)                      /* quit program */
#	Line 90 | Line 95 | char  *dname;
95		error(USER, errmsg);
96		} else
97		return;
98	+	#ifndef NIX
99		/* not there, try exec */
100		if ((dev = comm_init(dname, id)) == NULL) {
101		sprintf(errmsg, "cannot start device \"%s\"", dname);
102		error(USER, errmsg);
103		}
104	+	#endif
105		}
106
107
#	Line 167 | Line 174 | freereserves()                 /* free memory reserves */
174		command(prompt)                 /* get/execute command */
175		char  *prompt;
176		{
177	<	#define  badcom(s)      strncmp(s, inpbuf, args-inpbuf-1)
171	<	double  atof();
177	>	#define  badcom(s)      strncmp(s, inpbuf, args-inpbuf-1)
178		char  inpbuf[256];
179		char  *args;
180		again:
#	Line 221 | Line 227 | again:
227		break;
228		case 'm':                               /* move camera */
229		if (badcom("move"))
230	+	#ifdef  MSTATS
231	+	{
232	+	if (badcom("memory"))
233	+	goto commerr;
234	+	printmemstats(stderr);
235	+	break;
236	+	}
237	+	#else
238		goto commerr;
239	+	#endif
240		getmove(args);
241		break;
242		case 'r':                               /* rotate/repaint */
#	Line 238 | Line 253 | again:
253		goto commerr;
254		getpivot(args);
255		break;
256	<	case CTRL(R):                           /* redraw */
256	>	case CTRL('R'):                         /* redraw */
257		redraw();
258		break;
259		case 'w':                               /* write */
#	Line 250 | Line 265 | again:
265		if (badcom("quit"))
266		goto commerr;
267		quit(0);
268	<	case CTRL(C):                           /* interrupt */
268	>	case CTRL('C'):                         /* interrupt */
269		goto again;
270	<	#ifdef  SIGTSTP
271	<	case CTRL(Z):                           /* stop */
270	>	#ifdef  SIGTSTP
271	>	case CTRL('Z'):                         /* stop */
272		devclose();
273		kill(0, SIGTSTP);
274		/* pc stops here */
#	Line 273 | Line 288 | commerr:
288		error(COMMAND, errmsg);
289		break;
290		}
291	<	#undef  badcom
291	>	#undef  badcom
292		}
293
294
#	Line 283 | Line 298 | rsample()                      /* sample the image */
298		RECT  r;
299		PNODE  *p;
300		register RECT  *rl;
301	<	register PNODE  **pl;
301	>	register PNODE  **pl;
302		register int  x;
303		/*
304		*     We initialize the bottom row in the image at our current
305	<	* resolution.  During sampling, we check super-pixels to the
305	>	* resolution.  During sampling, we check super-pixels to the
306		* right and above by calling bigdiff().  If there is a significant
307		* difference, we subsample the super-pixels.  The testing process
308		* includes initialization of the next row.
#	Line 298 | Line 313 | rsample()                      /* sample the image */
313		if (rl == NULL)
314		return;
315		pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
316	<	if (pl == NULL)
316	>	if (pl == NULL) {
317	>	free((char *)rl);
318		return;
319	+	}
320		/*
321		* Initialize the bottom row.
322		*/
#	Line 315 | Line 332 | rsample()                      /* sample the image */
332		/* sample the image */
333		for (y = 0; /* y < ysiz */ ; y++) {
334		for (x = 0; x < xsiz-1; x++) {
335	<	if (dev->inpready)
335	>	if (dev->inpready || errno == ENOMEM)
336		goto escape;
337		/*
338		* Test super-pixel to the right.
#	Line 331 | Line 348 | rsample()                      /* sample the image */
348		if (y >= ysiz-1)
349		break;
350		for (x = 0; x < xsiz; x++) {
351	<	if (dev->inpready)
351	>	if (dev->inpready || errno == ENOMEM)
352		goto escape;
353		/*
354		* Find super-pixel at this position in next row.
#	Line 365 | Line 382 | escape:
382
383		int
384		refine(p, xmin, ymin, xmax, ymax, pd)           /* refine a node */
385	<	register PNODE  *p;
385	>	register PNODE  *p;
386		int  xmin, ymin, xmax, ymax;
387		int  pd;
388		{
#	Line 386 | Line 403 | int  pd;
403		if (p->kid == NULL) {                   /* subdivide */
404
405		if ((p->kid = newptree()) == NULL)
406	<	return(growth);
406	>	return(0);
407		/*
408		*  The following paint order can leave a black pixel
409	<	*  when redraw() is called in (*dev->paintr)().
409	>	*  if redraw() is called in (*dev->paintr)().
410		*/
411		if (p->x >= mx && p->y >= my)
412		pcopy(p, p->kid+UR);

Diff Legend

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