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.16 by schorsch, Thu Jun 5 19:29:34 2003 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"
11  
# Line 74 | Line 19 | static double  ogetflt();
19   static long  ogetint();
20   static char  *ogetstr();
21   static int  nonsurfinset();
22 < static int  getobj(), octerror(), skiptree();
22 > static int  octerror(), skiptree();
23   static OCTREE  getfullnode(), gettree();
24  
25   static char  *infn;                     /* input file specification */
# Line 82 | Line 27 | static FILE  *infp;                    /* input file stream */
27   static int  objsize;                    /* size of stored OBJECT's */
28   static OBJECT  objorig;                 /* zeroeth object */
29   static OBJECT  fnobjects;               /* number of objects in this file */
85 static short  otypmap[NUMOTYPE+8];      /* object type map */
30  
31  
32   int
# Line 94 | Line 38 | char  *ofn[];
38   {
39          char  sbuf[512];
40          int  nf;
41 <        register int  i;
41 >        int  i;
42          long  m;
43          
44          if (inpspec == NULL) {
# Line 114 | Line 58 | char  *ofn[];
58                          error(SYSTEM, errmsg);
59                  }
60          }
61 < #ifdef MSDOS
118 <        setmode(fileno(infp), O_BINARY);
119 < #endif
61 >        SET_FILE_BINARY(infp);
62                                          /* get header */
63          if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
64                  octerror(USER, "not an octree");
# Line 156 | Line 98 | char  *ofn[];
98                  
99          if (load & IO_SCENE)            /* get the scene */
100              if (nf == 0) {
101 <                for (i = 0; *ogetstr(sbuf); i++)
102 <                        if ((otypmap[i] = otype(sbuf)) < 0) {
103 <                                sprintf(errmsg, "unknown type \"%s\"", sbuf);
162 <                                octerror(WARNING, errmsg);
163 <                        }
164 <                while (getobj() != OVOID)
165 <                        ;
101 >                                        /* load binary scene data */
102 >                readscene(infp, objsize);
103 >
104              } else {                    /* consistency checks */
105                                  /* check object count */
106                  if (nobjects != objorig+fnobjects)
# Line 299 | Line 237 | skiptree()                             /* skip octree on input */
237          default:
238                  octerror(USER, "damaged octree");
239          }
302 }
303
304
305 static
306 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");
240   }
241  
242  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines