[ViewVC] Diff of: radiance/ray/src/rt/initotypes.c

Comparing ray/src/rt/initotypes.c (file contents):
Revision 2.12 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.19 by greg, Tue Jul 8 18:25:00 2014 UTC

#	Line 7 \| Line 7 \| static const char RCSid[] = "$Id$";
7
8		#include "copyright.h"
9
10	<	#include "standard.h"
10	>	#include "ray.h"
11		#include "otypes.h"
12		#include "rtotypes.h"
13		#include "otspecial.h"
#	Line 16 \| Line 16 \| static const char RCSid[] = "$Id$";
16		FUN ofun[NUMOTYPE] = INIT_OTYPE;
17
18
19	<	extern void
19	>	void
20		initotypes(void) /* initialize ofun array */
21		{
22		ofun[OBJ_SPHERE].funp =
#	Line 48 \| Line 48 \| *initotypes(void) / initialize ofun array /*
48		ofun[MAT_PLASTIC2].flags \|= T_OPAQUE;
49		ofun[MAT_METAL2].flags \|= T_OPAQUE;
50		ofun[MAT_TRANS2].flags \|= T_IRR_IGN;
51	+	ofun[MAT_ASHIKHMIN].funp = m_ashikhmin;
52	+	ofun[MAT_ASHIKHMIN].flags \|= T_OPAQUE;
53		ofun[MAT_DIELECTRIC].funp =
54		ofun[MAT_INTERFACE].funp = m_dielectric;
55		ofun[MAT_DIELECTRIC].flags \|= T_IRR_IGN;
#	Line 61 \| Line 63 \| *initotypes(void) / initialize ofun array /*
63		ofun[MAT_DIRECT2].funp = m_direct;
64		ofun[MAT_CLIP].funp = m_clip;
65		ofun[MAT_BRTDF].funp = m_brdf;
66	+	ofun[MAT_BSDF].funp = m_bsdf;
67		ofun[MAT_PFUNC].funp =
68		ofun[MAT_MFUNC].funp =
69		ofun[MAT_PDATA].funp =
#	Line 87 \| Line 90 \| *initotypes(void) / initialize ofun array /*
90		}
91
92
93	<	extern int
93	>	int
94		o_default(OBJREC o, RAY r) /* default action is error */
95		{
96	<	error(INTERNAL, "unexpected object call");
97	<	/* call to pull in freeobjmem.o / / XXX ? */
96	>	objerror(o, CONSISTENCY, "unexpected object call");
97	>	/* unused call to load freeobjmem.o */
98		free_objs(0, 0);
99	+	return(0);
100		}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines