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.5 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.6 by greg, Fri Apr 11 20:31:37 2014 UTC

#	Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10		#include "copyright.h"
11
12		#include "ray.h"
13	–
13		#include "ambient.h"
14
15
17	–	#define  putvec(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
18	–
19	–	#define  getvec(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
20	–
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
26	–
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 36 | 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 45 | Line 39 | FILE  *fp;
39		}
40
41
42	+	#ifdef NEWAMB
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  col;
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(col, colval(av->val,RED),
66	+	colval(av->val,GRN), colval(av->val,BLU));
67	+	fwrite((char *)col, sizeof(col), 1, fp);
68	+	putv2(av->rad, fp);
69	+	putv2(av->gpos, fp);
70	+	putv2(av->gdir, fp);
71	+	return(ferror(fp) ? -1 : 0);
72	+	}
73	+
74	+
75	+	int
76	+	ambvalOK(                       /* check consistency of ambient value */
77	+	AMBVAL  *av
78	+	)
79	+	{
80	+	double  d;
81	+
82	+	if (badvec(av->pos)) return(0);
83	+	if (!av->ndir | !av->udir) return(0);
84	+	if (av->lvl < 0 || av->lvl > 100) 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  col;
107	+
108	+	av->lvl = getint(1, fp);
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 *)col, sizeof(col), 1, fp) != 1)
116	+	return(0);
117	+	colr_color(av->val, col);
118	+	getv2(av->rad, fp);
119	+	getv2(av->gpos, fp);
120	+	getv2(av->gdir, fp);
121	+	return(feof(fp) ? 0 : ambvalOK(av));
122	+	}
123	+
124	+
125	+	#else /* ! NEWAMB */
126	+
127	+
128	+	#define  putvec(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
129	+
130	+	#define  getvec(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
131	+
132	+
133	+	int
134		writambval(av, fp)              /* write ambient value to stream */
135	<	register AMBVAL  *av;
135	>	AMBVAL  *av;
136		FILE  *fp;
137		{
138		COLR  col;
139
140	<	putint((long)av->lvl, 1, fp);
140	>	putint(av->lvl, 1, fp);
141		putflt(av->weight, fp);
142		putvec(av->pos, fp);
143		putvec(av->dir, fp);
#	Line 68 | Line 153 | FILE  *fp;
153
154		int
155		ambvalOK(av)                    /* check consistency of ambient value */
156	<	register AMBVAL  *av;
156	>	AMBVAL  *av;
157		{
158		double  d;
159
#	Line 93 | Line 178 | register AMBVAL  *av;
178
179		int
180		readambval(av, fp)              /* read ambient value from stream */
181	<	register AMBVAL  *av;
181	>	AMBVAL  *av;
182		FILE  *fp;
183		{
184		COLR  col;
#	Line 112 | Line 197 | FILE  *fp;
197		getvec(av->gdir, fp);
198		return(feof(fp) ? 0 : ambvalOK(av));
199		}
200	+
201	+	#endif  /* ! NEWAMB */

Diff Legend

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