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.10 by greg, Wed Mar 2 22:03:49 2016 UTC vs.
Revision 2.16 by greg, Mon Dec 11 23:57:32 2023 UTC

#	Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13		#include "ambient.h"
14
15
16	<	#define  badflt(x)      ((x) < -FHUGE || (x) > FHUGE)
16	>	int     *AMB_CNDX = CNDX;       /* open ambient file RGBE indices */
17	>	float   *AMB_WLPART = WLPART;   /* open ambient file limits+partitions (nm) */
18
19	+
20	+	#define  badflt(x)      (((x) < -FHUGE) | ((x) > FHUGE))
21	+
22		#define  badvec(v)      (badflt((v)[0]) | badflt((v)[1]) | badflt((v)[2]))
23
24
25	+	int
26	+	amb_headline(           /* check ambient headline (copy to file if *p) */
27	+	char *hl,
28	+	void *p
29	+	)
30	+	{
31	+	static int      ambcndx[4];
32	+	static float    ambwlpart[4];
33	+	FILE            *fout = (FILE *)p;
34	+	char            fmt[MAXFMTLEN];
35	+
36	+	if (formatval(fmt, hl)) {
37	+	if (strcmp(fmt, AMBFMT))
38	+	return(-1);
39	+	return(0);
40	+	}
41	+	if (isncomp(hl)) {
42	+	ambcndx[3] = ncompval(hl);
43	+	if ((ambcndx[3] < 3) | (ambcndx[3] > MAXCSAMP))
44	+	return(-1);
45	+	AMB_CNDX = ambcndx;
46	+	return(1);
47	+	}
48	+	if (iswlsplit(hl)) {
49	+	if (!wlsplitval(ambwlpart, hl))
50	+	return(-1);
51	+	AMB_WLPART = ambwlpart;
52	+	return(1);
53	+	}
54	+	if (fout)
55	+	fputs(hl, fout);
56	+	return(0);
57	+	}
58	+
59	+
60		void
61		putambmagic(fp)                 /* write out ambient value magic number */
62		FILE  *fp;
#	Line 39 | Line 78 | FILE  *fp;
78		}
79
80
42	–	#ifndef OLDAMB
43	–
81		#define  putpos(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
82
83		#define  getpos(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
#	Line 55 | Line 92 | writambval(                    /* write ambient value to stream */
92		FILE  *fp
93		)
94		{
95	<	COLR  clr;
95	>	SCOLR  sclr;
96
97		putint(av->lvl, 1, fp);
98		putflt(av->weight, fp);
99		putpos(av->pos, fp);
100		putint(av->ndir, sizeof(av->ndir), fp);
101		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);
102		putv2(av->rad, fp);
103		putv2(av->gpos, fp);
104		putv2(av->gdir, fp);
105		putint(av->corral, sizeof(av->corral), fp);
106	+	if ((AMB_CNDX == CNDX) & (AMB_WLPART == WLPART)) {
107	+	scolor_scolr(sclr, av->val);
108	+	} else {
109	+	SCOLOR  scol;
110	+	convertscolor(scol, AMB_CNDX[3], AMB_WLPART[0], AMB_WLPART[3],
111	+	av->val, NCSAMP, WLPART[0], WLPART[3]);
112	+	scolor2scolr(sclr, scol, AMB_CNDX[3]);
113	+	}
114	+	putbinary(sclr, AMB_CNDX[3]+1, 1, fp);
115	+
116		return(ferror(fp) ? -1 : 0);
117		}
118
#	Line 78 | Line 122 | ambvalOK(                      /* check consistency of ambient value */
122		AMBVAL  *av
123		)
124		{
125	<	double  d;
125	>	int     i;
126
127		if (badvec(av->pos)) return(0);
128		if (!av->ndir | !av->udir) return(0);
129		if ((av->weight <= 0.) | (av->weight > 1.)) return(0);
130		if ((av->rad[0] <= 0.) | (av->rad[0] >= FHUGE)) return(0);
131		if ((av->rad[1] <= 0.) | (av->rad[1] >= FHUGE)) return(0);
132	<	if ((colval(av->val,RED) < 0.) |
133	<	(colval(av->val,RED) >= FHUGE) |
134	<	(colval(av->val,GRN) < 0.) |
135	<	(colval(av->val,GRN) >= FHUGE) |
136	<	(colval(av->val,BLU) < 0.) |
137	<	(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);
132	>	if (av->rad[0] > av->rad[1]+FTINY) return(0);
133	>	if (badflt(av->gpos[0]) | badflt(av->gpos[1])) return(0);
134	>	if (badflt(av->gdir[0]) | badflt(av->gdir[1])) return(0);
135	>	for (i = NCSAMP; i-- > 0; )
136	>	if ((av->val[i] < 0.) | (av->val[i] >= FHUGE))
137	>	return(0);
138		return(1);
139		}
140
#	Line 103 | Line 145 | readambval(                    /* read ambient value from stream */
145		FILE  *fp
146		)
147		{
148	<	COLR  clr;
148	>	SCOLR  sclr;
149
150		av->lvl = getint(1, fp) & 0xff;
151		if (feof(fp))
#	Line 112 | Line 154 | readambval(                    /* read ambient value from stream */
154		getpos(av->pos, fp);
155		av->ndir = getint(sizeof(av->ndir), fp);
156		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);
157		getv2(av->rad, fp);
158		getv2(av->gpos, fp);
159		getv2(av->gdir, fp);
160		av->corral = (uint32)getint(sizeof(av->corral), fp);
161	<	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	<	AMBVAL  *av;
137	<	FILE  *fp;
138	<	{
139	<	COLR  clr;
140	<
141	<	putint(av->lvl, 1, fp);
142	<	putflt(av->weight, fp);
143	<	putvec(av->pos, fp);
144	<	putvec(av->dir, fp);
145	<	setcolr(clr, colval(av->val,RED),
146	<	colval(av->val,GRN), colval(av->val,BLU));
147	<	fwrite((char *)clr, sizeof(clr), 1, fp);
148	<	putflt(av->rad, fp);
149	<	putvec(av->gpos, fp);
150	<	putvec(av->gdir, fp);
151	<	return(ferror(fp) ? -1 : 0);
152	<	}
153	<
154	<
155	<	int
156	<	ambvalOK(av)                    /* check consistency of ambient value */
157	<	AMBVAL  *av;
158	<	{
159	<	double  d;
160	<
161	<	if (badvec(av->pos)) return(0);
162	<	if (badvec(av->dir)) return(0);
163	<	d = DOT(av->dir,av->dir);
164	<	if (d < 0.9999 || d > 1.0001) return(0);
165	<	if (av->lvl < 0 || av->lvl > 100) return(0);
166	<	if (av->weight <= 0. || av->weight > 1.) return(0);
167	<	if (av->rad <= 0. || av->rad >= FHUGE) return(0);
168	<	if (colval(av->val,RED) < 0. ||
169	<	colval(av->val,RED) > FHUGE ||
170	<	colval(av->val,GRN) < 0. ||
171	<	colval(av->val,GRN) > FHUGE ||
172	<	colval(av->val,BLU) < 0. ||
173	<	colval(av->val,BLU) > FHUGE) return(0);
174	<	if (badvec(av->gpos)) return(0);
175	<	if (badvec(av->gdir)) return(0);
176	<	return(1);
177	<	}
178	<
179	<
180	<	int
181	<	readambval(av, fp)              /* read ambient value from stream */
182	<	AMBVAL  *av;
183	<	FILE  *fp;
184	<	{
185	<	COLR  clr;
186	<
187	<	av->lvl = getint(1, fp);
188	<	if (feof(fp))
161	>	if (getbinary(sclr, AMB_CNDX[3]+1, 1, fp) != 1)
162		return(0);
163	<	av->weight = getflt(fp);
164	<	getvec(av->pos, fp);
165	<	getvec(av->dir, fp);
166	<	if (fread((char *)clr, sizeof(clr), 1, fp) != 1)
167	<	return(0);
168	<	colr_color(av->val, clr);
169	<	av->rad = getflt(fp);
170	<	getvec(av->gpos, fp);
198	<	getvec(av->gdir, fp);
163	>	if ((AMB_CNDX == CNDX) & (AMB_WLPART == WLPART)) {
164	>	scolr_scolor(av->val, sclr);
165	>	} else {
166	>	SCOLOR  scol;
167	>	scolr2scolor(scol, sclr, AMB_CNDX[3]);
168	>	convertscolor(av->val, NCSAMP, WLPART[0], WLPART[3],
169	>	scol, AMB_CNDX[3], AMB_WLPART[0], AMB_WLPART[3]);
170	>	}
171		return(feof(fp) ? 0 : ambvalOK(av));
172		}
201	–
202	–	#endif  /* ! NEWAMB */

Diff Legend

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