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

Comparing ray/src/hd/rhd_geom.c (file contents):
Revision 3.4 by gwlarson, Wed Dec 23 17:43:20 1998 UTC vs.
Revision 3.6 by gwlarson, Fri Jan 29 11:11:14 1999 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1998 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1999 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 33 | Line 33 | static struct gmEntry {
33  
34   #define FORALLPORT(pl,i)                for (i=0;i<MAXPORT&&pl[i]!=NULL;i++)
35  
36 < extern char     *atos(), *sskip(), *sskip2();
36 > extern char     *nextword();
37  
38  
39   gmNewGeom(file)                 /* add new geometry to next list */
# Line 59 | Line 59 | char   *file;
59          dolights = 0;
60          domats = 1;
61          gmNext[i].listid = rgl_octlist(file, gmNext[i].cent, &gmNext[i].rad);
62 +        gmNext[i].rad *= 1.732;         /* go to corners */
63   #ifdef DEBUG
64          fprintf(stderr, "Loaded octree \"%s\" into listID %d with radius %f\n",
65                          file, gmNext[i].listid, gmNext[i].rad);
# Line 83 | Line 84 | gmEndGeom()                    /* make next list current */
84  
85  
86   int
87 < gmDrawGeom()                    /* draw current list of octrees (and ports) */
87 > gmDrawGeom()                    /* draw current list of octrees */
88   {
89          register int    n;
90  
# Line 144 | Line 145 | char   *pflist;
145  
146          if (pflist == NULL)
147                  return;
148 <        while (*pflist) {
148 <                atos(newfile, sizeof(newfile), pflist);
149 <                if (!*newfile)
150 <                        break;
151 <                pflist = sskip(pflist);
148 >        while ((pflist = nextword(newfile, sizeof(newfile), pflist)) != NULL) {
149                  FORALLPORT(newportlist,i)
150                          if (!strcmp(newportlist[i], newfile))
151                                  goto endloop;   /* in list already */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines