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.12 by greg, Fri Mar 7 15:45:26 1997 UTC vs.
Revision 2.13 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  readoct.c - routines to read octree information.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     7/30/85
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   */
64  
65   #include  "standard.h"
# Line 25 | Line 77 | static int  nonsurfinset();
77   static int  getobj(), octerror(), skiptree();
78   static OCTREE  getfullnode(), gettree();
79  
80 < static char  *infn;                     /* input file name */
80 > static char  *infn;                     /* input file specification */
81   static FILE  *infp;                     /* input file stream */
82   static int  objsize;                    /* size of stored OBJECT's */
83   static OBJECT  objorig;                 /* zeroeth object */
# Line 34 | Line 86 | static short  otypmap[NUMOTYPE+8];     /* object type map
86  
87  
88   int
89 < readoct(fname, load, scene, ofn)        /* read in octree from file */
90 < char  *fname;
89 > readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
90 > char  *inpspec;
91   int  load;
92   CUBE  *scene;
93   char  *ofn[];
# Line 45 | Line 97 | char  *ofn[];
97          register int  i;
98          long  m;
99          
100 <        if (fname == NULL) {
100 >        if (inpspec == NULL) {
101                  infn = "standard input";
102                  infp = stdin;
103 +        } else if (inpspec[0] == '!') {
104 +                infn = inpspec;
105 +                if ((infp = popen(inpspec+1, "r")) == NULL) {
106 +                        sprintf(errmsg, "cannot execute \"%s\"", inpspec);
107 +                        error(SYSTEM, errmsg);
108 +                }
109          } else {
110 <                infn = fname;
111 <                if ((infp = fopen(fname, "r")) == NULL) {
110 >                infn = inpspec;
111 >                if ((infp = fopen(inpspec, "r")) == NULL) {
112                          sprintf(errmsg, "cannot open octree file \"%s\"",
113 <                                        fname);
113 >                                        inpspec);
114                          error(SYSTEM, errmsg);
115                  }
116          }
# Line 91 | Line 149 | char  *ofn[];
149          if (fnobjects != m)
150                  octerror(USER, "too many objects");
151  
152 <        if (load & IO_TREE)                     /* get the octree */
152 >        if (load & IO_TREE)             /* get the octree */
153                  scene->cutree = gettree();
154          else if (load & IO_SCENE && nf == 0)
155                  skiptree();
# Line 113 | Line 171 | char  *ofn[];
171                  if (dosets(nonsurfinset))
172                          octerror(USER, "modifier in tree; octree stale?");
173              }
174 <        fclose(infp);
174 >                                /* close the input */
175 >        if (infn[0] == '!')
176 >                pclose(infp);
177 >        else
178 >                fclose(infp);
179          return(nf);
180   }
181  
# Line 265 | Line 327 | getobj()                               /* get next object */
327          objp->omod = m;
328          objp->oname = savqstr(ogetstr(sbuf));
329          if (objp->oargs.nsargs = ogetint(2)) {
330 <                objp->oargs.sarg = (char **)bmalloc
330 >                objp->oargs.sarg = (char **)malloc
331                                  (objp->oargs.nsargs*sizeof(char *));
332                  if (objp->oargs.sarg == NULL)
333                          goto memerr;
# Line 275 | Line 337 | getobj()                               /* get next object */
337                  objp->oargs.sarg = NULL;
338   #ifdef  IARGS
339          if (objp->oargs.niargs = ogetint(2)) {
340 <                objp->oargs.iarg = (long *)bmalloc
340 >                objp->oargs.iarg = (long *)malloc
341                                  (objp->oargs.niargs*sizeof(long));
342                  if (objp->oargs.iarg == NULL)
343                          goto memerr;
# Line 285 | Line 347 | getobj()                               /* get next object */
347                  objp->oargs.iarg = NULL;
348   #endif
349          if (objp->oargs.nfargs = ogetint(2)) {
350 <                objp->oargs.farg = (FLOAT *)bmalloc
350 >                objp->oargs.farg = (FLOAT *)malloc
351                                  (objp->oargs.nfargs*sizeof(FLOAT));
352                  if (objp->oargs.farg == NULL)
353                          goto memerr;

Diff Legend

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