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.14 by greg, Fri May 3 16:12:34 1991 UTC vs.
Revision 2.7 by greg, Wed Sep 9 22:19:42 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 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10		*     3/24/87
11		*/
12
13	<	#include  "standard.h"
13	>	#include  "ray.h"
14
15	–	#include  "color.h"
16	–
15		#include  "rpaint.h"
16
17		#include  <signal.h>
#	Line 23 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21		VIEW  ourview = STDVIEW;                /* viewing parameters */
22		int  hresolu, vresolu;                  /* image resolution */
23
24	+	int  dimlist[MAXDIM];                   /* sampling dimensions */
25	+	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 */
30
#	Line 31 | Line 33 | double  exposure = 1.0;                        /* exposure for scene */
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  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 */
46
#	Line 57 | 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 164 | Line 173 | command(prompt)                        /* get/execute command */
173		char  *prompt;
174		{
175		#define  badcom(s)      strncmp(s, inpbuf, args-inpbuf-1)
167	–	double  atof();
176		char  inpbuf[256];
177		char  *args;
178		again:
#	Line 217 | Line 225 | again:
225		break;
226		case 'm':                               /* move camera */
227		if (badcom("move"))
228	+	#ifdef  MSTATS
229	+	{
230	+	if (badcom("memory"))
231	+	goto commerr;
232	+	printmemstats(stderr);
233	+	break;
234	+	}
235	+	#else
236		goto commerr;
237	+	#endif
238		getmove(args);
239		break;
240		case 'r':                               /* rotate/repaint */
#	Line 234 | Line 251 | again:
251		goto commerr;
252		getpivot(args);
253		break;
254	<	case CTRL(R):                           /* redraw */
254	>	case CTRL('R'):                         /* redraw */
255		redraw();
256		break;
257		case 'w':                               /* write */
#	Line 246 | Line 263 | again:
263		if (badcom("quit"))
264		goto commerr;
265		quit(0);
266	<	case CTRL(C):                           /* interrupt */
266	>	case CTRL('C'):                         /* interrupt */
267		goto again;
268		#ifdef  SIGTSTP
269	<	case CTRL(Z):                           /* stop */
269	>	case CTRL('Z'):                         /* stop */
270		devclose();
271		kill(0, SIGTSTP);
272		/* pc stops here */
#	Line 294 | Line 311 | rsample()                      /* sample the image */
311		if (rl == NULL)
312		return;
313		pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
314	<	if (pl == NULL)
314	>	if (pl == NULL) {
315	>	free((char *)rl);
316		return;
317	+	}
318		/*
319		* Initialize the bottom row.
320		*/
#	Line 311 | Line 330 | rsample()                      /* sample the image */
330		/* sample the image */
331		for (y = 0; /* y < ysiz */ ; y++) {
332		for (x = 0; x < xsiz-1; x++) {
333	<	if (dev->inpready)
333	>	if (dev->inpready || errno == ENOMEM)
334		goto escape;
335		/*
336		* Test super-pixel to the right.
#	Line 327 | Line 346 | rsample()                      /* sample the image */
346		if (y >= ysiz-1)
347		break;
348		for (x = 0; x < xsiz; x++) {
349	<	if (dev->inpready)
349	>	if (dev->inpready || errno == ENOMEM)
350		goto escape;
351		/*
352		* Find super-pixel at this position in next row.
#	Line 382 | Line 401 | int  pd;
401		if (p->kid == NULL) {                   /* subdivide */
402
403		if ((p->kid = newptree()) == NULL)
404	<	return(growth);
404	>	return(0);
405		/*
406		*  The following paint order can leave a black pixel
407	<	*  when redraw() is called in (*dev->paintr)().
407	>	*  if redraw() is called in (*dev->paintr)().
408		*/
409		if (p->x >= mx && p->y >= my)
410		pcopy(p, p->kid+UR);

Diff Legend

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