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

Comparing ray/src/rt/raycalls.c (file contents):
Revision 2.3 by greg, Thu May 15 05:13:35 2003 UTC vs.
Revision 2.5 by greg, Mon Jun 30 18:19:53 2003 UTC

# Line 90 | Line 90 | static const char      RCSid[] = "$Id$";
90   *  same as the defaults for rtrace.)
91   */
92  
93 < #include  "ray.h"
93 > #include <string.h>
94  
95 + #include  "ray.h"
96   #include  "source.h"
96 –
97   #include  "ambient.h"
98 –
98   #include  "otypes.h"
100 –
99   #include  "random.h"
102 –
100   #include  "data.h"
104 –
101   #include  "font.h"
102  
103   char    *progname = "unknown_app";      /* caller sets to argv[0] */
# Line 167 | Line 163 | char   *otnm;
163          if (ofun[OBJ_SPHERE].funp == o_default)
164                  initotypes();
165                                          /* initialize urand */
166 <        if (urperm == NULL)
171 <                initurand(2048);
166 >        initurand(2048);
167                                          /* read scene octree */
168          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
169          nsceneobjs = nobjects;
# Line 242 | Line 237 | RAYPARAMS      *rp;
237          rp->maxdepth = maxdepth;
238          rp->minweight = minweight;
239          copycolor(rp->ambval, ambval);
240 <        bzero(rp->ambfile, sizeof(rp->ambfile));
240 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
241          if (ambfile != NULL)
242                  strncpy(rp->ambfile, ambfile, sizeof(rp->ambfile)-1);
243          rp->ambvwt = ambvwt;
# Line 252 | Line 247 | RAYPARAMS      *rp;
247          rp->ambssamp = ambssamp;
248          rp->ambounce = ambounce;
249          rp->ambincl = ambincl;
250 <        bzero(rp->amblval, sizeof(rp->amblval));
250 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
251          ndx = 0;
252          for (i = 0; i < AMBLLEN && amblist[i] != NULL; i++) {
253                  int     len = strlen(amblist[i]);
# Line 360 | Line 355 | RAYPARAMS      *rp;
355          rp->maxdepth = 6;
356          rp->minweight = 4e-3;
357          setcolor(rp->ambval, 0., 0., 0.);
358 <        bzero(rp->ambfile, sizeof(rp->ambfile));
358 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
359          rp->ambvwt = 0;
360          rp->ambres = 128;
361          rp->ambacc = 0.2;
# Line 368 | Line 363 | RAYPARAMS      *rp;
363          rp->ambssamp = 0;
364          rp->ambounce = 0;
365          rp->ambincl = -1;
366 <        bzero(rp->amblval, sizeof(rp->amblval));
366 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
367          for (i = AMBLLEN+1; i--; )
368                  rp->amblndx[i] = -1;
369   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines