ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/rglfile.c
(Generate patch)

Comparing ray/src/common/rglfile.c (file contents):
Revision 3.4 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 3.8 by schorsch, Thu Jun 26 00:58:09 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Load Radiance object(s) and create OpenGL display lists
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 "radogl.h"
11  
# Line 89 | Line 34 | initotypes()                   /* initialize ofun array */
34          ofun[OBJ_RING].funp = o_ring;
35          ofun[OBJ_SOURCE].funp = o_source;
36          ofun[OBJ_INSTANCE].funp = o_instance;
37 +        ofun[OBJ_MESH].funp = o_unsupported;
38                                                  /* assign material types */
39          ofun[MAT_TRANS].funp =
40          ofun[MAT_PLASTIC].funp =
# Line 172 | Line 118 | int
118   rgl_octlist(fname, cent, radp, nl)      /* load scen into display list */
119   char    *fname;
120   FVECT   cent;                   /* returned octree center (optional) */
121 < FLOAT   *radp;                  /* returned octree size (optional) */
121 > RREAL   *radp;                  /* returned octree size (optional) */
122   int     *nl;                    /* returned number of lists (optional) */
123   {
124          double  r;
# Line 253 | Line 199 | FILE  *fp;
199          strcpy(sbuf, "EOF");
200          fgetword(sbuf, MAXSTR, fp);
201          ob.omod = 0;                    /* use ob.os for pointer to material */
202 <        if (!strcmp(sbuf, VOIDID))
202 >        if (!strcmp(sbuf, VOIDID) || !strcmp(sbuf, ALIASMOD))
203                  ob.os = NULL;
204          else
205                  ob.os = (char *)getmatp(sbuf);
206                                          /* get type */
207          strcpy(sbuf, "EOF");
208          fgetword(sbuf, MAXSTR, fp);
209 <        if (!strcmp(sbuf, ALIASID))
264 <                ob.otype = -1;
265 <        else if ((ob.otype = otype(sbuf)) < 0) {
209 >        if ((ob.otype = otype(sbuf)) < 0) {
210                  sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
211                  error(USER, errmsg);
212          }
# Line 271 | Line 215 | FILE  *fp;
215          fgetword(sbuf, MAXSTR, fp);
216          ob.oname = sbuf;
217                                          /* get arguments */
218 <        if (ob.otype == -1) {
218 >        if (ob.otype == MOD_ALIAS) {
219                  char  sbuf2[MAXSTR];            /* get alias */
220                  strcpy(sbuf2, "EOF");
221                  fgetword(sbuf2, MAXSTR, fp);

Diff Legend

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