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.7 by greg, Thu Apr 24 06:03:15 2014 UTC vs.
Revision 2.10 by greg, Wed Mar 2 22:03:49 2016 UTC

#	Line 39 | Line 39 | FILE  *fp;
39		}
40
41
42	<	#ifdef NEWAMB
42	>	#ifndef OLDAMB
43
44		#define  putpos(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
45
#	Line 55 | Line 55 | writambval(                    /* write ambient value to stream */
55		FILE  *fp
56		)
57		{
58	<	COLR  col;
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(col, colval(av->val,RED),
65	>	setcolr(clr, colval(av->val,RED),
66		colval(av->val,GRN), colval(av->val,BLU));
67	<	fwrite((char *)col, sizeof(col), 1, fp);
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
#	Line 81 | Line 82 | ambvalOK(                      /* check consistency of ambient value */
82
83		if (badvec(av->pos)) return(0);
84		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) |
89	>	(colval(av->val,RED) >= FHUGE) |
90		(colval(av->val,GRN) < 0.) |
91	<	(colval(av->val,GRN) > FHUGE) |
91	>	(colval(av->val,GRN) >= FHUGE) |
92		(colval(av->val,BLU) < 0.) |
93	<	(colval(av->val,BLU) > FHUGE)) return(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);
#	Line 103 | Line 103 | readambval(                    /* read ambient value from stream */
103		FILE  *fp
104		)
105		{
106	<	COLR  col;
106	>	COLR  clr;
107
108	<	av->lvl = getint(1, fp);
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 *)col, sizeof(col), 1, fp) != 1)
115	>	if (fread((char *)clr, sizeof(clr), 1, fp) != 1)
116		return(0);
117	<	colr_color(av->val, col);
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
#	Line 135 | Line 136 | writambval(av, fp)             /* write ambient value to stream *
136		AMBVAL  *av;
137		FILE  *fp;
138		{
139	<	COLR  col;
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(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 181 | Line 182 | readambval(av, fp)             /* read ambient value from stream
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 189 | 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);

Diff Legend

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