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.6 by greg, Fri Apr 11 20:31:37 2014 UTC vs.
Revision 2.7 by greg, Thu Apr 24 06:03:15 2014 UTC

#	Line 81 | Line 81 | ambvalOK(                      /* check consistency of ambient value */
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);
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);
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);

Diff Legend

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