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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.17 by schorsch, Sat Jun 7 12:50:20 2003 UTC vs.
Revision 2.27 by greg, Wed Dec 15 22:02:04 2004 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include  <stdio.h>
11 < #ifdef _WIN32
12 < #define popen _popen
13 < #define pclose _pclose
14 < #endif
11 > #include  <time.h>
12  
13 + #include  "platform.h"
14 + #include  "rtprocess.h"
15   #include  "standard.h"
16   #include  "octree.h"
17   #include  "object.h"
18   #include  "otypes.h"
19   #include  "resolu.h"
20  
21 < static double  ogetflt();
22 < static long  ogetint();
23 < static char  *ogetstr();
24 < static int  nonsurfinset();
21 > #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
22 > #undef getc
23 > #define getc    getc_unlocked
24 > #endif
25 >
26 > static double  ogetflt(void);
27 > static long  ogetint(int);
28 > static char  *ogetstr(char *);
29 > static int  nonsurfintree(OCTREE ot);
30   static void  octerror(int  etyp, char  *msg);
31   static void  skiptree(void);
32 < static OCTREE  getfullnode(), gettree();
32 > static OCTREE  getfullnode(void), gettree(void);
33  
34   static char  *infn;                     /* input file specification */
35   static FILE  *infp;                     /* input file stream */
# Line 35 | Line 39 | static OBJECT  fnobjects;              /* number of objects in thi
39  
40  
41   int
42 < readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
43 < char  *inpspec;
44 < int  load;
45 < CUBE  *scene;
46 < char  *ofn[];
42 > readoct(                                /* read in octree file or stream */
43 >        char  *inpspec,
44 >        int  load,
45 >        CUBE  *scene,
46 >        char  *ofn[]
47 > )
48   {
49          char  sbuf[512];
50          int  nf;
# Line 101 | Line 106 | char  *ofn[];
106          else if (load & IO_SCENE && nf == 0)
107                  skiptree();
108                  
109 <        if (load & IO_SCENE)            /* get the scene */
109 >        if (load & IO_SCENE) {          /* get the scene */
110              if (nf == 0) {
111                                          /* load binary scene data */
112                  readscene(infp, objsize);
# Line 111 | Line 116 | char  *ofn[];
116                  if (nobjects != objorig+fnobjects)
117                          octerror(USER, "bad object count; octree stale?");
118                                  /* check for non-surfaces */
119 <                if (dosets(nonsurfinset))
119 >                if (nonsurfintree(scene->cutree))
120                          octerror(USER, "modifier in tree; octree stale?");
121              }
122 +        }
123                                  /* close the input */
124          if (infn[0] == '!')
125                  pclose(infp);
# Line 124 | Line 130 | char  *ofn[];
130  
131  
132   static char *
133 < ogetstr(s)                      /* get null-terminated string */
128 < char  *s;
133 > ogetstr(char *s)                /* get null-terminated string */
134   {
135          extern char  *getstr();
136  
# Line 154 | Line 159 | getfullnode()                  /* get a set, return fullnode */
159  
160  
161   static long
162 < ogetint(siz)                    /* get a siz-byte integer */
158 < int  siz;
162 > ogetint(int siz)                /* get a siz-byte integer */
163   {
164          extern long  getint();
165          register long  r;
# Line 202 | Line 206 | gettree()                      /* get a pre-ordered octree */
206          default:
207                  octerror(USER, "damaged octree");
208          }
209 <        return NULL; /* pro forma return */
209 >        return EMPTY; /* pro forma return */
210   }
211  
212  
213   static int
214 < nonsurfinset(os)                        /* check set for modifier */
211 < register OBJECT  *os;
214 > nonsurfintree(OCTREE ot)                /* check tree for modifiers */
215   {
216 <        register OBJECT  s;
216 >        OBJECT  set[MAXSET+1];
217          register int  i;
218  
219 <        for (i = *os; i-- > 0; )
220 <                if ((s = *++os) >= objorig && s < objorig+fnobjects &&
221 <                                ismodifier(objptr(s)->otype))
219 >        if (isempty(ot))
220 >                return(0);
221 >        if (istree(ot)) {
222 >                for (i = 0; i < 8; i++)
223 >                        if (nonsurfintree(octkid(ot, i)))
224 >                                return(1);
225 >                return(0);
226 >        }
227 >        objset(set, ot);
228 >        for (i = set[0]; i-- > 0; )
229 >                if (ismodifier(objptr(set[i])->otype))
230                          return(1);
231          return(0);
232   }
# Line 247 | Line 258 | skiptree(void)                         /* skip octree on input */
258  
259  
260   static void
261 < octerror(etyp, msg)                     /* octree error */
251 < int  etyp;
252 < char  *msg;
261 > octerror(int etyp, char *msg)           /* octree error */
262   {
263          char  msgbuf[128];
264  

Diff Legend

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