[ViewVC] Diff of: radiance/ray/src/rt/rpict.c

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.52 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.57 by schorsch, Mon Jun 30 14:59:12 2003 UTC

#	Line 1 \| Line 1
1		#ifndef lint
2	<	static const char RCSid[] = "$Id$";
2	>	static const char RCSid[] = "$Id";
3		#endif
4		/*
5		* rpict.c - routines and variables for picture generation.
6		*/
7
8	<	/* ====================================================================
9	<	* The Radiance Software License, Version 1.0
10	<	*
11	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
12	<	* through Lawrence Berkeley National Laboratory. All rights reserved.
13	<	*
14	<	* Redistribution and use in source and binary forms, with or without
15	<	* modification, are permitted provided that the following conditions
16	<	* are met:
17	<	*
18	<	* 1. Redistributions of source code must retain the above copyright
19	<	* notice, this list of conditions and the following disclaimer.
20	<	*
21	<	* 2. Redistributions in binary form must reproduce the above copyright
22	<	* notice, this list of conditions and the following disclaimer in
23	<	* the documentation and/or other materials provided with the
24	<	* distribution.
25	<	*
26	<	* 3. The end-user documentation included with the redistribution,
27	<	* if any, must include the following acknowledgment:
28	<	* "This product includes Radiance software
29	<	* (http://radsite.lbl.gov/)
30	<	* developed by the Lawrence Berkeley National Laboratory
31	<	* (http://www.lbl.gov/)."
32	<	* Alternately, this acknowledgment may appear in the software itself,
33	<	* if and wherever such third-party acknowledgments normally appear.
34	<	*
35	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36	<	* and "The Regents of the University of California" must
37	<	* not be used to endorse or promote products derived from this
38	<	* software without prior written permission. For written
39	<	* permission, please contact [email protected].
40	<	*
41	<	* 5. Products derived from this software may not be called "Radiance",
42	<	* nor may "Radiance" appear in their name, without prior written
43	<	* permission of Lawrence Berkeley National Laboratory.
44	<	*
45	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48	<	* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56	<	* SUCH DAMAGE.
57	<	* ====================================================================
58	<	*
59	<	* This software consists of voluntary contributions made by many
60	<	* individuals on behalf of Lawrence Berkeley National Laboratory. For more
61	<	* information on Lawrence Berkeley National Laboratory, please see
62	<	* <http://www.lbl.gov/>.
63	<	*/
8	>	#include "copyright.h"
9
10		#include "ray.h"
11
12		#include <sys/types.h>
13
14	<	#ifndef NIX
14	>	#ifndef NON_POSIX
15		#ifdef BSD
16		#include <sys/time.h>
17		#include <sys/resource.h>
#	Line 76 \| Line 21 \| static const char RCSid[] = "$Id$";
21		#endif
22		#endif
23
24	<	extern time_t time();
80	<
24	>	#include <time.h>
25		#include <signal.h>
26
27	+	#include "platform.h"
28		#include "view.h"
84	–
29		#include "random.h"
86	–
30		#include "paths.h"
31
32	+
33		#define RFTEMPLATE "rfXXXXXX"
34
35		#ifndef SIGCONT
36	+	#ifdef SIGIO /* XXX can we live without this? */
37		#define SIGCONT SIGIO
38		#endif
39	+	#endif
40
41		CUBE thescene; /* our scene */
42		OBJECT nsceneobjs; /* number of objects in our scene */
#	Line 163 \| Line 109 \| *int hres, vres; / resolution for this frame /*
109
110		static VIEW lastview; /* the previous view input */
111
112	<	extern char *mktemp();
112	>	extern char mktemp(); / XXX should be in stdlib.h or unistd.h */
113
114		void report();
115
116		double pixvalue();
117
118	<	#ifdef NIX
118	>	#ifdef RHAS_ACCESS
119		#define file_exists(f) (access(f,F_OK)==0)
120		#else
121		#include <sys/types.h>
#	Line 191 \| Line 137 \| int code;
137		{
138		if (code) /* report status */
139		report();
140	<	#ifndef NIX
140	>	#ifndef NON_POSIX
141		headclean(); /* delete header file */
142		pfclean(); /* clean up persist files */
143		#endif
#	Line 199 \| Line 145 \| int code;
145		}
146
147
148	<	#ifndef NIX
148	>	#ifndef NON_POSIX
149		void
150		report() /* report progress */
151		{
#	Line 236 \| Line 182 \| *report() / report progress /*
182		nrays, pctdone, u/3600., s/3600.,
183		(tlastrept-tstart)/3600., myhostname());
184		eputs(errmsg);
185	<	#ifndef BSD
185	>	#ifdef SIGCONT
186		signal(SIGCONT, report);
187		#endif
188		}
#	Line 268 \| Line 214 \| *char pout, zout, prvr;**
214		* sequenced file naming.
215		*/
216		{
271	–	extern char rindex(), strncpy(), strcat(), strcpy();
217		char fbuf[128], fbuf2[128];
218		int npicts;
219		register char *cp;
#	Line 345 \| Line 290 \| *char pout, zout, prvr;**
290		"cannot open output file \"%s\"", fbuf);
291		error(SYSTEM, errmsg);
292		}
293	<	#ifdef MSDOS
349	<	setmode(fileno(stdout), O_BINARY);
350	<	#endif
293	>	SET_FILE_BINARY(stdout);
294		dupheader();
295		}
296		hres = hresolu; vres = vresolu; pa = pixaspect;
#	Line 449 \| Line 392 \| *char zfile, oldfile;*
392		sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
393		error(SYSTEM, errmsg);
394		}
395	<	#ifdef MSDOS
453	<	setmode(zfd, O_BINARY);
454	<	#endif
395	>	SET_FD_BINARY(zfd);
396		for (i = 0; i <= psample; i++) {
397		zbar[i] = (float )malloc(hressizeof(float));
398		if (zbar[i] == NULL)
#	Line 474 \| Line 415 \| *char zfile, oldfile;*
415		pctdone = 100.0*i/vres;
416		if (ralrm > 0) /* report init stats */
417		report();
418	<	#ifndef BSD
418	>	#ifdef SIGCONT
419		else
479	–	#endif
420		signal(SIGCONT, report);
421	+	#endif
422		ypos = vres-1 - i; /* initialize sampling */
423		if (directvis)
424		init_drawsources(psample);
#	Line 503 \| Line 444 \| *char zfile, oldfile;*
444		if (directvis) /* add bitty sources */
445		drawsources(scanbar, zbar, 0, hres, ypos, ystep);
446		/* write it out */
447	<	#ifndef BSD
447	>	#ifdef SIGCONT
448		signal(SIGCONT, SIG_IGN); /* don't interrupt writes */
449		#endif
450		for (i = ystep; i > 0; i--) {
#	Line 520 \| Line 461 \| *char zfile, oldfile;*
461		pctdone = 100.0*(vres-1-ypos)/vres;
462		if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm)
463		report();
464	<	#ifndef BSD
464	>	#ifdef SIGCONT
465		else
466		signal(SIGCONT, report);
467		#endif
468		}
469		/* clean up */
470	+	#ifdef SIGCONT
471		signal(SIGCONT, SIG_IGN);
472	+	#endif
473		if (zfd != -1 && write(zfd, (char )zbar[0], hressizeof(float))
474		< hres*sizeof(float))
475		goto writerr;
#	Line 547 \| Line 490 \| alldone:
490		pctdone = 100.0;
491		if (ralrm > 0)
492		report();
493	+	#ifdef SIGCONT
494		signal(SIGCONT, SIG_DFL);
495	+	#endif
496		return;
497		writerr:
498		error(SYSTEM, "write error in render");
#	Line 733 \| Line 678 \| *char oldfile;**
678		error(WARNING, errmsg);
679		goto gotzip;
680		}
681	<	#ifdef MSDOS
737	<	setmode(fileno(fp), O_BINARY);
738	<	#endif
681	>	SET_FILE_BINARY(fp);
682		/* discard header */
683		getheader(fp, NULL, NULL);
684		/* get picture size */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/rt/rpict.c (file contents): Revision 2.52 by greg, Sat Feb 22 02:07:29 2003 UTC vs. Revision 2.57 by schorsch, Mon Jun 30 14:59:12 2003 UTC

Diff Legend

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.52 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.57 by schorsch, Mon Jun 30 14:59:12 2003 UTC