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.9 by greg, Thu Sep 15 18:06:23 2005 UTC

# Line 16 | Line 16 | static const char      RCSid[] = "$Id$";
16   #include "face.h"
17   #include "cone.h"
18   #include "instance.h"
19 + #include "mesh.h"
20   #include "color.h"
21   #include "data.h"
22 + #include "func.h"
23 + #include "ray.h"
24  
25  
26   /* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
27  
28  
29 < int
30 < load_os(op)                     /* load associated data for object */
31 < register OBJREC *op;
29 > extern int
30 > load_os(                        /* load associated data for object */
31 >        register OBJREC *op
32 > )
33   {
34          DATARRAY  *dp;
35  
# Line 43 | Line 47 | register OBJREC        *op;
47          case OBJ_INSTANCE:      /* octree instance */
48                  getinstance(op, IO_ALL);
49                  return(1);
50 +        case OBJ_MESH:          /* mesh instance */
51 +                getmeshinst(op, IO_ALL);
52 +                return(1);
53          case PAT_CPICT:         /* color picture */
54                  if (op->oargs.nsargs < 4)
55                          goto sargerr;
# Line 120 | Line 127 | register OBJREC        *op;
127          return(0);
128   sargerr:
129          objerror(op, USER, "too few string arguments");
130 +        return 0; /* pro forma return */
131   }
132  
133  
134 < void
135 < preload_objs()          /* preload object data structures */
134 > extern void
135 > preload_objs(void)              /* preload object data structures */
136   {
137          register OBJECT on;
138                                  /* note that nobjects may change during loop */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines