ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/ot/oconv.c
(Generate patch)

Comparing ray/src/ot/oconv.c (file contents):
Revision 2.19 by schorsch, Sat Mar 27 12:41:45 2004 UTC vs.
Revision 2.24 by greg, Tue Jun 3 21:31:51 2025 UTC

# Line 18 | Line 18 | static const char RCSid[] = "$Id$";
18  
19   #define  OMARGIN        (10*FTINY)      /* margin around global cube */
20  
21 < #define  MAXOBJFIL      127             /* maximum number of scene files */
21 > #define  MAXOBJFIL      255             /* maximum number of scene files */
22  
23 – char  *progname;                        /* argv[0] */
24 –
23   int  nowarn = 0;                        /* supress warnings? */
24  
25   int  objlim = 6;                        /* # of objects before split */
26  
27   int  resolu = 16384;                    /* octree resolution limit */
28  
29 < CUBE  thescene = {EMPTY, {0.0, 0.0, 0.0}, 0.0};         /* our scene */
29 > CUBE  thescene = {{0.0, 0.0, 0.0}, 0.0, EMPTY};         /* our scene */
30  
31   char  *ofname[MAXOBJFIL+1];             /* object file names */
32   int  nfiles = 0;                        /* number of object files */
# Line 54 | Line 52 | main(          /* convert object files to an octree */
52          OBJECT  startobj;
53          int  i;
54  
55 <        progname = argv[0] = fixargv0(argv[0]);
55 >        fixargv0(argv[0]);              /* sets global progname */
56  
57          ot_initotypes();
58  
# Line 178 | Line 176 | cputs(void)                                    /* interactive error */
176  
177   void
178   wputs(                          /* warning message */
179 <        char  *s
179 >        const char  *s
180   )
181   {
182          if (!nowarn)
# Line 188 | Line 186 | wputs(                         /* warning message */
186  
187   void
188   eputs(                          /* put string to stderr */
189 <        register char  *s
189 >        const char  *s
190   )
191   {
192          static int  inln = 0;
# Line 217 | Line 215 | eputs(                         /* put string to stderr */
215  
216   static void
217   addobject(                      /* add an object to a cube */
218 <        register CUBE  *cu,
218 >        CUBE  *cu,
219          OBJECT  obj
220   )
221   {
# Line 257 | Line 255 | addobject(                     /* add an object to a cube */
255  
256   static void
257   add2full(                       /* add object to full node */
258 <        register CUBE  *cu,
258 >        CUBE  *cu,
259          OBJECT  obj,
260          int  inc
261   )
# Line 266 | Line 264 | add2full(                      /* add object to full node */
264          OBJECT  oset[MAXSET+1];
265          CUBE  cukid;
266          unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
267 <        register int  i, j;
267 >        int  i, j;
268  
269          objset(oset, cu->cutree);
270          cukid.cusize = cu->cusize * 0.5;
271  
272 <        if (inc==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
272 >        if (inc==O_IN || oset[0] < objlim || cukid.cusize <
273 >                        (oset[0] < MAXSET ? mincusize : mincusize/256.0)) {
274                                                  /* add to set */
275                  if (oset[0] >= MAXSET) {
276                          sprintf(errmsg, "set overflow in addobject (%s)",

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)