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

Comparing ray/src/rt/rtrace.c (file contents):
Revision 1.17 by greg, Tue Jun 25 14:06:18 1991 UTC vs.
Revision 2.1 by greg, Tue Nov 12 17:09:39 1991 UTC

# Line 46 | Line 46 | int  vresolu = 0;                      /* vertical resolution */
46   double  dstrsrc = 0.0;                  /* square source distribution */
47   double  shadthresh = .05;               /* shadow threshold */
48   double  shadcert = .5;                  /* shadow certainty */
49 < int  directrelay = 0;                   /* number of source relays */
49 > int  directrelay = 1;                   /* number of source relays */
50   int  vspretest = 512;                   /* virtual source pretest density */
51 + int  directinvis = 0;                   /* sources invisible? */
52 + double  srcsizerat = .25;               /* maximum ratio source size/dist. */
53  
54   int  maxdepth = 6;                      /* maximum recursion depth */
55   double  minweight = 4e-3;               /* minimum ray weight */
# Line 234 | Line 236 | register FVECT  vec;
236   int  fmt;
237   FILE  *fp;
238   {
239 +        extern char  *fgetword();
240 +        extern double  atof();
241          static float  vf[3];
242 +        char  buf[32];
243 +        register int  i;
244  
245          switch (fmt) {
246          case 'a':                                       /* ascii */
247 <                if (fscanf(fp, "%lf %lf %lf", vec, vec+1, vec+2) != 3)
248 <                        return(-1);
247 >                for (i = 0; i < 3; i++) {
248 >                        if (fgetword(buf, sizeof(buf), fp) == NULL ||
249 >                                        !isflt(buf))
250 >                                return(-1);
251 >                        vec[i] = atof(buf);
252 >                }
253                  break;
254          case 'f':                                       /* binary float */
255                  if (fread((char *)vf, sizeof(float), 3, fp) != 3)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines