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

Comparing ray/src/hd/rhd_qtree.c (file contents):
Revision 3.19 by greg, Sat Feb 22 02:07:24 2003 UTC vs.
Revision 3.28 by greg, Wed Jan 24 04:39:52 2018 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Quadtree driver support routines.
6   */
7  
8 + #include <string.h>
9 +
10   #include "standard.h"
11   #include "rhd_qtree.h"
12                                  /* quantity of leaves to free at a time */
# Line 28 | Line 30 | struct rleaves qtL;            /* our pile of leaves */
30  
31   int     rayqleft = 0;           /* rays left to queue before flush */
32  
33 < static int4     falleaves;      /* our list of fallen leaves */
33 > static int32    falleaves;      /* our list of fallen leaves */
34  
35   #define composted(li)   (qtL.bl <= qtL.tl ? \
36                                          ((li) < qtL.bl || (li) >= qtL.tl) : \
# Line 39 | Line 41 | static int4    falleaves;      /* our list of fallen leaves */
41   static RTREE    **twigbundle;   /* free twig blocks (NULL term.) */
42   static int      nexttwig;       /* next free twig */
43  
44 + static RTREE *newtwig(void);
45 + static void qtFreeTree(int really);
46 + static void shaketree(RTREE *tp);
47 + static int putleaf(int li, int drop);
48  
49 +
50   static RTREE *
51 < newtwig()                       /* allocate a twig */
51 > newtwig(void)                   /* allocate a twig */
52   {
53          register int    bi;
54  
# Line 53 | Line 60 | newtwig()                      /* allocate a twig */
60          }
61          bi = nexttwig / TBUNDLESIZ;
62          if (twigbundle[bi] == NULL) {   /* new block */
63 <                twigbundle = (RTREE **)realloc((char *)twigbundle,
63 >                twigbundle = (RTREE **)realloc((void *)twigbundle,
64                                          (bi+2)*sizeof(RTREE *));
65                  if (twigbundle == NULL)
66                          goto memerr;
# Line 66 | Line 73 | newtwig()                      /* allocate a twig */
73          return(twigbundle[bi] + (nexttwig++ - bi*TBUNDLESIZ));
74   memerr:
75          error(SYSTEM, "out of memory in newtwig");
76 +        return NULL; /* pro forma return */
77   }
78  
79  
80 < qtFreeTree(really)              /* free allocated twigs */
81 < int     really;
80 > static void
81 > qtFreeTree(             /* free allocated twigs */
82 >        int     really
83 > )
84   {
85          register int    i;
86  
# Line 81 | Line 91 | int    really;
91          nexttwig = 0;
92          if (!really) {          /* just clear allocated blocks */
93                  while (i--)
94 <                        bzero((char *)twigbundle[i], TBUNDLESIZ*sizeof(RTREE));
94 >                        memset((char *)twigbundle[i], '\0', TBUNDLESIZ*sizeof(RTREE));
95                  return;
96          }
97                                  /* else "really" means free up memory */
# Line 92 | Line 102 | int    really;
102   }
103  
104  
105 < #define LEAFSIZ         (3*sizeof(float)+sizeof(int4)+\
106 <                        sizeof(TMbright)+6*sizeof(BYTE))
105 > #define LEAFSIZ         (3*sizeof(float)+sizeof(int32)+\
106 >                        sizeof(TMbright)+6*sizeof(uby8))
107  
108 < int
109 < qtAllocLeaves(n)                /* allocate space for n leaves */
110 < register int    n;
108 > extern int
109 > qtAllocLeaves(          /* allocate space for n leaves */
110 >        register int    n
111 > )
112   {
113          unsigned        nbytes;
114          register unsigned       i;
# Line 119 | Line 130 | register int   n;
130                  return(0);
131                                  /* assign larger alignment types earlier */
132          qtL.wp = (float (*)[3])qtL.base;
133 <        qtL.wd = (int4 *)(qtL.wp + n);
133 >        qtL.wd = (int32 *)(qtL.wp + n);
134          qtL.brt = (TMbright *)(qtL.wd + n);
135 <        qtL.chr = (BYTE (*)[3])(qtL.brt + n);
136 <        qtL.rgb = (BYTE (*)[3])(qtL.chr + n);
135 >        qtL.chr = (uby8 (*)[3])(qtL.brt + n);
136 >        qtL.rgb = (uby8 (*)[3])(qtL.chr + n);
137          qtL.nl = n;
138          qtL.tml = qtL.bl = qtL.tl = 0;
139          falleaves = -1;
# Line 132 | Line 143 | register int   n;
143   #undef  LEAFSIZ
144  
145  
146 < qtFreeLeaves()                  /* free our allocated leaves and twigs */
146 > extern void
147 > qtFreeLeaves(void)                      /* free our allocated leaves and twigs */
148   {
149          qtFreeTree(1);          /* free tree also */
150          if (qtL.nl <= 0)
# Line 143 | Line 155 | qtFreeLeaves()                 /* free our allocated leaves and twig
155   }
156  
157  
158 < static
159 < shaketree(tp)                   /* shake dead leaves from tree */
160 < register RTREE  *tp;
158 > static void
159 > shaketree(                      /* shake dead leaves from tree */
160 >        register RTREE  *tp
161 > )
162   {
163          register int    i, li;
164  
# Line 162 | Line 175 | register RTREE *tp;
175   }
176  
177  
178 < int
179 < qtCompost(pct)                  /* free up some leaves */
180 < int     pct;
178 > extern int
179 > qtCompost(                      /* free up some leaves */
180 >        int     pct
181 > )
182   {
183 <        register int4   *fl;
183 >        register int32  *fl;
184          int     nused, nclear, nmapped;
185                                  /* figure out how many leaves to clear */
186          nclear = qtL.nl * pct / 100;
# Line 196 | Line 210 | int    pct;
210   }
211  
212  
213 < int
214 < qtFindLeaf(x, y)                /* find closest leaf to (x,y) */
215 < int     x, y;
213 > extern int
214 > qtFindLeaf(             /* find closest leaf to (x,y) */
215 >        int     x,
216 >        int     y
217 > )
218   {
219          register RTREE  *tp = &qtrunk;
220          int     li = -1;
# Line 233 | Line 249 | int    x, y;
249   }
250  
251  
252 < static
253 < putleaf(li, drop)               /* put a leaf in our tree */
254 < register int    li;
255 < int     drop;
252 > static int
253 > putleaf(                /* put a leaf in our tree */
254 >        register int    li,
255 >        int     drop
256 > )
257   {
258          register RTREE  *tp = &qtrunk;
259          int     x0=0, y0=0, x1=odev.hres, y1=odev.vres;
# Line 251 | Line 268 | int    drop;
268                  return(0);
269                                          /* compute leaf location in view */
270          VCOPY(wp, qtL.wp[li]);
271 <        viewloc(ip, &odev.v, wp);
255 <        if (ip[2] <= 0. || ip[0] < 0. || ip[0] >= 1.
256 <                        || ip[1] < 0. || ip[1] >= 1.)
271 >        if (viewloc(ip, &odev.v, wp) != 1)
272                  goto dropit;                    /* behind or outside view */
273   #ifdef DEBUG
274          if (odev.v.type == VT_PAR | odev.v.vfore > FTINY)
# Line 317 | Line 332 | int    drop;
332                  tp->k[q].li = lo;
333          }
334   dropit:
335 <        if (drop)
335 >        if (drop) {
336                  if (li+1 == (qtL.tl ? qtL.tl : qtL.nl))
337                          qtL.tl = li;            /* special case */
338                  else {
# Line 325 | Line 340 | dropit:
340                          qtL.wd[li] = falleaves;
341                          falleaves = li;
342                  }
343 +        }
344          return(li == lo);
345   }
346  
347  
348 < dev_value(c, d, p)              /* add a pixel value to our quadtree */
349 < COLR    c;
350 < FVECT   d, p;
348 > extern void
349 > dev_value(              /* add a pixel value to our quadtree */
350 >        COLR    c,
351 >        FVECT   d,
352 >        FVECT   p
353 > )
354   {
355          register int    li;
356          int     mapit;
# Line 355 | Line 374 | FVECT  d, p;
374          else
375                  VCOPY(qtL.wp[li], p);
376          qtL.wd[li] = encodedir(d);
377 <        tmCvColrs(&qtL.brt[li], qtL.chr[li], c, 1);
377 >        tmCvColrs(tmGlobal, &qtL.brt[li], qtL.chr[li], (COLR *)c, 1);
378          if (putleaf(li, 1)) {
379                  if (mapit)
380 <                        tmMapPixels(qtL.rgb+li, qtL.brt+li, qtL.chr+li, 1);
380 >                        tmMapPixels(tmGlobal, (uby8 *)(qtL.rgb+li), qtL.brt+li,
381 >                                        (uby8 *)(qtL.chr+li), 1);
382                  if (--rayqleft == 0)
383                          dev_flush();            /* flush output */
384          }
385   }
386  
387  
388 < qtReplant()                     /* replant our tree using new view */
388 > extern void
389 > qtReplant(void)                 /* replant our tree using new view */
390   {
391          register int    i;
392                                          /* anything to replant? */
# Line 380 | Line 401 | qtReplant()                    /* replant our tree using new view */
401   }
402  
403  
404 < qtMapLeaves(redo)               /* map our leaves to RGB */
405 < int     redo;
404 > extern int
405 > qtMapLeaves(            /* map our leaves to RGB */
406 >        int     redo
407 > )
408   {
409          int     aorg, alen, borg, blen;
410                                          /* recompute mapping? */
# Line 402 | Line 425 | int    redo;
425          }
426                                          /* (re)compute tone mapping? */
427          if (qtL.tml == qtL.bl) {
428 <                tmClearHisto();
429 <                tmAddHisto(qtL.brt+aorg, alen, 1);
428 >                tmClearHisto(tmGlobal);
429 >                tmAddHisto(tmGlobal, qtL.brt+aorg, alen, 1);
430                  if (blen > 0)
431 <                        tmAddHisto(qtL.brt+borg, blen, 1);
432 <                if (tmComputeMapping(0., 0., 0.) != TM_E_OK)
431 >                        tmAddHisto(tmGlobal, qtL.brt+borg, blen, 1);
432 >                if (tmComputeMapping(tmGlobal, 0., 0., 0.) != TM_E_OK)
433                          return(0);
434          }
435 <        if (tmMapPixels(qtL.rgb+aorg, qtL.brt+aorg,
436 <                        qtL.chr+aorg, alen) != TM_E_OK)
435 >        if (tmMapPixels(tmGlobal, (uby8 *)(qtL.rgb+aorg), qtL.brt+aorg,
436 >                        (uby8 *)(qtL.chr+aorg), alen) != TM_E_OK)
437                  return(0);
438          if (blen > 0)
439 <                tmMapPixels(qtL.rgb+borg, qtL.brt+borg,
440 <                                qtL.chr+borg, blen);
439 >                tmMapPixels(tmGlobal, (uby8 *)(qtL.rgb+borg), qtL.brt+borg,
440 >                                (uby8 *)(qtL.chr+borg), blen);
441          qtL.tml = qtL.tl;
442          return(1);
443   }

Diff Legend

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