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.11 by greg, Fri Jun 2 17:47:04 1995 UTC vs.
Revision 2.13 by greg, Wed Mar 12 04:59:04 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  oconv.c - main program for object to octree conversion.
6   *
# Line 30 | Line 27 | int  nowarn = 0;                       /* supress warnings? */
27  
28   int  objlim = 5;                        /* # of objects before split */
29  
30 < int  resolu = 1024;                     /* octree resolution limit */
30 > int  resolu = 8192;                     /* octree resolution limit */
31  
32   CUBE  thescene = {EMPTY, {0.0, 0.0, 0.0}, 0.0};         /* our scene */
33  
# Line 39 | Line 36 | int  nfiles = 0;                       /* number of object files */
36  
37   double  mincusize;                      /* minimum cube size from resolu */
38  
39 < int  (*addobjnotify[])() = {NULL};      /* new object notifier functions */
39 > void  (*addobjnotify[])() = {NULL};     /* new object notifier functions */
40  
41  
42   main(argc, argv)                /* convert object files to an octree */
# Line 160 | Line 157 | breakopt:
157   }
158  
159  
160 + void
161   quit(code)                              /* exit program */
162   int  code;
163   {
# Line 167 | Line 165 | int  code;
165   }
166  
167  
168 + void
169   cputs()                                 /* interactive error */
170   {
171          /* referenced, but not used */
172   }
173  
174  
175 + void
176   wputs(s)                                /* warning message */
177   char  *s;
178   {
# Line 181 | Line 181 | char  *s;
181   }
182  
183  
184 + void
185   eputs(s)                                /* put string to stderr */
186   register char  *s;
187   {
# Line 207 | Line 208 | addobject(cu, obj)                     /* add an object to a cube */
208   register CUBE  *cu;
209   OBJECT  obj;
210   {
211 <        CUBE  cukid;
211 <        OCTREE  ot;
212 <        OBJECT  oset[MAXSET+1];
213 <        unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
214 <        int  in;
215 <        register int  i, j;
211 >        int  inc;
212  
213 <        in = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu);
213 >        inc = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu);
214  
215 <        if (in == O_MISS)
215 >        if (inc == O_MISS)
216                  return;                         /* no intersection */
217  
218          if (istree(cu->cutree)) {
219 <                                                /* do children */
219 >                CUBE  cukid;                    /* do children */
220 >                int  i, j;
221                  cukid.cusize = cu->cusize * 0.5;
222                  for (i = 0; i < 8; i++) {
223                          cukid.cutree = octkid(cu->cutree, i);
# Line 235 | Line 232 | OBJECT obj;
232                  return;
233          }
234          if (isempty(cu->cutree)) {
235 <                                                /* singular set */
235 >                OBJECT  oset[2];                /* singular set */
236                  oset[0] = 1; oset[1] = obj;
237                  cu->cutree = fullnode(oset);
238                  return;
239          }
240                                          /* add to full node */
241 +        add2full(cu, obj, inc);
242 + }
243 +
244 +
245 + add2full(cu, obj, inc)                  /* add object to full node */
246 + register CUBE  *cu;
247 + OBJECT  obj;
248 + int  inc;
249 + {
250 +        OCTREE  ot;
251 +        OBJECT  oset[MAXSET+1];
252 +        CUBE  cukid;
253 +        unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
254 +        register int  i, j;
255 +
256          objset(oset, cu->cutree);
257          cukid.cusize = cu->cusize * 0.5;
258  
259 <        if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
259 >        if (inc==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
260                                                  /* add to set */
261                  if (oset[0] >= MAXSET) {
262                          sprintf(errmsg, "set overflow in addobject (%s)",

Diff Legend

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