1 |
– |
/* Copyright (c) 1987 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 |
|
* rview.c - routines and variables for interactive view generation. |
6 |
|
* |
7 |
< |
* 3/24/87 |
7 |
> |
* External symbols declared in rpaint.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
#include "ray.h" |
10 |
> |
#include "copyright.h" |
11 |
|
|
15 |
– |
#include "rpaint.h" |
16 |
– |
|
12 |
|
#include <signal.h> |
18 |
– |
|
13 |
|
#include <ctype.h> |
14 |
|
|
15 |
< |
VIEW ourview = STDVIEW; /* viewing parameters */ |
16 |
< |
int hresolu, vresolu; /* image resolution */ |
15 |
> |
#include "ray.h" |
16 |
> |
#include "rpaint.h" |
17 |
|
|
18 |
< |
int dimlist[MAXDIM]; /* sampling dimensions */ |
25 |
< |
int ndims = 0; /* number of sampling dimensions */ |
26 |
< |
int samplendx = 0; /* index for this sample */ |
18 |
> |
#define CTRL(c) ((c)-'@') |
19 |
|
|
28 |
– |
int psample = 8; /* pixel sample size */ |
29 |
– |
double maxdiff = .15; /* max. sample difference */ |
20 |
|
|
21 |
< |
double exposure = 1.0; /* exposure for scene */ |
32 |
< |
|
33 |
< |
double dstrsrc = 0.0; /* square source distribution */ |
34 |
< |
double shadthresh = .1; /* shadow threshold */ |
35 |
< |
double shadcert = .25; /* shadow certainty */ |
36 |
< |
int directrelay = 0; /* number of source relays */ |
37 |
< |
int vspretest = 128; /* virtual source pretest density */ |
38 |
< |
int directinvis = 0; /* sources invisible? */ |
39 |
< |
double srcsizerat = 0.; /* maximum ratio source size/dist. */ |
40 |
< |
|
41 |
< |
int maxdepth = 4; /* maximum recursion depth */ |
42 |
< |
double minweight = 1e-2; /* minimum ray weight */ |
43 |
< |
|
44 |
< |
COLOR ambval = BLKCOLOR; /* ambient value */ |
45 |
< |
double ambacc = 0.2; /* ambient accuracy */ |
46 |
< |
int ambres = 8; /* ambient resolution */ |
47 |
< |
int ambdiv = 32; /* ambient divisions */ |
48 |
< |
int ambssamp = 0; /* ambient super-samples */ |
49 |
< |
int ambounce = 0; /* ambient bounces */ |
50 |
< |
char *amblist[128]; /* ambient include/exclude list */ |
51 |
< |
int ambincl = -1; /* include == 1, exclude == 0 */ |
52 |
< |
|
53 |
< |
int greyscale = 0; /* map colors to brightness? */ |
54 |
< |
char *devname = dev_default; /* output device name */ |
55 |
< |
|
56 |
< |
struct driver *dev = NULL; /* driver functions */ |
57 |
< |
|
58 |
< |
VIEW oldview; /* previous view parameters */ |
59 |
< |
|
60 |
< |
PNODE ptrunk; /* the base of our image */ |
61 |
< |
RECT pframe; /* current frame boundaries */ |
62 |
< |
int pdepth; /* image depth in current frame */ |
63 |
< |
|
64 |
< |
static char *reserve_mem = NULL; /* pre-allocated reserve memory */ |
65 |
< |
|
66 |
< |
#define RESERVE_AMT 32768 /* amount of memory to reserve */ |
67 |
< |
|
68 |
< |
#define CTRL(c) ('c'-'@') |
69 |
< |
|
70 |
< |
|
21 |
> |
void |
22 |
|
quit(code) /* quit program */ |
23 |
|
int code; |
24 |
|
{ |
25 |
< |
devclose(); |
25 |
> |
if (ray_pnprocs > 0) /* close children if any */ |
26 |
> |
ray_pclose(0); |
27 |
> |
if (!ray_pnprocs) /* in parent */ |
28 |
> |
devclose(); |
29 |
|
exit(code); |
30 |
|
} |
31 |
|
|
32 |
|
|
33 |
< |
devopen(dname) /* open device driver */ |
34 |
< |
char *dname; |
33 |
> |
void |
34 |
> |
devopen( /* open device driver */ |
35 |
> |
char *dname |
36 |
> |
) |
37 |
|
{ |
38 |
|
extern char *progname, *octname; |
39 |
|
char *id; |
40 |
< |
register int i; |
40 |
> |
int i; |
41 |
|
|
42 |
|
id = octname!=NULL ? octname : progname; |
43 |
|
/* check device table */ |
44 |
|
for (i = 0; devtable[i].name; i++) |
45 |
< |
if (!strcmp(dname, devtable[i].name)) |
45 |
> |
if (!strcmp(dname, devtable[i].name)) { |
46 |
|
if ((dev = (*devtable[i].init)(dname, id)) == NULL) { |
47 |
|
sprintf(errmsg, "cannot initialize %s", dname); |
48 |
|
error(USER, errmsg); |
49 |
|
} else |
50 |
|
return; |
51 |
+ |
} |
52 |
|
/* not there, try exec */ |
53 |
|
if ((dev = comm_init(dname, id)) == NULL) { |
54 |
|
sprintf(errmsg, "cannot start device \"%s\"", dname); |
57 |
|
} |
58 |
|
|
59 |
|
|
60 |
< |
devclose() /* close our device */ |
60 |
> |
void |
61 |
> |
devclose(void) /* close our device */ |
62 |
|
{ |
63 |
|
if (dev != NULL) |
64 |
|
(*dev->close)(); |
66 |
|
} |
67 |
|
|
68 |
|
|
69 |
< |
printdevices() /* print list of output devices */ |
69 |
> |
void |
70 |
> |
printdevices(void) /* print list of output devices */ |
71 |
|
{ |
72 |
< |
register int i; |
72 |
> |
int i; |
73 |
|
|
74 |
|
for (i = 0; devtable[i].name; i++) |
75 |
|
printf("%-16s # %s\n", devtable[i].name, devtable[i].descrip); |
76 |
|
} |
77 |
|
|
78 |
|
|
79 |
< |
rview() /* do a view */ |
79 |
> |
void |
80 |
> |
rview(void) /* do a view */ |
81 |
|
{ |
82 |
|
char buf[32]; |
83 |
|
|
84 |
< |
devopen(devname); /* open device */ |
85 |
< |
newimage(); /* start image (calls fillreserves) */ |
84 |
> |
devopen(dvcname); /* open device */ |
85 |
> |
newimage(NULL); /* start image */ |
86 |
|
|
87 |
|
for ( ; ; ) { /* quit in command() */ |
88 |
|
while (hresolu <= 1<<pdepth && vresolu <= 1<<pdepth) |
89 |
|
command("done: "); |
130 |
– |
while (reserve_mem == NULL) |
131 |
– |
command("out of memory: "); |
90 |
|
errno = 0; |
91 |
|
if (hresolu <= psample<<pdepth && vresolu <= psample<<pdepth) { |
92 |
|
sprintf(buf, "%d sampling...\n", 1<<pdepth); |
95 |
|
} else { |
96 |
|
sprintf(buf, "%d refining...\n", 1<<pdepth); |
97 |
|
(*dev->comout)(buf); |
98 |
< |
refine(&ptrunk, 0, 0, hresolu, vresolu, pdepth+1); |
98 |
> |
refine(&ptrunk, pdepth+1); |
99 |
|
} |
100 |
< |
if (errno == ENOMEM) /* ran out of memory */ |
143 |
< |
freereserves(); |
144 |
< |
else if (dev->inpready) /* noticed some input */ |
100 |
> |
if (dev->inpready) /* noticed some input */ |
101 |
|
command(": "); |
102 |
|
else /* finished this depth */ |
103 |
|
pdepth++; |
105 |
|
} |
106 |
|
|
107 |
|
|
108 |
< |
fillreserves() /* fill memory reserves */ |
108 |
> |
void |
109 |
> |
command( /* get/execute command */ |
110 |
> |
char *prompt |
111 |
> |
) |
112 |
|
{ |
113 |
< |
if (reserve_mem != NULL) |
155 |
< |
return; |
156 |
< |
reserve_mem = malloc(RESERVE_AMT); |
157 |
< |
} |
158 |
< |
|
159 |
< |
|
160 |
< |
freereserves() /* free memory reserves */ |
161 |
< |
{ |
162 |
< |
if (reserve_mem == NULL) |
163 |
< |
return; |
164 |
< |
free(reserve_mem); |
165 |
< |
reserve_mem = NULL; |
166 |
< |
} |
167 |
< |
|
168 |
< |
|
169 |
< |
command(prompt) /* get/execute command */ |
170 |
< |
char *prompt; |
171 |
< |
{ |
172 |
< |
#define badcom(s) strncmp(s, inpbuf, args-inpbuf-1) |
113 |
> |
#define badcom(s) strncmp(s, inpbuf, args-inpbuf-1) |
114 |
|
char inpbuf[256]; |
115 |
|
char *args; |
116 |
|
again: |
119 |
|
; |
120 |
|
if (*args) *args++ = '\0'; |
121 |
|
else *++args = '\0'; |
122 |
+ |
|
123 |
+ |
if (waitrays() < 0) /* clear ray queue */ |
124 |
+ |
quit(1); |
125 |
|
|
126 |
|
switch (inpbuf[0]) { |
127 |
< |
case 'f': /* new frame */ |
128 |
< |
if (badcom("frame")) |
129 |
< |
goto commerr; |
127 |
> |
case 'f': /* new frame (|focus|free) */ |
128 |
> |
if (badcom("frame")) { |
129 |
> |
if (badcom("focus")) { |
130 |
> |
if (badcom("free")) |
131 |
> |
goto commerr; |
132 |
> |
free_objmem(); |
133 |
> |
break; |
134 |
> |
} |
135 |
> |
getfocus(args); |
136 |
> |
break; |
137 |
> |
} |
138 |
|
getframe(args); |
139 |
|
break; |
140 |
|
case 'v': /* view */ |
147 |
|
goto commerr; |
148 |
|
lastview(args); |
149 |
|
break; |
150 |
+ |
case 'V': /* save view */ |
151 |
+ |
if (badcom("V")) |
152 |
+ |
goto commerr; |
153 |
+ |
saveview(args); |
154 |
+ |
break; |
155 |
+ |
case 'L': /* load view */ |
156 |
+ |
if (badcom("L")) |
157 |
+ |
goto commerr; |
158 |
+ |
loadview(args); |
159 |
+ |
break; |
160 |
|
case 'e': /* exposure */ |
161 |
|
if (badcom("exposure")) |
162 |
|
goto commerr; |
163 |
|
getexposure(args); |
164 |
|
break; |
165 |
|
case 's': /* set a parameter */ |
166 |
< |
if (badcom("set")) |
166 |
> |
if (badcom("set")) { |
167 |
> |
#ifdef SIGTSTP |
168 |
> |
if (!badcom("stop")) |
169 |
> |
goto dostop; |
170 |
> |
#endif |
171 |
|
goto commerr; |
172 |
+ |
} |
173 |
|
setparam(args); |
174 |
|
break; |
175 |
|
case 'n': /* new picture */ |
176 |
|
if (badcom("new")) |
177 |
|
goto commerr; |
178 |
< |
newimage(); |
178 |
> |
newimage(args); |
179 |
|
break; |
180 |
|
case 't': /* trace a ray */ |
181 |
|
if (badcom("trace")) |
187 |
|
goto commerr; |
188 |
|
getaim(args); |
189 |
|
break; |
190 |
< |
case 'm': /* move camera */ |
190 |
> |
case 'm': /* move camera (or memstats) */ |
191 |
|
if (badcom("move")) |
225 |
– |
#ifdef MSTATS |
226 |
– |
{ |
227 |
– |
if (badcom("memory")) |
228 |
– |
goto commerr; |
229 |
– |
printmemstats(stderr); |
230 |
– |
break; |
231 |
– |
} |
232 |
– |
#else |
192 |
|
goto commerr; |
234 |
– |
#endif |
193 |
|
getmove(args); |
194 |
|
break; |
195 |
|
case 'r': /* rotate/repaint */ |
196 |
|
if (badcom("rotate")) { |
197 |
< |
if (badcom("repaint")) |
198 |
< |
goto commerr; |
197 |
> |
if (badcom("repaint")) { |
198 |
> |
if (badcom("redraw")) |
199 |
> |
goto commerr; |
200 |
> |
redraw(); |
201 |
> |
break; |
202 |
> |
} |
203 |
|
getrepaint(args); |
204 |
|
break; |
205 |
|
} |
206 |
|
getrotate(args); |
207 |
|
break; |
208 |
|
case 'p': /* pivot view */ |
209 |
< |
if (badcom("pivot")) |
210 |
< |
goto commerr; |
209 |
> |
if (badcom("pivot")) { |
210 |
> |
if (badcom("pause")) |
211 |
> |
goto commerr; |
212 |
> |
goto again; |
213 |
> |
} |
214 |
|
getpivot(args); |
215 |
|
break; |
216 |
< |
case CTRL(R): /* redraw */ |
216 |
> |
case 'o': /* origin view */ |
217 |
> |
if (badcom("origin")) |
218 |
> |
goto commerr; |
219 |
> |
getorigin(args); |
220 |
> |
break; |
221 |
> |
case CTRL('R'): /* redraw */ |
222 |
|
redraw(); |
223 |
|
break; |
224 |
|
case 'w': /* write */ |
230 |
|
if (badcom("quit")) |
231 |
|
goto commerr; |
232 |
|
quit(0); |
233 |
< |
case CTRL(C): /* interrupt */ |
233 |
> |
case CTRL('C'): /* interrupt */ |
234 |
|
goto again; |
235 |
< |
#ifdef SIGTSTP |
236 |
< |
case CTRL(Z): /* stop */ |
235 |
> |
#ifdef SIGTSTP |
236 |
> |
case CTRL('Z'):; /* stop */ |
237 |
> |
dostop: |
238 |
|
devclose(); |
239 |
|
kill(0, SIGTSTP); |
240 |
|
/* pc stops here */ |
241 |
< |
devopen(devname); |
241 |
> |
devopen(dvcname); |
242 |
|
redraw(); |
243 |
|
break; |
244 |
|
#endif |
254 |
|
error(COMMAND, errmsg); |
255 |
|
break; |
256 |
|
} |
257 |
< |
#undef badcom |
257 |
> |
if (newparam && ray_pnprocs) /* drop into immediate mode */ |
258 |
> |
ray_pclose(0); |
259 |
> |
#undef badcom |
260 |
|
} |
261 |
|
|
262 |
|
|
263 |
< |
rsample() /* sample the image */ |
263 |
> |
void |
264 |
> |
rsample(void) /* sample the image */ |
265 |
|
{ |
266 |
|
int xsiz, ysiz, y; |
293 |
– |
RECT r; |
267 |
|
PNODE *p; |
268 |
< |
register RECT *rl; |
269 |
< |
register PNODE **pl; |
297 |
< |
register int x; |
268 |
> |
PNODE **pl; |
269 |
> |
int x; |
270 |
|
/* |
271 |
|
* We initialize the bottom row in the image at our current |
272 |
< |
* resolution. During sampling, we check super-pixels to the |
272 |
> |
* resolution. During sampling, we check super-pixels to the |
273 |
|
* right and above by calling bigdiff(). If there is a significant |
274 |
|
* difference, we subsample the super-pixels. The testing process |
275 |
|
* includes initialization of the next row. |
276 |
|
*/ |
277 |
< |
xsiz = (((pframe.r-pframe.l)<<pdepth)+hresolu-1) / hresolu; |
278 |
< |
ysiz = (((pframe.u-pframe.d)<<pdepth)+vresolu-1) / vresolu; |
307 |
< |
rl = (RECT *)malloc(xsiz*sizeof(RECT)); |
308 |
< |
if (rl == NULL) |
309 |
< |
return; |
277 |
> |
xsiz = (((long)(pframe.r-pframe.l)<<pdepth)+hresolu-1) / hresolu; |
278 |
> |
ysiz = (((long)(pframe.u-pframe.d)<<pdepth)+vresolu-1) / vresolu; |
279 |
|
pl = (PNODE **)malloc(xsiz*sizeof(PNODE *)); |
280 |
|
if (pl == NULL) |
281 |
|
return; |
282 |
|
/* |
283 |
|
* Initialize the bottom row. |
284 |
|
*/ |
285 |
< |
rl[0].l = rl[0].d = 0; |
317 |
< |
rl[0].r = hresolu; rl[0].u = vresolu; |
318 |
< |
pl[0] = findrect(pframe.l, pframe.d, &ptrunk, rl, pdepth); |
285 |
> |
pl[0] = findrect(pframe.l, pframe.d, &ptrunk, pdepth); |
286 |
|
for (x = 1; x < xsiz; x++) { |
320 |
– |
rl[x].l = rl[x].d = 0; |
321 |
– |
rl[x].r = hresolu; rl[x].u = vresolu; |
287 |
|
pl[x] = findrect(pframe.l+((x*hresolu)>>pdepth), |
288 |
< |
pframe.d, &ptrunk, rl+x, pdepth); |
288 |
> |
pframe.d, &ptrunk, pdepth); |
289 |
|
} |
290 |
|
/* sample the image */ |
291 |
|
for (y = 0; /* y < ysiz */ ; y++) { |
292 |
|
for (x = 0; x < xsiz-1; x++) { |
293 |
< |
if (dev->inpready || errno == ENOMEM) |
293 |
> |
if (dev->inpready) |
294 |
|
goto escape; |
295 |
|
/* |
296 |
|
* Test super-pixel to the right. |
297 |
|
*/ |
298 |
|
if (pl[x] != pl[x+1] && bigdiff(pl[x]->v, |
299 |
|
pl[x+1]->v, maxdiff)) { |
300 |
< |
refine(pl[x], rl[x].l, rl[x].d, |
301 |
< |
rl[x].r, rl[x].u, 1); |
337 |
< |
refine(pl[x+1], rl[x+1].l, rl[x+1].d, |
338 |
< |
rl[x+1].r, rl[x+1].u, 1); |
300 |
> |
refine(pl[x], 1); |
301 |
> |
refine(pl[x+1], 1); |
302 |
|
} |
303 |
|
} |
304 |
|
if (y >= ysiz-1) |
305 |
|
break; |
306 |
|
for (x = 0; x < xsiz; x++) { |
307 |
< |
if (dev->inpready || errno == ENOMEM) |
307 |
> |
if (dev->inpready) |
308 |
|
goto escape; |
309 |
|
/* |
310 |
|
* Find super-pixel at this position in next row. |
311 |
|
*/ |
349 |
– |
r.l = r.d = 0; |
350 |
– |
r.r = hresolu; r.u = vresolu; |
312 |
|
p = findrect(pframe.l+((x*hresolu)>>pdepth), |
313 |
|
pframe.d+(((y+1)*vresolu)>>pdepth), |
314 |
< |
&ptrunk, &r, pdepth); |
314 |
> |
&ptrunk, pdepth); |
315 |
|
/* |
316 |
|
* Test super-pixel in next row. |
317 |
|
*/ |
318 |
|
if (pl[x] != p && bigdiff(pl[x]->v, p->v, maxdiff)) { |
319 |
< |
refine(pl[x], rl[x].l, rl[x].d, |
320 |
< |
rl[x].r, rl[x].u, 1); |
360 |
< |
refine(p, r.l, r.d, r.r, r.u, 1); |
319 |
> |
refine(pl[x], 1); |
320 |
> |
refine(p, 1); |
321 |
|
} |
322 |
|
/* |
323 |
|
* Copy into super-pixel array. |
324 |
|
*/ |
365 |
– |
rl[x].l = r.l; rl[x].d = r.d; |
366 |
– |
rl[x].r = r.r; rl[x].u = r.u; |
325 |
|
pl[x] = p; |
326 |
|
} |
327 |
|
} |
328 |
|
escape: |
329 |
< |
free((char *)rl); |
372 |
< |
free((char *)pl); |
329 |
> |
free((void *)pl); |
330 |
|
} |
331 |
|
|
332 |
|
|
333 |
|
int |
334 |
< |
refine(p, xmin, ymin, xmax, ymax, pd) /* refine a node */ |
335 |
< |
register PNODE *p; |
336 |
< |
int xmin, ymin, xmax, ymax; |
337 |
< |
int pd; |
334 |
> |
refine( /* refine a node */ |
335 |
> |
PNODE *p, |
336 |
> |
int pd |
337 |
> |
) |
338 |
|
{ |
339 |
|
int growth; |
340 |
|
int mx, my; |
384 |
– |
int i; |
341 |
|
|
342 |
|
if (dev->inpready) /* quit for input */ |
343 |
|
return(0); |
345 |
|
if (pd <= 0) /* depth limit */ |
346 |
|
return(0); |
347 |
|
|
348 |
< |
mx = (xmin + xmax) >> 1; |
349 |
< |
my = (ymin + ymax) >> 1; |
348 |
> |
mx = (p->xmin + p->xmax) >> 1; |
349 |
> |
my = (p->ymin + p->ymax) >> 1; |
350 |
|
growth = 0; |
351 |
|
|
352 |
|
if (p->kid == NULL) { /* subdivide */ |
353 |
|
|
354 |
|
if ((p->kid = newptree()) == NULL) |
355 |
|
return(0); |
356 |
+ |
|
357 |
+ |
p->kid[UR].xmin = mx; |
358 |
+ |
p->kid[UR].ymin = my; |
359 |
+ |
p->kid[UR].xmax = p->xmax; |
360 |
+ |
p->kid[UR].ymax = p->ymax; |
361 |
+ |
p->kid[UL].xmin = p->xmin; |
362 |
+ |
p->kid[UL].ymin = my; |
363 |
+ |
p->kid[UL].xmax = mx; |
364 |
+ |
p->kid[UL].ymax = p->ymax; |
365 |
+ |
p->kid[DR].xmin = mx; |
366 |
+ |
p->kid[DR].ymin = p->ymin; |
367 |
+ |
p->kid[DR].xmax = p->xmax; |
368 |
+ |
p->kid[DR].ymax = my; |
369 |
+ |
p->kid[DL].xmin = p->xmin; |
370 |
+ |
p->kid[DL].ymin = p->ymin; |
371 |
+ |
p->kid[DL].xmax = mx; |
372 |
+ |
p->kid[DL].ymax = my; |
373 |
|
/* |
374 |
|
* The following paint order can leave a black pixel |
375 |
< |
* when redraw() is called in (*dev->paintr)(). |
375 |
> |
* if redraw() is called in (*dev->paintr)(). |
376 |
|
*/ |
377 |
|
if (p->x >= mx && p->y >= my) |
378 |
|
pcopy(p, p->kid+UR); |
379 |
< |
else |
380 |
< |
paint(p->kid+UR, mx, my, xmax, ymax); |
379 |
> |
else if (paint(p->kid+UR) < 0) |
380 |
> |
quit(1); |
381 |
|
if (p->x < mx && p->y >= my) |
382 |
|
pcopy(p, p->kid+UL); |
383 |
< |
else |
384 |
< |
paint(p->kid+UL, xmin, my, mx, ymax); |
383 |
> |
else if (paint(p->kid+UL) < 0) |
384 |
> |
quit(1); |
385 |
|
if (p->x >= mx && p->y < my) |
386 |
|
pcopy(p, p->kid+DR); |
387 |
< |
else |
388 |
< |
paint(p->kid+DR, mx, ymin, xmax, my); |
387 |
> |
else if (paint(p->kid+DR) < 0) |
388 |
> |
quit(1); |
389 |
|
if (p->x < mx && p->y < my) |
390 |
|
pcopy(p, p->kid+DL); |
391 |
< |
else |
392 |
< |
paint(p->kid+DL, xmin, ymin, mx, my); |
391 |
> |
else if (paint(p->kid+DL) < 0) |
392 |
> |
quit(1); |
393 |
|
|
394 |
|
growth++; |
395 |
|
} |
396 |
|
/* do children */ |
397 |
|
if (mx > pframe.l) { |
398 |
|
if (my > pframe.d) |
399 |
< |
growth += refine(p->kid+DL, xmin, ymin, mx, my, pd-1); |
399 |
> |
growth += refine(p->kid+DL, pd-1); |
400 |
|
if (my < pframe.u) |
401 |
< |
growth += refine(p->kid+UL, xmin, my, mx, ymax, pd-1); |
401 |
> |
growth += refine(p->kid+UL, pd-1); |
402 |
|
} |
403 |
|
if (mx < pframe.r) { |
404 |
|
if (my > pframe.d) |
405 |
< |
growth += refine(p->kid+DR, mx, ymin, xmax, my, pd-1); |
405 |
> |
growth += refine(p->kid+DR, pd-1); |
406 |
|
if (my < pframe.u) |
407 |
< |
growth += refine(p->kid+UR, mx, my, xmax, ymax, pd-1); |
435 |
< |
} |
436 |
< |
/* recompute sum */ |
437 |
< |
if (growth) { |
438 |
< |
setcolor(p->v, 0.0, 0.0, 0.0); |
439 |
< |
for (i = 0; i < 4; i++) |
440 |
< |
addcolor(p->v, p->kid[i].v); |
441 |
< |
scalecolor(p->v, 0.25); |
407 |
> |
growth += refine(p->kid+UR, pd-1); |
408 |
|
} |
409 |
|
return(growth); |
410 |
|
} |