ViewVC Help

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

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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.37 by greg, Wed Dec 22 21:03:54 1993 UTC vs.
Revision 2.73 by greg, Tue Jan 18 00:33:16 2005 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1993 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		*  rpict.c - routines and variables for picture generation.
9	–	*
10	–	*     8/14/85
6		*/
7
8	<	#include  "ray.h"
8	>	#include "copyright.h"
9
10		#include  <sys/types.h>
11
12	<	#ifndef NIX
12	>	#ifndef NON_POSIX
13		#ifdef BSD
14		#include  <sys/time.h>
15		#include  <sys/resource.h>
16		#else
17		#include  <sys/times.h>
23	–	#include  <sys/utsname.h>
18		#include  <unistd.h>
19		#endif
20		#endif
21
22	<	extern time_t   time();
29	<
22	>	#include  <time.h>
23		#include  <signal.h>
24
25	+	#include  "platform.h"
26	+	#include  "ray.h"
27	+	#include  "paths.h"
28	+	#include  "ambient.h"
29		#include  "view.h"
33	–
34	–	#include  "resolu.h"
35	–
30		#include  "random.h"
37	–
31		#include  "paths.h"
32	+	#include  "rtmisc.h" /* myhostname() */
33
34	+
35		#define  RFTEMPLATE     "rfXXXXXX"
36
37		#ifndef SIGCONT
38	+	#ifdef SIGIO     /* XXX can we live without this? */
39		#define SIGCONT         SIGIO
40		#endif
41	+	#endif
42
43	+	CUBE  thescene;                         /* our scene */
44	+	OBJECT  nsceneobjs;                     /* number of objects in our scene */
45	+
46		int  dimlist[MAXDIM];                   /* sampling dimensions */
47		int  ndims = 0;                         /* number of sampling dimensions */
48		int  samplendx;                         /* sample index number */
49
50	+	//extern void  ambnotify();
51	+	void  (*addobjnotify[])() = {ambnotify, NULL};
52	+
53		VIEW  ourview = STDVIEW;                /* view parameters */
54		int  hresolu = 512;                     /* horizontal resolution */
55		int  vresolu = 512;                     /* vertical resolution */
#	Line 56 | Line 59 | int  psample = 4;                      /* pixel sample size */
59		double  maxdiff = .05;                  /* max. difference for interpolation */
60		double  dstrpix = 0.67;                 /* square pixel distribution */
61
62	+	double  mblur = 0.;                     /* motion blur parameter */
63	+
64	+	double  dblur = 0.;                     /* depth-of-field blur parameter */
65	+
66	+	void  (*trace)() = NULL;                /* trace call */
67	+
68	+	int  do_irrad = 0;                      /* compute irradiance? */
69	+
70		double  dstrsrc = 0.0;                  /* square source distribution */
71		double  shadthresh = .05;               /* shadow threshold */
72		double  shadcert = .5;                  /* shadow certainty */
#	Line 64 | Line 75 | int  vspretest = 512;                  /* virtual source pretest dens
75		int  directvis = 1;                     /* sources visible? */
76		double  srcsizerat = .25;               /* maximum ratio source size/dist. */
77
78	+	COLOR  cextinction = BLKCOLOR;          /* global extinction coefficient */
79	+	COLOR  salbedo = BLKCOLOR;              /* global scattering albedo */
80	+	double  seccg = 0.;                     /* global scattering eccentricity */
81	+	double  ssampdist = 0.;                 /* scatter sampling distance */
82	+
83		double  specthresh = .15;               /* specular sampling threshold */
84		double  specjitter = 1.;                /* specular sampling jitter */
85
86	<	int  maxdepth = 6;                      /* maximum recursion depth */
71	<	double  minweight = 5e-3;               /* minimum ray weight */
86	>	int  backvis = 1;                       /* back face visibility */
87
88	+	int  maxdepth = 7;                      /* maximum recursion depth */
89	+	double  minweight = 4e-3;               /* minimum ray weight */
90	+
91	+	char  *ambfile = NULL;                  /* ambient file name */
92		COLOR  ambval = BLKCOLOR;               /* ambient value */
93	+	int  ambvwt = 0;                        /* initial weight for ambient value */
94		double  ambacc = 0.2;                   /* ambient accuracy */
95	<	int  ambres = 32;                       /* ambient resolution */
96	<	int  ambdiv = 128;                      /* ambient divisions */
97	<	int  ambssamp = 0;                      /* ambient super-samples */
95	>	int  ambres = 64;                       /* ambient resolution */
96	>	int  ambdiv = 512;                      /* ambient divisions */
97	>	int  ambssamp = 128;                    /* ambient super-samples */
98		int  ambounce = 0;                      /* ambient bounces */
99	<	char  *amblist[128];                    /* ambient include/exclude list */
99	>	char  *amblist[AMBLLEN];                /* ambient include/exclude list */
100		int  ambincl = -1;                      /* include == 1, exclude == 0 */
101
82	–	#ifdef MSDOS
83	–	int  ralrm = 60;                        /* seconds between reports */
84	–	#else
102		int  ralrm = 0;                         /* seconds between reports */
86	–	#endif
103
104		double  pctdone = 0.0;                  /* percentage done */
89	–
105		time_t  tlastrept = 0L;                 /* time at last report */
106	+	time_t  tstart;                         /* starting time */
107
92	–	extern time_t  tstart;                  /* starting time */
93	–
94	–	extern unsigned long  nrays;            /* number of rays traced */
95	–
108		#define  MAXDIV         16              /* maximum sample size */
109
110		#define  pixjitter()    (.5+dstrpix*(.5-frandom()))
111
112	<	static int  hres, vres;                 /* resolution for this frame */
112	>	int  hres, vres;                        /* resolution for this frame */
113
114	<	extern char  *mktemp();
114	>	static VIEW     lastview;               /* the previous view input */
115
116	<	double  pixvalue();
116	>	//extern char  *mktemp();  /* XXX should be in stdlib.h or unistd.h */
117
118	<	#ifdef NIX
119	<	#define  file_exists(f) (access(f,F_OK)==0)
120	<	#else
118	>	//double        pixvalue();
119	>
120	>	static void report(int);
121	>	static int nextview(FILE *fp);
122	>	static void render(char *zfile, char *oldfile);
123	>	static void fillscanline(COLOR *scanline, float *zline, char *sd, int xres,
124	>	int y, int xstep);
125	>	static void fillscanbar(COLOR *scanbar[], float *zbar[], int xres,
126	>	int y, int ysize);
127	>	static int fillsample(COLOR *colline, float *zline, int x, int y,
128	>	int xlen, int ylen, int b);
129	>	static double pixvalue(COLOR  col, int  x, int  y);
130	>	static int salvage(char  *oldfile);
131	>	static int pixnumber(int  x, int  y, int  xres, int  yres);
132	>
133	>
134	>
135	>	#ifdef RHAS_STAT
136		#include  <sys/types.h>
137		#include  <sys/stat.h>
138		int
#	Line 116 | Line 143 | char  *fname;
143		if (stat(fname, &sbuf) < 0) return(0);
144		return((sbuf.st_mode & S_IFREG) != 0);
145		}
146	+	#else
147	+	#define  file_exists(f) (access(f,F_OK)==0)
148		#endif
149
150
151	+	void
152		quit(code)                      /* quit program */
153		int  code;
154		{
155		if (code)                       /* report status */
156	<	report();
156	>	report(0);
157	>	#ifndef NON_POSIX
158		headclean();                    /* delete header file */
159		pfclean();                      /* clean up persist files */
160	+	#endif
161		exit(code);
162		}
163
164
165	<	#ifndef NIX
166	<	report()                /* report progress */
165	>	#ifndef NON_POSIX
166	>	static void
167	>	report(int dummy)               /* report progress */
168		{
169		double  u, s;
170		#ifdef BSD
138	–	char  hostname[257];
171		struct rusage  rubuf;
172		#else
173		struct tms  tbuf;
142	–	struct utsname  nambuf;
174		double  period;
144	–	#define hostname  nambuf.nodename
175		#endif
176
177		tlastrept = time((time_t *)NULL);
#	Line 152 | Line 182 | report()               /* report progress */
182		getrusage(RUSAGE_CHILDREN, &rubuf);
183		u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6;
184		s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6;
155	–	gethostname(hostname, sizeof(hostname));
185		#else
186		times(&tbuf);
187		#ifdef _SC_CLK_TCK
#	Line 162 | Line 191 | report()               /* report progress */
191		#endif
192		u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period;
193		s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period;
165	–	uname(&nambuf);
194		#endif
195
196		sprintf(errmsg,
197		"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n",
198		nrays, pctdone, u/3600., s/3600.,
199	<	(tlastrept-tstart)/3600., hostname);
199	>	(tlastrept-tstart)/3600., myhostname());
200		eputs(errmsg);
201	<	#ifndef BSD
201	>	#ifdef SIGCONT
202		signal(SIGCONT, report);
175	–	#undef hostname
203		#endif
204		}
205		#else
206	<	report()                /* report progress */
206	>	static void
207	>	report(int dummy)               /* report progress */
208		{
209		tlastrept = time((time_t *)NULL);
210		sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n",
#	Line 186 | Line 214 | report()               /* report progress */
214		#endif
215
216
217	<	rpict(seq, pout, zout, prvr)                    /* generate image(s) */
218	<	int  seq;
219	<	char  *pout, *zout, *prvr;
217	>	extern void
218	>	rpict(                  /* generate image(s) */
219	>	int  seq,
220	>	char  *pout,
221	>	char  *zout,
222	>	char  *prvr
223	>	)
224		/*
225		* If seq is greater than zero, then we will render a sequence of
226		* images based on view parameter strings read from the standard input.
#	Line 201 | Line 233 | char  *pout, *zout, *prvr;
233		* sequenced file naming.
234		*/
235		{
204	–	extern char  *rindex(), *strncpy(), *strcat(), *strcpy();
236		char  fbuf[128], fbuf2[128];
237		int  npicts;
238		register char  *cp;
#	Line 228 | Line 259 | char  *pout, *zout, *prvr;
259		for ( ; seq < rn; seq++)
260		if (nextview(stdin) == EOF)
261		error(USER, "unexpected EOF on view input");
262	+	setview(&ourview);
263		prvr = fbuf;                    /* mark for renaming */
264		}
265	<	if (pout != NULL & prvr != NULL) {
265	>	if ((pout != NULL) & (prvr != NULL)) {
266		sprintf(fbuf, pout, seq);
267		if (!strcmp(prvr, fbuf)) {      /* rename */
268		strcpy(fbuf2, fbuf);
#	Line 240 | Line 272 | char  *pout, *zout, *prvr;
272		cp--;
273		strcpy(cp, RFTEMPLATE);
274		prvr = mktemp(fbuf2);
275	<	if (rename(fbuf, prvr) < 0)
275	>	if (rename(fbuf, prvr) < 0) {
276		if (errno == ENOENT) {  /* ghost file */
277		sprintf(errmsg,
278		"new output file \"%s\"",
#	Line 253 | Line 285 | char  *pout, *zout, *prvr;
285		fbuf, prvr);
286		error(SYSTEM, errmsg);
287		}
288	+	}
289		}
290		}
291		npicts = 0;                     /* render sequence */
#	Line 269 | Line 302 | char  *pout, *zout, *prvr;
302		fbuf);
303		error(USER, errmsg);
304		}
305	+	setview(&ourview);
306		continue;               /* don't clobber */
307		}
308		if (freopen(fbuf, "w", stdout) == NULL) {
#	Line 276 | Line 310 | char  *pout, *zout, *prvr;
310		"cannot open output file \"%s\"", fbuf);
311		error(SYSTEM, errmsg);
312		}
313	<	#ifdef MSDOS
280	<	setmode(fileno(stdout), O_BINARY);
281	<	#endif
313	>	SET_FILE_BINARY(stdout);
314		dupheader();
315		}
316		hres = hresolu; vres = vresolu; pa = pixaspect;
317	<	if (prvr != NULL)
318	<	if (viewfile(prvr, &ourview, &rs) <= 0
287	<	|| rs.or != PIXSTANDARD) {
317	>	if (prvr != NULL) {
318	>	if (viewfile(prvr, &ourview, &rs) <= 0) {
319		sprintf(errmsg,
320		"cannot recover view parameters from \"%s\"", prvr);
321		error(WARNING, errmsg);
#	Line 293 | Line 324 | char  *pout, *zout, *prvr;
324		hres = scanlen(&rs);
325		vres = numscans(&rs);
326		}
327	+	}
328		if ((cp = setview(&ourview)) != NULL)
329		error(USER, cp);
330		normaspect(viewaspect(&ourview), &pa, &hres, &vres);
#	Line 310 | Line 342 | char  *pout, *zout, *prvr;
342		putchar('\n');
343		if (pa < .99 || pa > 1.01)
344		fputaspect(pa, stdout);
345	+	fputnow(stdout);
346		fputformat(COLRFMT, stdout);
347		putchar('\n');
348		if (zout != NULL)
#	Line 326 | Line 359 | char  *pout, *zout, *prvr;
359		}
360
361
362	<	nextview(fp)                            /* get next view from fp */
363	<	FILE  *fp;
362	>	static int
363	>	nextview(                               /* get next view from fp */
364	>	FILE  *fp
365	>	)
366		{
367		char  linebuf[256];
368
369	+	lastview = ourview;
370		while (fgets(linebuf, sizeof(linebuf), fp) != NULL)
371		if (isview(linebuf) && sscanview(&ourview, linebuf) > 0)
372		return(0);
#	Line 338 | Line 374 | FILE  *fp;
374		}
375
376
377	<	render(zfile, oldfile)                          /* render the scene */
378	<	char  *zfile, *oldfile;
377	>	static void
378	>	render(                         /* render the scene */
379	>	char  *zfile,
380	>	char  *oldfile
381	>	)
382		{
344	–	extern long  lseek();
383		COLOR  *scanbar[MAXDIV+1];      /* scanline arrays of pixel values */
384		float  *zbar[MAXDIV+1];         /* z values */
385		char  *sampdens;                /* previous sample density */
#	Line 352 | Line 390 | char  *zfile, *oldfile;
390		COLOR  *colptr;
391		float  *zptr;
392		register int  i;
393	+	/* check for empty image */
394	+	if (hres <= 0 || vres <= 0) {
395	+	error(WARNING, "empty output picture");
396	+	fprtresolu(0, 0, stdout);
397	+	return;
398	+	}
399		/* allocate scanlines */
400		for (i = 0; i <= psample; i++) {
401		scanbar[i] = (COLOR *)malloc(hres*sizeof(COLOR));
#	Line 362 | Line 406 | char  *zfile, *oldfile;
406		ystep = (psample*99+70)/140;
407		if (hstep > 2) {
408		i = hres/hstep + 2;
409	<	if ((sampdens = malloc(i)) == NULL)
409	>	if ((sampdens = (char *)malloc(i)) == NULL)
410		goto memerr;
411		while (i--)
412		sampdens[i] = hstep;
#	Line 374 | Line 418 | char  *zfile, *oldfile;
418		sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
419		error(SYSTEM, errmsg);
420		}
421	<	#ifdef MSDOS
378	<	setmode(zfd, O_BINARY);
379	<	#endif
421	>	SET_FD_BINARY(zfd);
422		for (i = 0; i <= psample; i++) {
423		zbar[i] = (float *)malloc(hres*sizeof(float));
424		if (zbar[i] == NULL)
#	Line 391 | Line 433 | char  *zfile, *oldfile;
433		fprtresolu(hres, vres, stdout);
434		/* recover file and compute first */
435		i = salvage(oldfile);
436	+	if (i >= vres)
437	+	goto alldone;
438		if (zfd != -1 && i > 0 &&
439	<	lseek(zfd, (long)i*hres*sizeof(float), 0) == -1)
439	>	lseek(zfd, (off_t)i*hres*sizeof(float), SEEK_SET) < 0)
440		error(SYSTEM, "z-file seek error in render");
441		pctdone = 100.0*i/vres;
442		if (ralrm > 0)                  /* report init stats */
443	<	report();
444	<	#ifndef  BSD
443	>	report(0);
444	>	#ifdef SIGCONT
445		else
402	–	#endif
446		signal(SIGCONT, report);
447	<	ypos = vres-1 - i;
447	>	#endif
448	>	ypos = vres-1 - i;                      /* initialize sampling */
449	>	if (directvis)
450	>	init_drawsources(psample);
451		fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep);
452		/* compute scanlines */
453		for (ypos -= ystep; ypos > -ystep; ypos -= ystep) {
#	Line 421 | Line 467 | char  *zfile, *oldfile;
467		hres, ypos, hstep);
468		/* fill bar */
469		fillscanbar(scanbar, zbar, hres, ypos, ystep);
470	+	if (directvis)                          /* add bitty sources */
471	+	drawsources(scanbar, zbar, 0, hres, ypos, ystep);
472		/* write it out */
473	<	#ifndef  BSD
473	>	#ifdef SIGCONT
474		signal(SIGCONT, SIG_IGN);       /* don't interrupt writes */
475		#endif
476		for (i = ystep; i > 0; i--) {
#	Line 438 | Line 486 | char  *zfile, *oldfile;
486		/* record progress */
487		pctdone = 100.0*(vres-1-ypos)/vres;
488		if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm)
489	<	report();
490	<	#ifndef  BSD
489	>	report(0);
490	>	#ifdef SIGCONT
491		else
492		signal(SIGCONT, report);
493		#endif
494		}
495		/* clean up */
496	+	#ifdef SIGCONT
497		signal(SIGCONT, SIG_IGN);
498	<	if (zfd != -1) {
499	<	if (write(zfd, (char *)zbar[0], hres*sizeof(float))
498	>	#endif
499	>	if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float))
500		< hres*sizeof(float))
501	<	goto writerr;
501	>	goto writerr;
502	>	fwritescan(scanbar[0], hres, stdout);
503	>	if (fflush(stdout) == EOF)
504	>	goto writerr;
505	>	alldone:
506	>	if (zfd != -1) {
507		if (close(zfd) == -1)
508		goto writerr;
509		for (i = 0; i <= psample; i++)
510	<	free((char *)zbar[i]);
510	>	free((void *)zbar[i]);
511		}
458	–	fwritescan(scanbar[0], hres, stdout);
459	–	if (fflush(stdout) == EOF)
460	–	goto writerr;
512		for (i = 0; i <= psample; i++)
513	<	free((char *)scanbar[i]);
513	>	free((void *)scanbar[i]);
514		if (sampdens != NULL)
515		free(sampdens);
516		pctdone = 100.0;
517		if (ralrm > 0)
518	<	report();
518	>	report(0);
519	>	#ifdef SIGCONT
520		signal(SIGCONT, SIG_DFL);
521	+	#endif
522		return;
523		writerr:
524		error(SYSTEM, "write error in render");
#	Line 474 | Line 527 | memerr:
527		}
528
529
530	<	fillscanline(scanline, zline, sd, xres, y, xstep)       /* fill scan at y */
531	<	register COLOR  *scanline;
532	<	register float  *zline;
533	<	register char  *sd;
534	<	int  xres, y, xstep;
530	>	static void
531	>	fillscanline(   /* fill scan at y */
532	>	register COLOR  *scanline,
533	>	register float  *zline,
534	>	register char  *sd,
535	>	int  xres,
536	>	int  y,
537	>	int  xstep
538	>	)
539		{
540		static int  nc = 0;             /* number of calls */
541		int  bl = xstep, b = xstep;
542		double  z;
543		register int  i;
544	<
544	>
545		z = pixvalue(scanline[0], 0, y);
546		if (zline) zline[0] = z;
547		/* zig-zag start for quincunx pattern */
#	Line 500 | Line 557 | int  xres, y, xstep;
557		b = fillsample(scanline, zline, 0, y, i, 0, b/2);
558		else
559		b = fillsample(scanline+i-xstep,
560	<	zline ? zline+i-xstep : NULL,
560	>	zline ? zline+i-xstep : (float *)NULL,
561		i-xstep, y, xstep, 0, b/2);
562		if (sd) *sd++ = nc & 1 ? bl : b;
563		bl = b;
#	Line 509 | Line 566 | int  xres, y, xstep;
566		}
567
568
569	<	fillscanbar(scanbar, zbar, xres, y, ysize)      /* fill interior */
570	<	register COLOR  *scanbar[];
571	<	register float  *zbar[];
572	<	int  xres, y, ysize;
569	>	static void
570	>	fillscanbar(    /* fill interior */
571	>	register COLOR  *scanbar[],
572	>	register float  *zbar[],
573	>	int  xres,
574	>	int  y,
575	>	int  ysize
576	>	)
577		{
578		COLOR  vline[MAXDIV+1];
579		float  zline[MAXDIV+1];
580		int  b = ysize;
581		register int  i, j;
582	<
582	>
583		for (i = 0; i < xres; i++) {
523	–
584		copycolor(vline[0], scanbar[0][i]);
585		copycolor(vline[ysize], scanbar[ysize][i]);
586		if (zbar[0]) {
587		zline[0] = zbar[0][i];
588		zline[ysize] = zbar[ysize][i];
589		}
590	<
531	<	b = fillsample(vline, zbar[0] ? zline : NULL,
590	>	b = fillsample(vline, zbar[0] ? zline : (float *)NULL,
591		i, y, 0, ysize, b/2);
592	<
592	>
593		for (j = 1; j < ysize; j++)
594		copycolor(scanbar[j][i], vline[j]);
595		if (zbar[0])
#	Line 540 | Line 599 | int  xres, y, ysize;
599		}
600
601
602	<	int
603	<	fillsample(colline, zline, x, y, xlen, ylen, b) /* fill interior points */
604	<	register COLOR  *colline;
605	<	register float  *zline;
606	<	int  x, y;
607	<	int  xlen, ylen;
608	<	int  b;
602	>	static int
603	>	fillsample( /* fill interior points */
604	>	register COLOR  *colline,
605	>	register float  *zline,
606	>	int  x,
607	>	int  y,
608	>	int  xlen,
609	>	int  ylen,
610	>	int  b
611	>	)
612		{
613		double  ratio;
614		double  z;
615		COLOR  ctmp;
616		int  ncut;
617		register int  len;
618	<
618	>
619		if (xlen > 0)                   /* x or y length is zero */
620		len = xlen;
621		else
622		len = ylen;
623	<
623	>
624		if (len <= 1)                   /* limit recursion */
625		return(0);
626	<
627	<	if (b > 0
628	<	|| (zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len]))
626	>
627	>	if (b > 0 ||
628	>	(zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len]))
629		|| bigdiff(colline[0], colline[len], maxdiff)) {
630	<
630	>
631		z = pixvalue(colline[len>>1], x + (xlen>>1), y + (ylen>>1));
632		if (zline) zline[len>>1] = z;
633		ncut = 1;
572	–
634		} else {                                        /* interpolate */
574	–
635		copycolor(colline[len>>1], colline[len]);
636		ratio = (double)(len>>1) / len;
637		scalecolor(colline[len>>1], ratio);
#	Line 585 | Line 645 | int  b;
645		}
646		/* recurse */
647		ncut += fillsample(colline, zline, x, y, xlen>>1, ylen>>1, (b-1)/2);
648	<
649	<	ncut += fillsample(colline+(len>>1), zline ? zline+(len>>1) : NULL,
648	>
649	>	ncut += fillsample(colline+(len>>1),
650	>	zline ? zline+(len>>1) : (float *)NULL,
651		x+(xlen>>1), y+(ylen>>1),
652		xlen-(xlen>>1), ylen-(ylen>>1), b/2);
653
#	Line 594 | Line 655 | int  b;
655		}
656
657
658	<	double
659	<	pixvalue(col, x, y)             /* compute pixel value */
660	<	COLOR  col;                     /* returned color */
661	<	int  x, y;                      /* pixel position */
658	>	static double
659	>	pixvalue(               /* compute pixel value */
660	>	COLOR  col,                     /* returned color */
661	>	int  x,                 /* pixel position */
662	>	int  y
663	>	)
664		{
665	<	static RAY  thisray;
666	<
667	<	if (viewray(thisray.rorg, thisray.rdir, &ourview,
668	<	(x+pixjitter())/hres, (y+pixjitter())/vres) < 0) {
665	>	RAY  thisray;
666	>	FVECT   lorg, ldir;
667	>	double  hpos, vpos, vdist, lmax;
668	>	register int    i;
669	>	/* compute view ray */
670	>	hpos = (x+pixjitter())/hres;
671	>	vpos = (y+pixjitter())/vres;
672	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
673	>	&ourview, hpos, vpos)) < -FTINY) {
674		setcolor(col, 0.0, 0.0, 0.0);
675		return(0.0);
676		}
677	+	vdist = ourview.vdist;
678
610	–	rayorigin(&thisray, NULL, PRIMARY, 1.0);
611	–
679		samplendx = pixnumber(x,y,hres,vres);   /* set pixel index */
680
681	+	/* optional motion blur */
682	+	if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir,
683	+	&lastview, hpos, vpos)) >= -FTINY) {
684	+	register double  d = mblur*(.5-urand(281+samplendx));
685	+
686	+	thisray.rmax = (1.-d)*thisray.rmax + d*lmax;
687	+	for (i = 3; i--; ) {
688	+	thisray.rorg[i] = (1.-d)*thisray.rorg[i] + d*lorg[i];
689	+	thisray.rdir[i] = (1.-d)*thisray.rdir[i] + d*ldir[i];
690	+	}
691	+	if (normalize(thisray.rdir) == 0.0)
692	+	return(0.0);
693	+	vdist = (1.-d)*vdist + d*lastview.vdist;
694	+	}
695	+	/* optional depth-of-field */
696	+	if (dblur > FTINY && vdist > FTINY) {
697	+	double  vc, df[2];
698	+	df[0] = PI/4.*dblur*(.5 - frandom())/sqrt(ourview.hn2);
699	+	df[1] = PI/4.*dblur*(.5 - frandom())/sqrt(ourview.vn2);
700	+	for (i = 3; i--; ) {
701	+	vc = thisray.rorg[i] + vdist*thisray.rdir[i];
702	+	thisray.rorg[i] += df[0]*ourview.hvec[i] +
703	+	df[1]*ourview.vvec[i] ;
704	+	thisray.rdir[i] = vc - thisray.rorg[i];
705	+	}
706	+	if (normalize(thisray.rdir) == 0.0)
707	+	return(0.0);
708	+	}
709	+
710	+	rayorigin(&thisray, NULL, PRIMARY, 1.0);
711	+
712		rayvalue(&thisray);                     /* trace ray */
713
714		copycolor(col, thisray.rcol);           /* return color */
715	<
715	>
716		return(thisray.rt);                     /* return distance */
717		}
718
719
720	<	int
721	<	salvage(oldfile)                /* salvage scanlines from killed program */
722	<	char  *oldfile;
720	>	static int
721	>	salvage(                /* salvage scanlines from killed program */
722	>	char  *oldfile
723	>	)
724		{
725		COLR  *scanline;
726		FILE  *fp;
#	Line 635 | Line 734 | char  *oldfile;
734		error(WARNING, errmsg);
735		goto gotzip;
736		}
737	<	#ifdef MSDOS
639	<	setmode(fileno(fp), O_BINARY);
640	<	#endif
737	>	SET_FILE_BINARY(fp);
738		/* discard header */
739		getheader(fp, NULL, NULL);
740		/* get picture size */
#	Line 666 | Line 763 | char  *oldfile;
763		}
764		if (fflush(stdout) == EOF)
765		goto writerr;
766	<	free((char *)scanline);
766	>	free((void *)scanline);
767		fclose(fp);
768		unlink(oldfile);
769		return(y);
#	Line 677 | Line 774 | gotzip:
774		writerr:
775		sprintf(errmsg, "write error during recovery of \"%s\"", oldfile);
776		error(SYSTEM, errmsg);
777	+	return -1; /* pro forma return */
778		}
779
780	<
781	<	int
782	<	pixnumber(x, y, xres, yres)             /* compute pixel index (brushed) */
783	<	register int  x, y;
784	<	int  xres, yres;
780	>	static int
781	>	pixnumber(              /* compute pixel index (brushed) */
782	>	register int  x,
783	>	register int  y,
784	>	int  xres,
785	>	int  yres
786	>	)
787		{
788		x -= y;
789		while (x < 0)

Diff Legend

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