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.1 by gwlarson, Tue Jun 9 11:18:35 1998 UTC vs.
Revision 3.8 by schorsch, Thu Jun 26 00:58:09 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 "radogl.h"
11  
12   #ifndef NLIST2ALLOC
13   #define NLIST2ALLOC     16              /* batch of display lists to get */
14   #endif
15  
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 –
16   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
17  
18 + static int      nextlist, nlistleft = 0;
19  
20 < static
20 >
21 > static void
22   initotypes()                    /* initialize ofun array */
23   {
24          if (ofun[OBJ_SPHERE].funp == o_sphere)
# Line 39 | 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 69 | Line 65 | initotypes()                   /* initialize ofun array */
65   int
66   newglist()                      /* allocate an OGL list id */
67   {
68 <        static int      nextlist, nleft = 0;
73 <
74 <        if (!nleft--) {
68 >        if (!nlistleft--) {
69                  nextlist = glGenLists(NLIST2ALLOC);
70 <                nleft = NLIST2ALLOC-1;
70 >                if (!nextlist)
71 >                        error(SYSTEM, "no list space left in newglist");
72 >                nlistleft = NLIST2ALLOC-1;
73          }
74          return(nextlist++);
75   }
76  
77  
78 + void
79   rgl_checkerr(where)             /* check for GL or GLU error */
80   char    *where;
81   {
# Line 93 | Line 90 | char   *where;
90  
91  
92   int
93 < rgl_filelist(ic, inp)           /* load scene files into display list */
93 > rgl_filelist(ic, inp, nl)       /* load scene files into display list */
94   int     ic;
95   char    **inp;
96 + int     *nl;                    /* returned number of lists (optional) */
97   {
98          int     listid;
99  
# Line 110 | Line 108 | char   **inp;
108          glEndList();            /* end of top display list */
109          lightdefs();            /* define light sources */
110          loadoctrees();          /* load octrees (sublists) for instances */
111 +        if (nl != NULL)         /* return total number of lists allocated */
112 +                *nl = nextlist - listid;
113          return(listid);         /* all done -- return list id */
114   }
115  
116  
117   int
118 < rgl_octlist(fname, cent, radp)  /* load octree objects into display list */
118 > rgl_octlist(fname, cent, radp, nl)      /* load scen into display list */
119   char    *fname;
120   FVECT   cent;                   /* returned octree center (optional) */
121 < double  *radp;                  /* returned octree size (optional) */
121 > RREAL   *radp;                  /* returned octree size (optional) */
122 > int     *nl;                    /* returned number of lists (optional) */
123   {
124          double  r;
125          int     listid;
# Line 137 | Line 138 | double *radp;                  /* returned octree size (optional) */
138          glEndList();            /* close top list */
139          lightdefs();            /* define light sources */
140          loadoctrees();          /* load referenced octrees into sublists */
141 +        if (nl != NULL)         /* return total number of lists allocated */
142 +                *nl = nextlist - listid;
143          return(listid);
144   }
145  
146  
147 + void
148   rgl_load(inpspec)               /* convert scene description into OGL calls */
149   char    *inpspec;
150   {
# Line 183 | 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 194 | 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))
205 <                ob.otype = -1;
206 <        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 212 | 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