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.9 by greg, Mon Jan 8 13:38:12 1990 UTC vs.
Revision 1.14 by greg, Fri May 3 16:12:34 1991 UTC

#	Line 45 | Line 45 | char  *amblist[128];                   /* ambient include/exclude list
45		int  ambincl = -1;                      /* include == 1, exclude == 0 */
46
47		int  greyscale = 0;                     /* map colors to brightness? */
48	<	char  *devname = "X";                   /* output device name */
48	>	char  *devname = dev_default;           /* output device name */
49
50		struct driver  *dev = NULL;             /* driver functions */
51
#	Line 55 | Line 55 | PNODE  ptrunk;                         /* the base of our image */
55		RECT  pframe;                           /* current frame boundaries */
56		int  pdepth;                            /* image depth in current frame */
57
58	+	static char  *reserve_mem = NULL;       /* pre-allocated reserve memory */
59	+
60	+	#define RESERVE_AMT     8192            /* amount of memory to reserve */
61	+
62		#define  CTRL(c)        ('c'-'@')
63
64
#	Line 112 | Line 116 | rview()                                /* do a view */
116		char  buf[32];
117
118		devopen(devname);               /* open device */
119	<	newimage();                     /* set up image */
119	>	newimage();                     /* start image (calls fillreserves) */
120
121		for ( ; ; ) {                   /* quit in command() */
122	<	while (hresolu <= 1<<pdepth &&
119	<	vresolu <= 1<<pdepth)
122	>	while (hresolu <= 1<<pdepth && vresolu <= 1<<pdepth)
123		command("done: ");
124	<
125	<	if (hresolu <= psample<<pdepth &&
126	<	vresolu <= psample<<pdepth) {
124	>	while (reserve_mem == NULL)
125	>	command("out of memory: ");
126	>	errno = 0;
127	>	if (hresolu <= psample<<pdepth && vresolu <= psample<<pdepth) {
128		sprintf(buf, "%d sampling...\n", 1<<pdepth);
129		(*dev->comout)(buf);
130		rsample();
#	Line 129 | Line 133 | rview()                                /* do a view */
133		(*dev->comout)(buf);
134		refine(&ptrunk, 0, 0, hresolu, vresolu, pdepth+1);
135		}
136	<	if (dev->inpready)
136	>	if (errno == ENOMEM)            /* ran out of memory */
137	>	freereserves();
138	>	else if (dev->inpready)         /* noticed some input */
139		command(": ");
140	<	else
140	>	else                            /* finished this depth */
141		pdepth++;
142		}
143		}
144
145
146	+	fillreserves()                  /* fill memory reserves */
147	+	{
148	+	if (reserve_mem != NULL)
149	+	return;
150	+	reserve_mem = malloc(RESERVE_AMT);
151	+	}
152	+
153	+
154	+	freereserves()                  /* free memory reserves */
155	+	{
156	+	if (reserve_mem == NULL)
157	+	return;
158	+	free(reserve_mem);
159	+	reserve_mem = NULL;
160	+	}
161	+
162	+
163		command(prompt)                 /* get/execute command */
164		char  *prompt;
165		{
#	Line 145 | Line 168 | char  *prompt;
168		char  inpbuf[256];
169		char  *args;
170		again:
171	<	(*dev->comout)(prompt);                 /* get command + arguments */
149	<	(*dev->comin)(inpbuf);
171	>	(*dev->comin)(inpbuf, prompt);          /* get command + arguments */
172		for (args = inpbuf; *args && *args != ' '; args++)
173		;
174		if (*args) *args++ = '\0';
#	Line 269 | Line 291 | rsample()                      /* sample the image */
291		xsiz = (((pframe.r-pframe.l)<<pdepth)+hresolu-1) / hresolu;
292		ysiz = (((pframe.u-pframe.d)<<pdepth)+vresolu-1) / vresolu;
293		rl = (RECT *)malloc(xsiz*sizeof(RECT));
294	+	if (rl == NULL)
295	+	return;
296		pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
297	<	if (rl == NULL || pl == NULL)
298	<	error(SYSTEM, "out of memory in rsample");
297	>	if (pl == NULL)
298	>	return;
299		/*
300		* Initialize the bottom row.
301		*/
#	Line 358 | Line 382 | int  pd;
382		if (p->kid == NULL) {                   /* subdivide */
383
384		if ((p->kid = newptree()) == NULL)
385	<	error(SYSTEM, "out of memory in refine");
385	>	return(growth);
386		/*
387		*  The following paint order can leave a black pixel
388		*  when redraw() is called in (*dev->paintr)().

Diff Legend

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