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.10 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.16 by greg, Tue Jun 26 14:42:18 2018 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_ABSDF:         /* aBSDF material */
114 +                if (op->oargs.nsargs < 5)
115 +                        goto sargerr;
116 +                getfunc(op, 4, 0xe, 1);
117 +                sd = loadBSDF(op->oargs.sarg[0]);
118 +                if (sd != NULL) SDfreeCache(sd);
119 +                return(1);
120          case MAT_PDATA:         /* plastic BRDF data */
121          case MAT_MDATA:         /* metal BRDF data */
122          case MAT_TDATA:         /* trans BRDF data */
# Line 139 | Line 145 | sargerr:
145   }
146  
147  
148 < extern void
148 > void
149   preload_objs(void)              /* preload object data structures */
150   {
151 <        register OBJECT on;
151 >        OBJECT on;
152                                  /* note that nobjects may change during loop */
153          for (on = 0; on < nobjects; on++)
154                  load_os(objptr(on));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines