ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.31 by greg, Sat May 4 00:32:47 2019 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  "paths.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 > static double  ogetflt(void);
22 > static long  ogetint(int);
23 > static char  *ogetstr(char *);
24 > static int  nonsurfintree(OCTREE ot);
25   static void  octerror(int  etyp, char  *msg);
26   static void  skiptree(void);
27 < static OCTREE  getfullnode(), gettree();
27 > static OCTREE  getfullnode(void), gettree(void);
28  
29   static char  *infn;                     /* input file specification */
30   static FILE  *infp;                     /* input file stream */
# Line 35 | Line 34 | static OBJECT  fnobjects;              /* number of objects in thi
34  
35  
36   int
37 < readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
38 < char  *inpspec;
39 < int  load;
40 < CUBE  *scene;
41 < char  *ofn[];
37 > readoct(                                /* read in octree file or stream */
38 >        char  *inpspec,
39 >        int  load,
40 >        CUBE  *scene,
41 >        char  *ofn[]
42 > )
43   {
44          char  sbuf[512];
45          int  nf;
# Line 101 | Line 101 | char  *ofn[];
101          else if (load & IO_SCENE && nf == 0)
102                  skiptree();
103                  
104 <        if (load & IO_SCENE)            /* get the scene */
104 >        if (load & IO_SCENE) {          /* get the scene */
105              if (nf == 0) {
106                                          /* load binary scene data */
107                  readscene(infp, objsize);
# Line 111 | Line 111 | char  *ofn[];
111                  if (nobjects != objorig+fnobjects)
112                          octerror(USER, "bad object count; octree stale?");
113                                  /* check for non-surfaces */
114 <                if (dosets(nonsurfinset))
114 >                if (nonsurfintree(scene->cutree))
115                          octerror(USER, "modifier in tree; octree stale?");
116              }
117 +        }
118                                  /* close the input */
119          if (infn[0] == '!')
120                  pclose(infp);
121 <        else
121 >        else if (infp != stdin)
122                  fclose(infp);
123          return(nf);
124   }
125  
126  
127   static char *
128 < ogetstr(s)                      /* get null-terminated string */
128 < char  *s;
128 > ogetstr(char *s)                /* get null-terminated string */
129   {
130          extern char  *getstr();
131  
# Line 154 | Line 154 | getfullnode()                  /* get a set, return fullnode */
154  
155  
156   static long
157 < ogetint(siz)                    /* get a siz-byte integer */
158 < int  siz;
157 > ogetint(int siz)                /* get a siz-byte integer */
158   {
159          extern long  getint();
160          register long  r;
# Line 202 | Line 201 | gettree()                      /* get a pre-ordered octree */
201          default:
202                  octerror(USER, "damaged octree");
203          }
204 <        return NULL; /* pro forma return */
204 >        return EMPTY; /* pro forma return */
205   }
206  
207  
208   static int
209 < nonsurfinset(os)                        /* check set for modifier */
211 < register OBJECT  *os;
209 > nonsurfintree(OCTREE ot)                /* check tree for modifiers */
210   {
211 <        register OBJECT  s;
211 >        OBJECT  set[MAXSET+1];
212          register int  i;
213  
214 <        for (i = *os; i-- > 0; )
215 <                if ((s = *++os) >= objorig && s < objorig+fnobjects &&
216 <                                ismodifier(objptr(s)->otype))
214 >        if (isempty(ot))
215 >                return(0);
216 >        if (istree(ot)) {
217 >                for (i = 0; i < 8; i++)
218 >                        if (nonsurfintree(octkid(ot, i)))
219 >                                return(1);
220 >                return(0);
221 >        }
222 >        objset(set, ot);
223 >        for (i = set[0]; i > 0; i-- )
224 >                if (ismodifier(objptr(set[i])->otype))
225                          return(1);
226          return(0);
227   }
# Line 247 | Line 253 | skiptree(void)                         /* skip octree on input */
253  
254  
255   static void
256 < octerror(etyp, msg)                     /* octree error */
251 < int  etyp;
252 < char  *msg;
256 > octerror(int etyp, char *msg)           /* octree error */
257   {
258          char  msgbuf[128];
259  

Diff Legend

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