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

Comparing ray/src/rt/preload.c (file contents):
Revision 2.10 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.14 by greg, Fri Jul 14 23:19:32 2017 UTC

# Line 18 | Line 18 | static const char      RCSid[] = "$Id$";
18   #include "data.h"
19   #include "func.h"
20   #include "bsdf.h"
21 – #include "paths.h"
21  
22  
23   /* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
24  
25  
26 < extern int
26 > int
27   load_os(                        /* load associated data for object */
28 <        register OBJREC *op
28 >        OBJREC  *op
29   )
30   {
31 <        DATARRAY  *dp;
32 <        SDData  *sd;
31 >        DATARRAY        *dp;
32 >        SDData          *sd;
33  
34 +        SDretainSet = SDretainAll;
35 +
36          switch (op->otype) {
37          case OBJ_FACE:          /* polygon */
38                  getface(op);
# Line 106 | Line 107 | load_os(                       /* load associated data for object */
107                  if (op->oargs.nsargs < 6)
108                          goto sargerr;
109                  getfunc(op, 5, 0x1d, 1);
110 <                sd = SDgetCache(op->oargs.sarg[1]);
111 <                if (sd != NULL && !SDisLoaded(sd))
111 <                        SDloadFile(sd, getpath(op->oargs.sarg[1],
112 <                                                getrlibpath(), R_OK));
110 >                sd = loadBSDF(op->oargs.sarg[1]);
111 >                if (sd != NULL) SDfreeCache(sd);
112                  return(1);
113          case MAT_PDATA:         /* plastic BRDF data */
114          case MAT_MDATA:         /* metal BRDF data */
# Line 139 | Line 138 | sargerr:
138   }
139  
140  
141 < extern void
141 > void
142   preload_objs(void)              /* preload object data structures */
143   {
144 <        register OBJECT on;
144 >        OBJECT on;
145                                  /* note that nobjects may change during loop */
146          for (on = 0; on < nobjects; on++)
147                  load_os(objptr(on));

Diff Legend

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