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

Comparing ray/src/rt/preload.c (file contents):
Revision 2.8 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.11 by greg, Fri Feb 18 02:41:55 2011 UTC

#	Line 9 \| Line 9 \| static const char RCSid[] = "$Id$";
9
10		#include "copyright.h"
11
12	<	#include "standard.h"
13	<	#include "octree.h"
14	<	#include "object.h"
12	>	#include "ray.h"
13		#include "otypes.h"
14		#include "face.h"
15		#include "cone.h"
16		#include "instance.h"
17	<	#include "color.h"
17	>	#include "mesh.h"
18		#include "data.h"
19		#include "func.h"
20	<	#include "ray.h"
20	>	#include "bsdf.h"
21
22
23		/* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
#	Line 31 \| Line 29 \| *load_os( / load associated data for object /*
29		)
30		{
31		DATARRAY *dp;
32	+	SDData *sd;
33
34		switch (op->otype) {
35		case OBJ_FACE: /* polygon */
#	Line 46 \| Line 45 \| *load_os( / load associated data for object /*
45		case OBJ_INSTANCE: /* octree instance */
46		getinstance(op, IO_ALL);
47		return(1);
48	+	case OBJ_MESH: /* mesh instance */
49	+	getmeshinst(op, IO_ALL);
50	+	return(1);
51		case PAT_CPICT: /* color picture */
52		if (op->oargs.nsargs < 4)
53		goto sargerr;
#	Line 98 \| Line 100 \| *load_os( / load associated data for object /*
100		return(1);
101		case MAT_BRTDF: /* BRDTfunc material */
102		getfunc(op, 9, 0x3f, 0);
103	+	return(1);
104	+	case MAT_BSDF: /* BSDF material */
105	+	if (op->oargs.nsargs < 6)
106	+	goto sargerr;
107	+	getfunc(op, 5, 0x1d, 1);
108	+	loadBSDF(op->oargs.sarg[1]);
109		return(1);
110		case MAT_PDATA: /* plastic BRDF data */
111		case MAT_MDATA: /* metal BRDF data */

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