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.7 by greg, Mon Sep 21 12:04:17 1992 UTC vs.
Revision 2.12 by greg, Fri Mar 7 15:45:26 1997 UTC

# Line 21 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21   static double  ogetflt();
22   static long  ogetint();
23   static char  *ogetstr();
24 < static int  getobj(), octerror();
24 > static int  nonsurfinset();
25 > static int  getobj(), octerror(), skiptree();
26   static OCTREE  getfullnode(), gettree();
27  
28   static char  *infn;                     /* input file name */
29   static FILE  *infp;                     /* input file stream */
30   static int  objsize;                    /* size of stored OBJECT's */
31   static OBJECT  objorig;                 /* zeroeth object */
32 + static OBJECT  fnobjects;               /* number of objects in this file */
33   static short  otypmap[NUMOTYPE+8];      /* object type map */
34  
35  
# Line 38 | Line 40 | int  load;
40   CUBE  *scene;
41   char  *ofn[];
42   {
41 –        extern int  fputs();
43          char  sbuf[512];
44          int  nf;
44 –        OBJECT  fnobjects;
45          register int  i;
46          long  m;
47          
# Line 60 | Line 60 | char  *ofn[];
60          setmode(fileno(infp), O_BINARY);
61   #endif
62                                          /* get header */
63 <        if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
63 >        if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
64                  octerror(USER, "not an octree");
65                                          /* check format */
66          if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
# Line 110 | Line 110 | char  *ofn[];
110                  if (nobjects != objorig+fnobjects)
111                          octerror(USER, "bad object count; octree stale?");
112                                  /* check for non-surfaces */
113 <                if (nonsurfinset(objorig, fnobjects))
113 >                if (dosets(nonsurfinset))
114                          octerror(USER, "modifier in tree; octree stale?");
115              }
116          fclose(infp);
# Line 200 | Line 200 | gettree()                      /* get a pre-ordered octree */
200   }
201  
202  
203 + static int
204 + nonsurfinset(os)                        /* check set for modifier */
205 + register OBJECT  *os;
206 + {
207 +        register OBJECT  s;
208 +        register int  i;
209 +
210 +        for (i = *os; i-- > 0; )
211 +                if ((s = *++os) >= objorig && s < objorig+fnobjects &&
212 +                                ismodifier(objptr(s)->otype))
213 +                        return(1);
214 +        return(0);
215 + }
216 +
217 +
218   static
219   skiptree()                              /* skip octree on input */
220   {
# Line 280 | Line 295 | getobj()                               /* get next object */
295                  objp->oargs.farg = NULL;
296                                                  /* initialize */
297          objp->os = NULL;
283 –        objp->lastrno = -1;
298                                                  /* insert */
299          insertobject(obj);
300          return(obj);

Diff Legend

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