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.21 by greg, Fri Sep 23 19:04:52 2005 UTC

# Line 28 | Line 28 | int  objlim = 6;                       /* # of objects before split */
28  
29   int  resolu = 16384;                    /* octree resolution limit */
30  
31 < CUBE  thescene = {EMPTY, {0.0, 0.0, 0.0}, 0.0};         /* our scene */
31 > CUBE  thescene = {{0.0, 0.0, 0.0}, 0.0, EMPTY};         /* our scene */
32  
33   char  *ofname[MAXOBJFIL+1];             /* object file names */
34   int  nfiles = 0;                        /* number of object files */
# Line 271 | Line 271 | add2full(                      /* add object to full node */
271          objset(oset, cu->cutree);
272          cukid.cusize = cu->cusize * 0.5;
273  
274 <        if (inc==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
274 >        if (inc==O_IN || oset[0] < objlim || cukid.cusize <
275 >                        (oset[0] < MAXSET ? mincusize : mincusize/256.0)) {
276                                                  /* add to set */
277                  if (oset[0] >= MAXSET) {
278                          sprintf(errmsg, "set overflow in addobject (%s)",

Diff Legend

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