ViewVC Help

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

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

Comparing ray/src/rt/ambio.c (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.10 by greg, Wed Mar 2 22:03:49 2016 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*  Declarations of external symbols in ambient.h
8		*/
9
10	<	/* ====================================================================
11	<	* The Radiance Software License, Version 1.0
12	<	*
13	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
14	<	* through Lawrence Berkeley National Laboratory.   All rights reserved.
15	<	*
16	<	* Redistribution and use in source and binary forms, with or without
17	<	* modification, are permitted provided that the following conditions
18	<	* are met:
19	<	*
20	<	* 1. Redistributions of source code must retain the above copyright
21	<	*         notice, this list of conditions and the following disclaimer.
22	<	*
23	<	* 2. Redistributions in binary form must reproduce the above copyright
24	<	*       notice, this list of conditions and the following disclaimer in
25	<	*       the documentation and/or other materials provided with the
26	<	*       distribution.
27	<	*
28	<	* 3. The end-user documentation included with the redistribution,
29	<	*           if any, must include the following acknowledgment:
30	<	*             "This product includes Radiance software
31	<	*                 (http://radsite.lbl.gov/)
32	<	*                 developed by the Lawrence Berkeley National Laboratory
33	<	*               (http://www.lbl.gov/)."
34	<	*       Alternately, this acknowledgment may appear in the software itself,
35	<	*       if and wherever such third-party acknowledgments normally appear.
36	<	*
37	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38	<	*       and "The Regents of the University of California" must
39	<	*       not be used to endorse or promote products derived from this
40	<	*       software without prior written permission. For written
41	<	*       permission, please contact [email protected].
42	<	*
43	<	* 5. Products derived from this software may not be called "Radiance",
44	<	*       nor may "Radiance" appear in their name, without prior written
45	<	*       permission of Lawrence Berkeley National Laboratory.
46	<	*
47	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50	<	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58	<	* SUCH DAMAGE.
59	<	* ====================================================================
60	<	*
61	<	* This software consists of voluntary contributions made by many
62	<	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63	<	* information on Lawrence Berkeley National Laboratory, please see
64	<	* <http://www.lbl.gov/>.
65	<	*/
10	>	#include "copyright.h"
11
12		#include "ray.h"
68	–
13		#include "ambient.h"
14
15
72	–	#define  putvec(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
73	–
74	–	#define  getvec(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
75	–
16		#define  badflt(x)      ((x) < -FHUGE || (x) > FHUGE)
17
18	<	#define  badvec(v)      (badflt((v)[0]) || badflt((v)[1]) || badflt((v)[2]))
18	>	#define  badvec(v)      (badflt((v)[0]) | badflt((v)[1]) | badflt((v)[2]))
19
20
81	–
21		void
22		putambmagic(fp)                 /* write out ambient value magic number */
23		FILE  *fp;
24		{
25	<	putint((long)AMBMAGIC, 2, fp);
25	>	putint(AMBMAGIC, 2, fp);
26		}
27
28
#	Line 91 | Line 30 | int
30		hasambmagic(fp)                 /* read in and check validity of magic # */
31		FILE  *fp;
32		{
33	<	register int  magic;
33	>	int  magic;
34
35		magic = getint(2, fp);
36		if (feof(fp))
#	Line 100 | Line 39 | FILE  *fp;
39		}
40
41
42	+	#ifndef OLDAMB
43	+
44	+	#define  putpos(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
45	+
46	+	#define  getpos(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
47	+
48	+	#define  putv2(v2,fp)   putflt((v2)[0],fp);putflt((v2)[1],fp)
49	+
50	+	#define  getv2(v2,fp)   (v2)[0]=getflt(fp);(v2)[1]=getflt(fp)
51	+
52		int
53	+	writambval(                     /* write ambient value to stream */
54	+	AMBVAL  *av,
55	+	FILE  *fp
56	+	)
57	+	{
58	+	COLR  clr;
59	+
60	+	putint(av->lvl, 1, fp);
61	+	putflt(av->weight, fp);
62	+	putpos(av->pos, fp);
63	+	putint(av->ndir, sizeof(av->ndir), fp);
64	+	putint(av->udir, sizeof(av->udir), fp);
65	+	setcolr(clr, colval(av->val,RED),
66	+	colval(av->val,GRN), colval(av->val,BLU));
67	+	fwrite((char *)clr, sizeof(clr), 1, fp);
68	+	putv2(av->rad, fp);
69	+	putv2(av->gpos, fp);
70	+	putv2(av->gdir, fp);
71	+	putint(av->corral, sizeof(av->corral), fp);
72	+	return(ferror(fp) ? -1 : 0);
73	+	}
74	+
75	+
76	+	int
77	+	ambvalOK(                       /* check consistency of ambient value */
78	+	AMBVAL  *av
79	+	)
80	+	{
81	+	double  d;
82	+
83	+	if (badvec(av->pos)) return(0);
84	+	if (!av->ndir | !av->udir) return(0);
85	+	if ((av->weight <= 0.) | (av->weight > 1.)) return(0);
86	+	if ((av->rad[0] <= 0.) | (av->rad[0] >= FHUGE)) return(0);
87	+	if ((av->rad[1] <= 0.) | (av->rad[1] >= FHUGE)) return(0);
88	+	if ((colval(av->val,RED) < 0.) |
89	+	(colval(av->val,RED) >= FHUGE) |
90	+	(colval(av->val,GRN) < 0.) |
91	+	(colval(av->val,GRN) >= FHUGE) |
92	+	(colval(av->val,BLU) < 0.) |
93	+	(colval(av->val,BLU) >= FHUGE)) return(0);
94	+	if (badflt(av->gpos[0]) || badflt(av->gpos[1])) return(0);
95	+	if (badflt(av->gdir[0]) || badflt(av->gdir[1])) return(0);
96	+	return(1);
97	+	}
98	+
99	+
100	+	int
101	+	readambval(                     /* read ambient value from stream */
102	+	AMBVAL  *av,
103	+	FILE  *fp
104	+	)
105	+	{
106	+	COLR  clr;
107	+
108	+	av->lvl = getint(1, fp) & 0xff;
109	+	if (feof(fp))
110	+	return(0);
111	+	av->weight = getflt(fp);
112	+	getpos(av->pos, fp);
113	+	av->ndir = getint(sizeof(av->ndir), fp);
114	+	av->udir = getint(sizeof(av->udir), fp);
115	+	if (fread((char *)clr, sizeof(clr), 1, fp) != 1)
116	+	return(0);
117	+	colr_color(av->val, clr);
118	+	getv2(av->rad, fp);
119	+	getv2(av->gpos, fp);
120	+	getv2(av->gdir, fp);
121	+	av->corral = (uint32)getint(sizeof(av->corral), fp);
122	+	return(feof(fp) ? 0 : ambvalOK(av));
123	+	}
124	+
125	+
126	+	#else /* ! NEWAMB */
127	+
128	+
129	+	#define  putvec(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
130	+
131	+	#define  getvec(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
132	+
133	+
134	+	int
135		writambval(av, fp)              /* write ambient value to stream */
136	<	register AMBVAL  *av;
136	>	AMBVAL  *av;
137		FILE  *fp;
138		{
139	<	COLR  col;
139	>	COLR  clr;
140
141	<	putint((long)av->lvl, 1, fp);
141	>	putint(av->lvl, 1, fp);
142		putflt(av->weight, fp);
143		putvec(av->pos, fp);
144		putvec(av->dir, fp);
145	<	setcolr(col, colval(av->val,RED),
145	>	setcolr(clr, colval(av->val,RED),
146		colval(av->val,GRN), colval(av->val,BLU));
147	<	fwrite((char *)col, sizeof(col), 1, fp);
147	>	fwrite((char *)clr, sizeof(clr), 1, fp);
148		putflt(av->rad, fp);
149		putvec(av->gpos, fp);
150		putvec(av->gdir, fp);
#	Line 123 | Line 154 | FILE  *fp;
154
155		int
156		ambvalOK(av)                    /* check consistency of ambient value */
157	<	register AMBVAL  *av;
157	>	AMBVAL  *av;
158		{
159		double  d;
160
#	Line 148 | Line 179 | register AMBVAL  *av;
179
180		int
181		readambval(av, fp)              /* read ambient value from stream */
182	<	register AMBVAL  *av;
182	>	AMBVAL  *av;
183		FILE  *fp;
184		{
185	<	COLR  col;
185	>	COLR  clr;
186
187		av->lvl = getint(1, fp);
188		if (feof(fp))
#	Line 159 | Line 190 | FILE  *fp;
190		av->weight = getflt(fp);
191		getvec(av->pos, fp);
192		getvec(av->dir, fp);
193	<	if (fread((char *)col, sizeof(col), 1, fp) != 1)
193	>	if (fread((char *)clr, sizeof(clr), 1, fp) != 1)
194		return(0);
195	<	colr_color(av->val, col);
195	>	colr_color(av->val, clr);
196		av->rad = getflt(fp);
197		getvec(av->gpos, fp);
198		getvec(av->gdir, fp);
199		return(feof(fp) ? 0 : ambvalOK(av));
200		}
201	+
202	+	#endif  /* ! NEWAMB */

Diff Legend

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