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.3 by gwlarson, Fri Jan 29 15:27:22 1999 UTC vs.
Revision 3.9 by schorsch, Mon Oct 27 10:19:31 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1998 Silicon Graphics, Inc. */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Load Radiance object(s) and create OpenGL display lists
6   */
7  
8 + #include "copyright.h"
9 +
10 + #include "rtprocess.h"
11   #include "radogl.h"
12  
13   #ifndef NLIST2ALLOC
14   #define NLIST2ALLOC     16              /* batch of display lists to get */
15   #endif
16  
17 extern int      o_sphere(), o_face(), o_cone(), o_ring(),
18                o_source(), o_instance();
19
20 extern int      m_normal(), m_glass(), m_aniso(), m_brdf(), m_brdf2(),
21                m_light(), m_prism(), m_mirror();
22
17   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
18  
19   static int      nextlist, nlistleft = 0;
20  
21  
22 < static
22 > static void
23   initotypes()                    /* initialize ofun array */
24   {
25          if (ofun[OBJ_SPHERE].funp == o_sphere)
# Line 41 | Line 35 | initotypes()                   /* initialize ofun array */
35          ofun[OBJ_RING].funp = o_ring;
36          ofun[OBJ_SOURCE].funp = o_source;
37          ofun[OBJ_INSTANCE].funp = o_instance;
38 +        ofun[OBJ_MESH].funp = o_unsupported;
39                                                  /* assign material types */
40          ofun[MAT_TRANS].funp =
41          ofun[MAT_PLASTIC].funp =
# Line 81 | Line 76 | newglist()                     /* allocate an OGL list id */
76   }
77  
78  
79 + void
80   rgl_checkerr(where)             /* check for GL or GLU error */
81   char    *where;
82   {
# Line 123 | Line 119 | int
119   rgl_octlist(fname, cent, radp, nl)      /* load scen into display list */
120   char    *fname;
121   FVECT   cent;                   /* returned octree center (optional) */
122 < FLOAT   *radp;                  /* returned octree size (optional) */
122 > RREAL   *radp;                  /* returned octree size (optional) */
123   int     *nl;                    /* returned number of lists (optional) */
124   {
125          double  r;
# Line 149 | Line 145 | int    *nl;                    /* returned number of lists (optional) */
145   }
146  
147  
148 + void
149   rgl_load(inpspec)               /* convert scene description into OGL calls */
150   char    *inpspec;
151   {
155        FILE    *popen();
152          char    *fgetline();
153          FILE    *infp;
154          char    buf[1024];
# Line 191 | Line 187 | char   *inpspec;
187   }
188  
189  
190 + void
191   rgl_object(name, fp)                    /* read the next object */
192   char  *name;
193   FILE  *fp;
# Line 202 | 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))
213 <                ob.otype = -1;
214 <        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 220 | 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