ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.12 by greg, Sat Jan 18 20:23:15 2025 UTC

# Line 116 | Line 116 | leafsample(TRITREE *leaf)
116          VCOPY(myray.rdir, sdir);
117          myray.rmax = 0.;
118          ray_trace(&myray);
119 <        setcolr(leaf->val, colval(myray.rcol,RED),
120 <                        colval(myray.rcol,GRN),
121 <                        colval(myray.rcol,BLU));
119 >        scolor_colr(leaf->val, myray.rcol);
120   }
121  
122   /* Initialize a branch node contained in the given spherical triangle */
# Line 187 | Line 185 | branchsample(TRITREE *node, int depth)
185  
186   /* Sample sphere using triangular geodesic mesh */
187   TRITREE *
188 < geosample(int nsamps)
188 > geosample(long nsamps)
189   {
190          int     depth;
191          TRITREE *tree;
# Line 196 | Line 194 | geosample(int nsamps)
194                                          /* figure out depth */
195          if ((nsamps -= 4) < 0)
196                  error(USER, "minimum number of samples is 4");
197 <        nsamps = nsamps*3/NTRUNKBR;     /* round up */
197 >        nsamps = nsamps*(NTRUNKBR-1)/NTRUNKBR;  /* round up */
198          for (depth = 0; nsamps > 1; depth++)
199                  nsamps >>= 2;
200                                          /* make base tetrahedron */
# 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 (old)
> Changed lines (new)