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.5 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 3.9 by schorsch, Mon Oct 27 10:19:31 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 + #include "rtprocess.h"
11   #include "radogl.h"
12  
13   #ifndef NLIST2ALLOC
# Line 34 | 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 117 | 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 147 | Line 149 | void
149   rgl_load(inpspec)               /* convert scene description into OGL calls */
150   char    *inpspec;
151   {
150 –        FILE    *popen();
152          char    *fgetline();
153          FILE    *infp;
154          char    buf[1024];
# Line 198 | 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))
209 <                ob.otype = -1;
210 <        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 216 | 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