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

Comparing ray/src/gen/mksource.c (file contents):
Revision 2.9 by greg, Fri Jan 15 20:56:50 2021 UTC vs.
Revision 2.13 by greg, Tue Jun 3 21:31:51 2025 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7  
8   #include "ray.h"
9   #include "random.h"
10 + #include "paths.h"
11   #include "resolu.h"
12  
13   #define NTRUNKBR        4               /* number of branches at trunk */
# Line 29 | Line 30 | typedef struct lostlight {
30          COLOR           intens;         /* output times solid angle */
31   } LOSTLIGHT;
32  
32 – extern char     *progname;
33 –
33   FVECT   scene_cent;             /* center of octree cube */
34   RREAL   scene_rad;              /* radius to get outside cube from center */
35  
# Line 116 | Line 115 | leafsample(TRITREE *leaf)
115          VCOPY(myray.rdir, sdir);
116          myray.rmax = 0.;
117          ray_trace(&myray);
118 <        setcolr(leaf->val, colval(myray.rcol,RED),
120 <                        colval(myray.rcol,GRN),
121 <                        colval(myray.rcol,BLU));
118 >        scolor_colr(leaf->val, myray.rcol);
119   }
120  
121   /* Initialize a branch node contained in the given spherical triangle */
# Line 187 | Line 184 | branchsample(TRITREE *node, int depth)
184  
185   /* Sample sphere using triangular geodesic mesh */
186   TRITREE *
187 < geosample(int nsamps)
187 > geosample(long nsamps)
188   {
189          int     depth;
190          TRITREE *tree;
# Line 196 | Line 193 | geosample(int nsamps)
193                                          /* figure out depth */
194          if ((nsamps -= 4) < 0)
195                  error(USER, "minimum number of samples is 4");
196 <        nsamps = nsamps*3/NTRUNKBR;     /* round up */
196 >        nsamps = nsamps*(NTRUNKBR-1)/NTRUNKBR;  /* round up */
197          for (depth = 0; nsamps > 1; depth++)
198                  nsamps >>= 2;
199                                          /* make base tetrahedron */
# Line 504 | Line 501 | main(int argc, char *argv[])
501          TRITREE *samptree;
502          double  thresh = 0;
503          int     i;
504 <        
505 <        progname = argv[0];
504 >
505 >        fixargv0(argv[0]);              /* sets global progname */
506 >
507          for (i = 1; i < argc && argv[i][0] == '-'; i++)
508                  switch (argv[i][1]) {
509                  case 'd':               /* number of samples */
# Line 558 | Line 556 | userr:
556   }
557  
558   void
559 < eputs(char  *s)
559 > eputs(const char  *s)
560   {
561          static int  midline = 0;
562  
# Line 576 | Line 574 | eputs(char  *s)
574   }
575  
576   void
577 < wputs(char *s)
577 > wputs(const char *s)
578   {
579          /* no warnings */
580   }

Diff Legend

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