ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/preload.c
(Generate patch)

Comparing ray/src/rt/preload.c (file contents):
Revision 2.7 by greg, Tue Feb 25 02:47:23 2003 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 "bsdf.h"
21  
22  
23   /* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
24  
25  
26 < int
27 < load_os(op)                     /* load associated data for object */
28 < register OBJREC *op;
26 > extern int
27 > load_os(                        /* load associated data for object */
28 >        register OBJREC *op
29 > )
30   {
31          DATARRAY  *dp;
32 +        SDData  *sd;
33  
34          switch (op->otype) {
35          case OBJ_FACE:          /* polygon */
# Line 43 | Line 45 | register OBJREC        *op;
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 96 | Line 101 | register OBJREC        *op;
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 */
112          case MAT_TDATA:         /* trans BRDF data */
# Line 120 | Line 131 | register OBJREC        *op;
131          return(0);
132   sargerr:
133          objerror(op, USER, "too few string arguments");
134 +        return 0; /* pro forma return */
135   }
136  
137  
138 < void
139 < preload_objs()          /* preload object data structures */
138 > extern void
139 > preload_objs(void)              /* preload object data structures */
140   {
141          register OBJECT on;
142                                  /* note that nobjects may change during loop */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines