29 |
|
#define sscanvec(s,v) (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3) |
30 |
|
#endif |
31 |
|
|
32 |
< |
static unsigned long niflush; /* flushes since newimage() */ |
32 |
> |
static RNUMBER niflush; /* flushes since newimage() */ |
33 |
|
|
34 |
|
int |
35 |
|
getrect( /* get a box */ |
197 |
|
} else { /* queuing mode */ |
198 |
|
int rval; |
199 |
|
rayorigin(&thisray, PRIMARY, NULL, NULL); |
200 |
< |
thisray.rno = (unsigned long)p; |
200 |
> |
thisray.rno = (RNUMBER)p; |
201 |
|
rval = ray_pqueue(&thisray); |
202 |
|
if (!rval) |
203 |
|
return(0); |
204 |
|
if (rval < 0) |
205 |
|
return(-1); |
206 |
+ |
/* get node for returned ray */ |
207 |
|
p = (PNODE *)thisray.rno; |
208 |
|
} |
209 |
|
|
213 |
|
recolor(p); /* paint it */ |
214 |
|
|
215 |
|
if (dev->flush != NULL) { /* shall we check for input? */ |
216 |
< |
static unsigned long lastflush = 0; |
217 |
< |
unsigned long counter = raynum; |
218 |
< |
int flushintvl; |
216 |
> |
static RNUMBER lastflush = 0; |
217 |
> |
RNUMBER counter = raynum; |
218 |
> |
int flushintvl; |
219 |
|
if (nproc == 1) { |
220 |
|
counter = nrays; |
221 |
|
flushintvl = WFLUSH1; |
225 |
|
flushintvl = nproc*niflush/(ambounce+1); |
226 |
|
else |
227 |
|
flushintvl = nproc*WFLUSH/(ambounce+1); |
228 |
+ |
if (lastflush > counter) |
229 |
+ |
lastflush = 0; /* counter wrapped */ |
230 |
|
|
231 |
|
if (counter - lastflush >= flushintvl) { |
232 |
|
lastflush = counter; |
245 |
|
int rval; |
246 |
|
RAY raydone; |
247 |
|
|
248 |
< |
if (nproc == 1) /* immediate mode? */ |
248 |
> |
if (nproc <= 1) /* immediate mode? */ |
249 |
|
return(0); |
250 |
|
while ((rval = ray_presult(&raydone, 0)) > 0) { |
251 |
|
PNODE *p = (PNODE *)raydone.rno; |
268 |
|
extern int ray_pnprocs; |
269 |
|
int newnp; |
270 |
|
/* change in nproc? */ |
271 |
< |
if (s != NULL && sscanf(s, "%d", &newnp) == 1 && newnp > 0) { |
271 |
> |
if (s != NULL && sscanf(s, "%d", &newnp) == 1 && |
272 |
> |
(newnp > 0) & (newnp != nproc)) { |
273 |
|
if (!newparam) { |
270 |
– |
if (nproc == 1) |
271 |
– |
nproc = 0; /* actually running */ |
274 |
|
if (newnp == 1) |
275 |
|
ray_pclose(0); |
276 |
< |
else if (newnp < nproc) |
277 |
< |
ray_pclose(nproc - newnp); |
276 |
> |
else if (newnp < ray_pnprocs) |
277 |
> |
ray_pclose(ray_pnprocs - newnp); |
278 |
|
else |
279 |
< |
ray_popen(newnp - nproc); |
279 |
> |
ray_popen(newnp - ray_pnprocs); |
280 |
|
} |
281 |
|
nproc = newnp; |
282 |
|
} |