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.13 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.37 by greg, Sat Jun 7 05:09:45 2025 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  readoct.c - routines to read octree information.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  <stdio.h>
11 > #include  <time.h>
12  
13 + #include  "platform.h"
14 + #include  "standard.h"
15   #include  "octree.h"
68
16   #include  "object.h"
70
17   #include  "otypes.h"
18 + #include  "resolu.h"
19  
20 < static double  ogetflt();
21 < static long  ogetint();
22 < static char  *ogetstr();
23 < static int  nonsurfinset();
24 < static int  getobj(), octerror(), skiptree();
25 < static OCTREE  getfullnode(), gettree();
20 > static double  ogetflt(void);
21 > static long  ogetint(int);
22 > static char  *ogetstr(char *);
23 > static int  nonsurfintree(OCTREE ot);
24 > static void  octerror(int  etyp, char  *msg);
25 > static void  skiptree(void);
26 > static OCTREE  getfullnode(void), gettree(void);
27  
28   static char  *infn;                     /* input file specification */
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 */
85 static short  otypmap[NUMOTYPE+8];      /* object type map */
33  
34  
35   int
36 < readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
37 < char  *inpspec;
38 < int  load;
39 < CUBE  *scene;
40 < char  *ofn[];
36 > readoct(                                /* read in octree file or stream */
37 >        char  *inpspec,
38 >        int  load,
39 >        CUBE  *scene,
40 >        char  *ofn[]
41 > )
42   {
43 +        time_t  oct_t = 0;
44 +        time_t  last_it = 0;
45          char  sbuf[512];
46          int  nf;
47 <        register int  i;
47 >        int  i;
48          long  m;
49          
50          if (inpspec == NULL) {
# Line 113 | Line 63 | char  *ofn[];
63                                          inpspec);
64                          error(SYSTEM, errmsg);
65                  }
66 +                oct_t = fddate(fileno(infp));
67          }
68 < #ifdef MSDOS
69 <        setmode(fileno(infp), O_BINARY);
68 > #ifdef getc_unlocked                    /* avoid stupid semaphores */
69 >        flockfile(infp);
70   #endif
71 +        SET_FILE_BINARY(infp);
72                                          /* get header */
73          if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
74                  octerror(USER, "not an octree");
# Line 140 | Line 92 | char  *ofn[];
92                          readobj(sbuf);
93                  if (load & IO_FILES)
94                          ofn[nf] = savqstr(sbuf);
95 +                if (oct_t > last_it) {
96 +                        time_t  t = fdate(sbuf);
97 +                        if (t > last_it)
98 +                                last_it = t;
99 +                }
100                  nf++;
101          }
102          if (load & IO_FILES)
# Line 154 | Line 111 | char  *ofn[];
111          else if (load & IO_SCENE && nf == 0)
112                  skiptree();
113                  
114 <        if (load & IO_SCENE)            /* get the scene */
114 >        if (load & IO_SCENE) {          /* get the scene */
115              if (nf == 0) {
116 <                for (i = 0; *ogetstr(sbuf); i++)
117 <                        if ((otypmap[i] = otype(sbuf)) < 0) {
118 <                                sprintf(errmsg, "unknown type \"%s\"", sbuf);
162 <                                octerror(WARNING, errmsg);
163 <                        }
164 <                while (getobj() != OVOID)
165 <                        ;
116 >                                        /* load binary scene data */
117 >                readscene(infp, objsize);
118 >
119              } else {                    /* consistency checks */
120                                  /* check object count */
121                  if (nobjects != objorig+fnobjects)
122                          octerror(USER, "bad object count; octree stale?");
123                                  /* check for non-surfaces */
124 <                if (dosets(nonsurfinset))
124 >                if (oct_t <= last_it && nonsurfintree(scene->cutree))
125                          octerror(USER, "modifier in tree; octree stale?");
126              }
127 +        }
128                                  /* close the input */
129 <        if (infn[0] == '!')
130 <                pclose(infp);
131 <        else
129 >        if (inpspec[0] == '!') {
130 >                if (pclose(infp) != 0) {
131 >                        sprintf(errmsg, "bad status from \"%s\"", inpspec);
132 >                        error(WARNING, errmsg);
133 >                }
134 >        } else if (infp != stdin)
135                  fclose(infp);
136 + #ifdef getc_unlocked
137 +        else
138 +                funlockfile(infp);
139 + #endif
140          return(nf);
141   }
142  
143  
144   static char *
145 < ogetstr(s)                      /* get null-terminated string */
185 < char  *s;
145 > ogetstr(char *s)                /* get null-terminated string */
146   {
187        extern char  *getstr();
188
147          if (getstr(s, infp) == NULL)
148                  octerror(USER, "truncated octree");
149          return(s);
# Line 196 | Line 154 | static OCTREE
154   getfullnode()                   /* get a set, return fullnode */
155   {
156          OBJECT  set[MAXSET+1];
157 <        register int  i;
158 <        register long  m;
157 >        int  i;
158 >        long  m;
159  
160          if ((set[0] = ogetint(objsize)) > MAXSET)
161                  octerror(USER, "bad set in getfullnode");
# Line 211 | Line 169 | getfullnode()                  /* get a set, return fullnode */
169  
170  
171   static long
172 < ogetint(siz)                    /* get a siz-byte integer */
215 < int  siz;
172 > ogetint(int siz)                /* get a siz-byte integer */
173   {
174 <        extern long  getint();
218 <        register long  r;
174 >        long  r;
175  
176          r = getint(siz, infp);
177          if (feof(infp))
# Line 227 | Line 183 | int  siz;
183   static double
184   ogetflt()                       /* get a floating point number */
185   {
230        extern double  getflt();
186          double  r;
187  
188          r = getflt(infp);
# Line 240 | Line 195 | ogetflt()                      /* get a floating point number */
195   static OCTREE
196   gettree()                       /* get a pre-ordered octree */
197   {
198 <        register OCTREE  ot;
199 <        register int  i;
198 >        OCTREE   ot;
199 >        int  i;
200          
201          switch (getc(infp)) {
202          case OT_EMPTY:
# Line 259 | Line 214 | gettree()                      /* get a pre-ordered octree */
214          default:
215                  octerror(USER, "damaged octree");
216          }
217 +        return EMPTY; /* pro forma return */
218   }
219  
220  
221   static int
222 < nonsurfinset(os)                        /* check set for modifier */
267 < register OBJECT  *os;
222 > nonsurfintree(OCTREE ot)                /* check tree for modifiers */
223   {
224 <        register OBJECT  s;
225 <        register int  i;
224 >        OBJECT  set[MAXSET+1];
225 >        int  i;
226  
227 <        for (i = *os; i-- > 0; )
228 <                if ((s = *++os) >= objorig && s < objorig+fnobjects &&
229 <                                ismodifier(objptr(s)->otype))
227 >        if (isempty(ot))
228 >                return(0);
229 >        if (istree(ot)) {
230 >                for (i = 0; i < 8; i++)
231 >                        if (nonsurfintree(octkid(ot, i)))
232 >                                return(1);
233 >                return(0);
234 >        }
235 >        objset(set, ot);
236 >        for (i = set[0]; i > 0; i-- )
237 >                if (ismodifier(objptr(set[i])->otype))
238                          return(1);
239          return(0);
240   }
241  
242  
243 < static
244 < skiptree()                              /* skip octree on input */
243 > static void
244 > skiptree(void)                          /* skip octree on input */
245   {
246 <        register int  i;
246 >        int  i;
247          
248          switch (getc(infp)) {
249          case OT_EMPTY:
# Line 302 | Line 265 | skiptree()                             /* skip octree on input */
265   }
266  
267  
268 < static
269 < getobj()                                /* get next object */
307 < {
308 <        char  sbuf[MAXSTR];
309 <        int  obj;
310 <        register int  i;
311 <        register long  m;
312 <        register OBJREC  *objp;
313 <
314 <        i = ogetint(1);
315 <        if (i == -1)
316 <                return(OVOID);          /* terminator */
317 <        if ((obj = newobject()) == OVOID)
318 <                error(SYSTEM, "out of object space");
319 <        objp = objptr(obj);
320 <        if ((objp->otype = otypmap[i]) < 0)
321 <                octerror(USER, "reference to unknown type");
322 <        if ((m = ogetint(objsize)) != OVOID) {
323 <                m += objorig;
324 <                if ((OBJECT)m != m)
325 <                        octerror(USER, "too many objects");
326 <        }
327 <        objp->omod = m;
328 <        objp->oname = savqstr(ogetstr(sbuf));
329 <        if (objp->oargs.nsargs = ogetint(2)) {
330 <                objp->oargs.sarg = (char **)malloc
331 <                                (objp->oargs.nsargs*sizeof(char *));
332 <                if (objp->oargs.sarg == NULL)
333 <                        goto memerr;
334 <                for (i = 0; i < objp->oargs.nsargs; i++)
335 <                        objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
336 <        } else
337 <                objp->oargs.sarg = NULL;
338 < #ifdef  IARGS
339 <        if (objp->oargs.niargs = ogetint(2)) {
340 <                objp->oargs.iarg = (long *)malloc
341 <                                (objp->oargs.niargs*sizeof(long));
342 <                if (objp->oargs.iarg == NULL)
343 <                        goto memerr;
344 <                for (i = 0; i < objp->oargs.niargs; i++)
345 <                        objp->oargs.iarg[i] = ogetint(4);
346 <        } else
347 <                objp->oargs.iarg = NULL;
348 < #endif
349 <        if (objp->oargs.nfargs = ogetint(2)) {
350 <                objp->oargs.farg = (FLOAT *)malloc
351 <                                (objp->oargs.nfargs*sizeof(FLOAT));
352 <                if (objp->oargs.farg == NULL)
353 <                        goto memerr;
354 <                for (i = 0; i < objp->oargs.nfargs; i++)
355 <                        objp->oargs.farg[i] = ogetflt();
356 <        } else
357 <                objp->oargs.farg = NULL;
358 <                                                /* initialize */
359 <        objp->os = NULL;
360 <                                                /* insert */
361 <        insertobject(obj);
362 <        return(obj);
363 < memerr:
364 <        error(SYSTEM, "out of memory in getobj");
365 < }
366 <
367 <
368 < static
369 < octerror(etyp, msg)                     /* octree error */
370 < int  etyp;
371 < char  *msg;
268 > static void
269 > octerror(int etyp, char *msg)           /* octree error */
270   {
271          char  msgbuf[128];
272  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines