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.18 by greg, Tue Jun 25 14:06:15 1991 UTC vs.
Revision 2.11 by greg, Wed Aug 25 13:44:17 1993 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 = 128;                   /* virtual source pretest density */
38	+	int  directvis = 1;                     /* sources visible? */
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 53 | Line 58 | char  *devname = dev_default;          /* output device name *
58
59		struct driver  *dev = NULL;             /* driver functions */
60
61	+	char  rifname[128];                     /* rad input file name */
62	+
63		VIEW  oldview;                          /* previous view parameters */
64
65		PNODE  ptrunk;                          /* the base of our image */
#	Line 61 | Line 68 | int  pdepth;                           /* image depth in current frame */
68
69		static char  *reserve_mem = NULL;       /* pre-allocated reserve memory */
70
71	<	#define RESERVE_AMT     8192            /* amount of memory to reserve */
71	>	#define RESERVE_AMT     32768           /* amount of memory to reserve */
72
73	<	#define  CTRL(c)        ('c'-'@')
73	>	#define  CTRL(c)        ((c)-'@')
74
75
76		quit(code)                      /* quit program */
77		int  code;
78		{
79	+	#ifdef MSTATS
80	+	if (code == 2 && errno == ENOMEM)
81	+	printmemstats(stderr);
82	+	#endif
83		devclose();
84		exit(code);
85		}
#	Line 90 | Line 101 | char  *dname;
101		error(USER, errmsg);
102		} else
103		return;
104	+	#ifndef NIX
105		/* not there, try exec */
106		if ((dev = comm_init(dname, id)) == NULL) {
107		sprintf(errmsg, "cannot start device \"%s\"", dname);
108		error(USER, errmsg);
109		}
110	+	#endif
111		}
112
113
#	Line 167 | Line 180 | freereserves()                 /* free memory reserves */
180		command(prompt)                 /* get/execute command */
181		char  *prompt;
182		{
183	<	#define  badcom(s)      strncmp(s, inpbuf, args-inpbuf-1)
171	<	double  atof();
183	>	#define  badcom(s)      strncmp(s, inpbuf, args-inpbuf-1)
184		char  inpbuf[256];
185		char  *args;
186		again:
#	Line 179 | Line 191 | again:
191		else *++args = '\0';
192
193		switch (inpbuf[0]) {
194	<	case 'f':                               /* new frame */
195	<	if (badcom("frame"))
196	<	goto commerr;
194	>	case 'f':                               /* new frame (or free mem.) */
195	>	if (badcom("frame")) {
196	>	if (badcom("free"))
197	>	goto commerr;
198	>	free_objmem();
199	>	break;
200	>	}
201		getframe(args);
202		break;
203		case 'v':                               /* view */
#	Line 194 | Line 210 | again:
210		goto commerr;
211		lastview(args);
212		break;
213	+	case 'V':                               /* save view */
214	+	if (badcom("V"))
215	+	goto commerr;
216	+	saveview(args);
217	+	break;
218	+	case 'L':                               /* load view */
219	+	if (badcom("L"))
220	+	goto commerr;
221	+	loadview(args);
222	+	break;
223		case 'e':                               /* exposure */
224		if (badcom("exposure"))
225		goto commerr;
#	Line 219 | Line 245 | again:
245		goto commerr;
246		getaim(args);
247		break;
248	<	case 'm':                               /* move camera */
248	>	case 'm':                               /* move camera (or memstats) */
249		if (badcom("move"))
250	+	#ifdef  MSTATS
251	+	{
252	+	if (badcom("memory"))
253	+	goto commerr;
254	+	printmemstats(stderr);
255	+	break;
256	+	}
257	+	#else
258		goto commerr;
259	+	#endif
260		getmove(args);
261		break;
262		case 'r':                               /* rotate/repaint */
#	Line 238 | Line 273 | again:
273		goto commerr;
274		getpivot(args);
275		break;
276	<	case CTRL(R):                           /* redraw */
276	>	case CTRL('R'):                         /* redraw */
277		redraw();
278		break;
279		case 'w':                               /* write */
#	Line 250 | Line 285 | again:
285		if (badcom("quit"))
286		goto commerr;
287		quit(0);
288	<	case CTRL(C):                           /* interrupt */
288	>	case CTRL('C'):                         /* interrupt */
289		goto again;
290	<	#ifdef  SIGTSTP
291	<	case CTRL(Z):                           /* stop */
290	>	#ifdef  SIGTSTP
291	>	case CTRL('Z'):                         /* stop */
292		devclose();
293		kill(0, SIGTSTP);
294		/* pc stops here */
#	Line 273 | Line 308 | commerr:
308		error(COMMAND, errmsg);
309		break;
310		}
311	<	#undef  badcom
311	>	#undef  badcom
312		}
313
314
#	Line 283 | Line 318 | rsample()                      /* sample the image */
318		RECT  r;
319		PNODE  *p;
320		register RECT  *rl;
321	<	register PNODE  **pl;
321	>	register PNODE  **pl;
322		register int  x;
323		/*
324		*     We initialize the bottom row in the image at our current
325	<	* resolution.  During sampling, we check super-pixels to the
325	>	* resolution.  During sampling, we check super-pixels to the
326		* right and above by calling bigdiff().  If there is a significant
327		* difference, we subsample the super-pixels.  The testing process
328		* includes initialization of the next row.
#	Line 298 | Line 333 | rsample()                      /* sample the image */
333		if (rl == NULL)
334		return;
335		pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
336	<	if (pl == NULL)
336	>	if (pl == NULL) {
337	>	free((char *)rl);
338		return;
339	+	}
340		/*
341		* Initialize the bottom row.
342		*/
#	Line 315 | Line 352 | rsample()                      /* sample the image */
352		/* sample the image */
353		for (y = 0; /* y < ysiz */ ; y++) {
354		for (x = 0; x < xsiz-1; x++) {
355	<	if (dev->inpready)
355	>	if (dev->inpready || errno == ENOMEM)
356		goto escape;
357		/*
358		* Test super-pixel to the right.
#	Line 331 | Line 368 | rsample()                      /* sample the image */
368		if (y >= ysiz-1)
369		break;
370		for (x = 0; x < xsiz; x++) {
371	<	if (dev->inpready)
371	>	if (dev->inpready || errno == ENOMEM)
372		goto escape;
373		/*
374		* Find super-pixel at this position in next row.
#	Line 365 | Line 402 | escape:
402
403		int
404		refine(p, xmin, ymin, xmax, ymax, pd)           /* refine a node */
405	<	register PNODE  *p;
405	>	register PNODE  *p;
406		int  xmin, ymin, xmax, ymax;
407		int  pd;
408		{
#	Line 386 | Line 423 | int  pd;
423		if (p->kid == NULL) {                   /* subdivide */
424
425		if ((p->kid = newptree()) == NULL)
426	<	return(growth);
426	>	return(0);
427		/*
428		*  The following paint order can leave a black pixel
429	<	*  when redraw() is called in (*dev->paintr)().
429	>	*  if redraw() is called in (*dev->paintr)().
430		*/
431		if (p->x >= mx && p->y >= my)
432		pcopy(p, p->kid+UR);

Diff Legend

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