11 |
|
#include "rholo.h" |
12 |
|
#include "rhdisp.h" |
13 |
|
#include "rhdriver.h" |
14 |
+ |
#include "random.h" |
15 |
|
|
16 |
|
#ifndef MAXDIST |
17 |
|
#define MAXDIST 42 /* maximum distance outside section */ |
18 |
|
#endif |
19 |
+ |
#ifndef NVSAMPS |
20 |
+ |
#define NVSAMPS 4096 /* number of ray samples per view */ |
21 |
+ |
#endif |
22 |
|
|
23 |
< |
extern GCOORD *getviewcells(); |
23 |
> |
#define MAXTODO 3 /* maximum sections to look at */ |
24 |
> |
#define MAXDRAT 3.0 /* maximum distance ratio */ |
25 |
|
|
21 |
– |
static VIEW dvw; /* current view corresponding to beam list */ |
22 |
– |
|
23 |
– |
typedef struct { |
24 |
– |
int hd; /* holodeck section number (-1 if inactive) */ |
25 |
– |
int i[3]; /* voxel index (may be outside section) */ |
26 |
– |
} VOXL; /* a voxel */ |
27 |
– |
|
28 |
– |
static VOXL voxel[8] = { /* current voxel list */ |
29 |
– |
{-1}, {-1}, {-1}, {-1}, |
30 |
– |
{-1}, {-1}, {-1}, {-1} |
31 |
– |
}; |
32 |
– |
|
26 |
|
#define CBEAMBLK 1024 /* cbeam allocation block size */ |
27 |
|
|
28 |
|
static struct beamcomp { |
29 |
< |
short wants; /* flags telling which voxels want us */ |
37 |
< |
short hd; /* holodeck section number */ |
29 |
> |
int hd; /* holodeck section number */ |
30 |
|
int bi; /* beam index */ |
31 |
+ |
int4 nr; /* number of samples desired */ |
32 |
|
} *cbeam = NULL; /* current beam list */ |
33 |
|
|
34 |
|
static int ncbeams = 0; /* number of sorted beams in cbeam */ |
35 |
|
static int xcbeams = 0; /* extra (unregistered) beams past ncbeams */ |
36 |
|
static int maxcbeam = 0; /* size of cbeam array */ |
37 |
|
|
45 |
– |
struct cellact { |
46 |
– |
short vi; /* voxel index */ |
47 |
– |
short add; /* zero means delete */ |
48 |
– |
short rev; /* reverse ray direction? */ |
49 |
– |
}; /* action for cell */ |
38 |
|
|
51 |
– |
struct beamact { |
52 |
– |
struct cellact ca; /* cell action */ |
53 |
– |
GCOORD gc; /* grid coordinate */ |
54 |
– |
}; /* beam origin and action */ |
55 |
– |
|
56 |
– |
|
39 |
|
int |
40 |
|
newcbeam() /* allocate new entry at end of cbeam array */ |
41 |
|
{ |
74 |
|
{ |
75 |
|
register int c; |
76 |
|
|
77 |
< |
if (!cb1->wants) /* put orphans at the end, unsorted */ |
78 |
< |
return(cb2->wants); |
79 |
< |
if (!cb2->wants) |
77 |
> |
if (!cb1->nr) /* put orphans at the end, unsorted */ |
78 |
> |
return(cb2->nr); |
79 |
> |
if (!cb2->nr) |
80 |
|
return(-1); |
81 |
|
if ((c = cb1->bi - cb2->bi)) /* sort on beam index first */ |
82 |
|
return(c); |
93 |
|
|
94 |
|
if (ncbeams <= 0) |
95 |
|
return(-1); |
96 |
< |
cb.wants = 0; cb.hd = hd; cb.bi = bi; |
96 |
> |
cb.hd = hd; cb.bi = bi; cb.nr = 0; |
97 |
|
p = (struct beamcomp *)bsearch((char *)&cb, (char *)cbeam, ncbeams, |
98 |
|
sizeof(struct beamcomp), cbeamcmp); |
99 |
|
if (p == NULL) |
121 |
|
if (bi < 1 | bi > nbeams(hdlist[hd])) |
122 |
|
error(INTERNAL, "illegal beam index in getcbeam"); |
123 |
|
n = newcbeam(); /* allocate and assign */ |
124 |
< |
cbeam[n].wants = 0; cbeam[n].hd = hd; cbeam[n].bi = bi; |
124 |
> |
cbeam[n].nr = 0; cbeam[n].hd = hd; cbeam[n].bi = bi; |
125 |
|
return(n); |
126 |
|
} |
127 |
|
|
139 |
|
if (adopt) |
140 |
|
return; |
141 |
|
for (i = ncbeams; i--; ) /* identify orphans */ |
142 |
< |
if (cbeam[i].wants) |
142 |
> |
if (cbeam[i].nr) |
143 |
|
break; |
144 |
|
xcbeams = ncbeams - ++i; /* put orphans after ncbeams */ |
145 |
|
ncbeams = i; |
146 |
|
} |
147 |
|
|
148 |
|
|
149 |
< |
cbeamop(op, bl, n, v, hr, vr) /* update beams on server list */ |
149 |
> |
cbeamop(op, bl, n) /* update beams on server list */ |
150 |
|
int op; |
151 |
|
register struct beamcomp *bl; |
152 |
|
int n; |
171 |
– |
VIEW *v; |
172 |
– |
int hr, vr; |
153 |
|
{ |
154 |
|
register PACKHEAD *pa; |
155 |
|
register int i; |
158 |
|
return; |
159 |
|
pa = (PACKHEAD *)malloc(n*sizeof(PACKHEAD)); |
160 |
|
if (pa == NULL) |
161 |
< |
error(SYSTEM, "out of memory in cbeamadd"); |
161 |
> |
error(SYSTEM, "out of memory in cbeamop"); |
162 |
|
for (i = 0; i < n; i++) { |
163 |
|
pa[i].hd = bl[i].hd; |
164 |
|
pa[i].bi = bl[i].bi; |
165 |
< |
pa[i].nr = v==NULL ? 0 : |
186 |
< |
npixels(v, hr, vr, hdlist[bl[i].hd], bl[i].bi); |
165 |
> |
pa[i].nr = bl[i].nr; |
166 |
|
pa[i].nc = 0; |
167 |
|
} |
168 |
|
serv_request(op, n*sizeof(PACKHEAD), (char *)pa); |
171 |
|
|
172 |
|
|
173 |
|
int |
174 |
< |
set_voxels(vl, n) /* set new voxel array */ |
175 |
< |
VOXL vl[8]; |
176 |
< |
int n; |
174 |
> |
comptodo(tdl, vw) /* compute holodeck sections in view */ |
175 |
> |
int tdl[MAXTODO+1]; |
176 |
> |
VIEW *vw; |
177 |
|
{ |
199 |
– |
short wmap[256]; |
200 |
– |
int vmap[8]; |
201 |
– |
int comn = 0; |
202 |
– |
int no; |
203 |
– |
register int i, j; |
204 |
– |
/* find common voxels */ |
205 |
– |
for (j = 0; j < 8 && voxel[j].hd >= 0; j++) { |
206 |
– |
vmap[j] = -1; |
207 |
– |
for (i = n; i--; ) |
208 |
– |
if (!bcmp((char *)(vl+i), (char *)(voxel+j), |
209 |
– |
sizeof(VOXL))) { |
210 |
– |
vmap[j] = i; |
211 |
– |
comn |= 1<<i; |
212 |
– |
break; |
213 |
– |
} |
214 |
– |
} |
215 |
– |
no = comn ? j : 0; /* compute flag mapping */ |
216 |
– |
for (i = 256; i--; ) { |
217 |
– |
wmap[i] = 0; |
218 |
– |
for (j = no; j--; ) |
219 |
– |
if (vmap[j] >= 0 && i & 1<<j) |
220 |
– |
wmap[i] |= 1<<vmap[j]; |
221 |
– |
} |
222 |
– |
/* fix cbeam flags */ |
223 |
– |
for (i = ncbeams; i--; ) |
224 |
– |
cbeam[i].wants = wmap[cbeam[i].wants]; |
225 |
– |
/* update our voxel list */ |
226 |
– |
bcopy((char *)vl, (char *)voxel, n*sizeof(VOXL)); |
227 |
– |
for (j = n; j < 8; j++) |
228 |
– |
voxel[j].hd = -1; |
229 |
– |
return(comn); /* return bit array of common voxels */ |
230 |
– |
} |
231 |
– |
|
232 |
– |
|
233 |
– |
int |
234 |
– |
get_voxels(vl, vp) /* find voxels corresponding to view point */ |
235 |
– |
VOXL vl[8]; |
236 |
– |
FVECT vp; |
237 |
– |
{ |
178 |
|
int n = 0; |
179 |
< |
FVECT gp; |
180 |
< |
double d; |
181 |
< |
int dist, bestd = 0x7fff; |
182 |
< |
VOXL vox; |
183 |
< |
register int i, j, k; |
184 |
< |
/* find closest voxels */ |
185 |
< |
for (i = 0; n < 8 && hdlist[i]; i++) { |
186 |
< |
hdgrid(gp, hdlist[i], vp); |
187 |
< |
for (j = 0; n < 8 && j < 8; j++) { |
188 |
< |
dist = 0; |
189 |
< |
for (k = 0; k < 3; k++) { |
190 |
< |
d = gp[k] - .5 + (j>>k & 1); |
191 |
< |
if (d < 0.) |
192 |
< |
dist += -(vox.i[k] = (int)d - 1); |
193 |
< |
else if ((vox.i[k] = d) >= hdlist[i]->grid[k]) |
194 |
< |
dist += vox.i[k] - |
195 |
< |
hdlist[i]->grid[k] + 1; |
256 |
< |
} |
257 |
< |
if (dist > bestd) /* others were closer */ |
258 |
< |
continue; |
259 |
< |
if (dist < bestd) { /* start closer list */ |
260 |
< |
n = 0; |
261 |
< |
bestd = dist; |
262 |
< |
} |
263 |
< |
vox.hd = i; /* add this voxel */ |
264 |
< |
copystruct(&vl[n], &vox); |
265 |
< |
n++; |
179 |
> |
FVECT gp, dv; |
180 |
> |
double dist2[MAXTODO+1], thisdist2; |
181 |
> |
register int i, j; |
182 |
> |
/* find closest MAXTODO sections */ |
183 |
> |
for (i = 0; hdlist[i]; i++) { |
184 |
> |
hdgrid(gp, hdlist[i], vw->vp); |
185 |
> |
for (j = 0; j < 3; j++) |
186 |
> |
if (gp[j] < 0.) |
187 |
> |
dv[j] = -gp[j]; |
188 |
> |
else if (gp[j] > hdlist[i]->grid[j]) |
189 |
> |
dv[j] = gp[j] - hdlist[i]->grid[j]; |
190 |
> |
else |
191 |
> |
dv[j] = 0.; |
192 |
> |
thisdist2 = DOT(dv,dv); |
193 |
> |
for (j = n; j > 0 && thisdist2 < dist2[j-1]; j--) { |
194 |
> |
tdl[j] = tdl[j-1]; |
195 |
> |
dist2[j] = dist2[j-1]; |
196 |
|
} |
197 |
+ |
tdl[j] = i; |
198 |
+ |
dist2[j] = thisdist2; |
199 |
+ |
if (n < MAXTODO) |
200 |
+ |
n++; |
201 |
|
} |
202 |
< |
/* check for really stupid move */ |
203 |
< |
if (bestd > MAXDIST) { |
202 |
> |
/* watch for bad move */ |
203 |
> |
if (n && dist2[0] > MAXDIST*MAXDIST) { |
204 |
|
error(COMMAND, "move past outer limits"); |
205 |
|
return(0); |
206 |
|
} |
207 |
+ |
/* avoid big differences */ |
208 |
+ |
for (j = 1; j < n; j++) |
209 |
+ |
if (dist2[j] > MAXDRAT*MAXDRAT*dist2[j-1]) |
210 |
+ |
n = j; |
211 |
+ |
tdl[n] = -1; |
212 |
|
return(n); |
213 |
|
} |
214 |
|
|
215 |
|
|
216 |
< |
int |
217 |
< |
dobeam(gcp, bp) /* express interest or disintrest in a beam */ |
218 |
< |
GCOORD *gcp; |
219 |
< |
register struct beamact *bp; |
216 |
> |
addview(hd, vw, hres, vres) /* add view for section */ |
217 |
> |
int hd; |
218 |
> |
VIEW *vw; |
219 |
> |
int hres, vres; |
220 |
|
{ |
221 |
+ |
int sampquant; |
222 |
+ |
int h, v, shr, svr; |
223 |
|
GCOORD gc[2]; |
224 |
< |
int bi, i; |
225 |
< |
/* compute beam index */ |
226 |
< |
if (bp->ca.rev) { |
227 |
< |
copystruct(gc, &bp->gc); |
228 |
< |
copystruct(gc+1, gcp); |
224 |
> |
FVECT rorg, rdir; |
225 |
> |
/* compute sampling grid */ |
226 |
> |
if (hres|vres && hres*vres <= NVSAMPS) { |
227 |
> |
shr = hres; svr = vres; |
228 |
> |
sampquant = 1; |
229 |
|
} else { |
230 |
< |
copystruct(gc, gcp); |
231 |
< |
copystruct(gc+1, &bp->gc); |
230 |
> |
shr = sqrt(NVSAMPS/viewaspect(vw)) + .5; |
231 |
> |
svr = (NVSAMPS + shr/2)/shr; |
232 |
> |
sampquant = (hres*vres + shr*svr/2)/(shr*svr); |
233 |
|
} |
234 |
< |
if ((bi = hdbindex(hdlist[voxel[bp->ca.vi].hd], gc)) <= 0) |
235 |
< |
error(CONSISTENCY, "bad grid coordinate in dobeam"); |
236 |
< |
if (bp->ca.add) { /* add it in */ |
237 |
< |
i = getcbeam(voxel[bp->ca.vi].hd, bi); |
238 |
< |
cbeam[i].wants |= 1<<bp->ca.vi; /* say we want it */ |
239 |
< |
return(i == ncbeams+xcbeams-1); /* return 1 if totally new */ |
240 |
< |
} |
241 |
< |
/* else delete it */ |
242 |
< |
i = findcbeam(voxel[bp->ca.vi].hd, bi); |
243 |
< |
if (i >= 0 && cbeam[i].wants & 1<<bp->ca.vi) { |
244 |
< |
cbeam[i].wants &= ~(1<<bp->ca.vi); /* we don't want it */ |
245 |
< |
return(1); /* indicate change */ |
304 |
< |
} |
305 |
< |
return(0); |
234 |
> |
/* intersect sample rays with section */ |
235 |
> |
for (v = svr; v--; ) |
236 |
> |
for (h = shr; h--; ) { |
237 |
> |
if (viewray(rorg, rdir, vw, (v+frandom())/svr, |
238 |
> |
(h+frandom())/shr) < -FTINY) |
239 |
> |
continue; |
240 |
> |
if (hdinter(gc, NULL, NULL, hdlist[hd], rorg, rdir) |
241 |
> |
>= FHUGE) |
242 |
> |
continue; |
243 |
> |
cbeam[getcbeam(hd,hdbindex(hdlist[hd],gc))].nr += |
244 |
> |
sampquant; |
245 |
> |
} |
246 |
|
} |
247 |
|
|
248 |
|
|
249 |
< |
|
250 |
< |
int |
311 |
< |
docell(gcp, cap) /* find beams corresponding to cell and voxel */ |
312 |
< |
GCOORD *gcp; |
313 |
< |
register struct cellact *cap; |
249 |
> |
beam_init(fresh) /* clear beam list for new view(s) */ |
250 |
> |
int fresh; |
251 |
|
{ |
315 |
– |
register HOLO *hp = hdlist[voxel[cap->vi].hd]; |
316 |
– |
FVECT org, dir[4]; |
317 |
– |
FVECT vgp, cgp, vc; |
318 |
– |
FVECT v1, v2; |
319 |
– |
struct beamact bo; |
320 |
– |
int axmax, j; |
321 |
– |
double d, avmax; |
252 |
|
register int i; |
323 |
– |
/* compute cell center */ |
324 |
– |
cgp[gcp->w>>1] = gcp->w&1 ? hp->grid[gcp->w>>1] : 0 ; |
325 |
– |
cgp[hdwg0[gcp->w]] = gcp->i[0] + .5; |
326 |
– |
cgp[hdwg1[gcp->w]] = gcp->i[1] + .5; |
327 |
– |
hdworld(org, hp, cgp); |
328 |
– |
/* compute direction to voxel center */ |
329 |
– |
for (i = 3; i--; ) |
330 |
– |
vgp[i] = voxel[cap->vi].i[i] + .5; |
331 |
– |
hdworld(vc, hp, vgp); |
332 |
– |
for (i = 3; i--; ) |
333 |
– |
vc[i] -= org[i]; |
334 |
– |
/* compute maximum area axis */ |
335 |
– |
axmax = -1; avmax = 0; |
336 |
– |
for (i = 3; i--; ) { |
337 |
– |
d = vgp[i] - cgp[i]; |
338 |
– |
if (d < 0.) d = -d; |
339 |
– |
if (d > avmax) { |
340 |
– |
avmax = d; |
341 |
– |
axmax = i; |
342 |
– |
} |
343 |
– |
} |
344 |
– |
#ifdef DEBUG |
345 |
– |
if (axmax < 0.) |
346 |
– |
error(CONSISTENCY, "botched axis computation in docell"); |
347 |
– |
#endif |
348 |
– |
/* compute offset vectors */ |
349 |
– |
d = 0.5/hp->grid[j=(axmax+1)%3]; |
350 |
– |
for (i = 3; i--; ) |
351 |
– |
v1[i] = hp->xv[j][i] * d; |
352 |
– |
d = 0.5/hp->grid[j=(axmax+2)%3]; |
353 |
– |
if (DOT(hp->wg[axmax], vc) < 0.) |
354 |
– |
d = -d; /* reverse vertex order */ |
355 |
– |
for (i = 3; i--; ) |
356 |
– |
v2[i] = hp->xv[j][i] * d; |
357 |
– |
/* compute voxel pyramid */ |
358 |
– |
for (i = 3; i--; ) { |
359 |
– |
dir[0][i] = vc[i] - v1[i] - v2[i]; |
360 |
– |
dir[1][i] = vc[i] + v1[i] - v2[i]; |
361 |
– |
dir[2][i] = vc[i] + v1[i] + v2[i]; |
362 |
– |
dir[3][i] = vc[i] - v1[i] + v2[i]; |
363 |
– |
} |
364 |
– |
/* visit beams for opposite cells */ |
365 |
– |
copystruct(&bo.ca, cap); |
366 |
– |
copystruct(&bo.gc, gcp); |
367 |
– |
return(visit_cells(org, dir, hp, dobeam, &bo)); |
368 |
– |
} |
253 |
|
|
254 |
< |
|
255 |
< |
int |
256 |
< |
doview(cap, vp) /* visit cells for a given view */ |
257 |
< |
struct cellact *cap; |
258 |
< |
VIEW *vp; |
375 |
< |
{ |
376 |
< |
int orient; |
377 |
< |
FVECT org, dir[4]; |
378 |
< |
/* compute view pyramid */ |
379 |
< |
orient = viewpyramid(org, dir, hdlist[voxel[cap->vi].hd], vp); |
380 |
< |
if (!orient) |
381 |
< |
error(INTERNAL, "unusable view in doview"); |
382 |
< |
cap->rev = orient < 0; |
383 |
< |
/* visit cells within pyramid */ |
384 |
< |
return(visit_cells(org, dir, hdlist[voxel[cap->vi].hd], docell, cap)); |
254 |
> |
if (fresh) /* discard old beams? */ |
255 |
> |
ncbeams = xcbeams = 0; |
256 |
> |
else /* else clear sample requests */ |
257 |
> |
for (i = ncbeams+xcbeams; i--; ) |
258 |
> |
cbeam[i].nr = 0; |
259 |
|
} |
260 |
|
|
261 |
|
|
262 |
< |
mvview(voxi, vold, vnew) /* move view for a voxel */ |
263 |
< |
int voxi; |
264 |
< |
VIEW *vold, *vnew; |
262 |
> |
beam_view(vn, hr, vr) /* add beam view (if advisable) */ |
263 |
> |
VIEW *vn; |
264 |
> |
int hr, vr; |
265 |
|
{ |
266 |
< |
int netchange = 0; |
267 |
< |
struct cellact oca, nca; |
268 |
< |
int ocnt, ncnt; |
269 |
< |
int nmatch = 0; |
270 |
< |
GCOORD *ogcl, *ngcl; |
271 |
< |
register int c; |
272 |
< |
register GCOORD *ogcp, *ngcp; |
273 |
< |
/* get old and new cell lists */ |
274 |
< |
ogcp = ogcl = getviewcells(&ocnt, hdlist[voxel[voxi].hd], vold); |
275 |
< |
ngcp = ngcl = getviewcells(&ncnt, hdlist[voxel[voxi].hd], vnew); |
402 |
< |
/* set up actions */ |
403 |
< |
oca.vi = nca.vi = voxi; |
404 |
< |
oca.add = 0; nca.add = 1; |
405 |
< |
if ((oca.rev = ocnt < 0)) |
406 |
< |
ocnt = -ocnt; |
407 |
< |
if ((nca.rev = ncnt < 0)) |
408 |
< |
ncnt = -ncnt; |
409 |
< |
if (oca.rev == nca.rev) { /* count matches */ |
410 |
< |
int oc = ocnt, nc = ncnt; |
411 |
< |
while (oc > 0 & nc > 0) { |
412 |
< |
c = cellcmp(ogcp, ngcp); |
413 |
< |
if (c >= 0) { ngcp++; nc--; } |
414 |
< |
if (c <= 0) { ogcp++; oc--; } |
415 |
< |
nmatch += c==0; |
416 |
< |
} |
417 |
< |
ogcp = ogcl; ngcp = ngcl; |
418 |
< |
} |
419 |
< |
if (nmatch < ocnt>>1) { /* faster to just delete old cells? */ |
420 |
< |
for (c = ncbeams; c--; ) |
421 |
< |
if (cbeam[c].wants & 1<<voxi) { |
422 |
< |
cbeam[c].wants &= ~(1<<voxi); |
423 |
< |
netchange--; |
424 |
< |
} |
425 |
< |
free((char *)ogcl); |
426 |
< |
ogcl = NULL; ocnt = 0; |
427 |
< |
} |
428 |
< |
/* add and delete cells in order */ |
429 |
< |
while (ocnt > 0 & ncnt > 0) |
430 |
< |
if ((c = cellcmp(ogcp, ngcp)) > 0) { /* new cell */ |
431 |
< |
netchange += docell(ngcp++, &nca); |
432 |
< |
ncnt--; |
433 |
< |
} else if (c < 0) { /* old cell */ |
434 |
< |
netchange -= docell(ogcp++, &oca); |
435 |
< |
ocnt--; |
436 |
< |
} else { /* same cell */ |
437 |
< |
ogcp++; ocnt--; |
438 |
< |
ngcp++; ncnt--; |
439 |
< |
} |
440 |
< |
/* take care of list tails */ |
441 |
< |
for ( ; ncnt > 0; ncnt--) |
442 |
< |
netchange += docell(ngcp++, &nca); |
443 |
< |
for ( ; ocnt > 0; ocnt--) |
444 |
< |
netchange -= docell(ogcp++, &oca); |
445 |
< |
/* clean up */ |
446 |
< |
if (ogcl != NULL) free((char *)ogcl); |
447 |
< |
if (ngcl != NULL) free((char *)ngcl); |
448 |
< |
return(netchange); |
266 |
> |
int todo[MAXTODO+1]; |
267 |
> |
int n; |
268 |
> |
/* sort our list */ |
269 |
> |
cbeamsort(1); |
270 |
> |
/* add view to nearby sections */ |
271 |
> |
if (!(n = comptodo(todo, vn))) |
272 |
> |
return(0); |
273 |
> |
while (n--) |
274 |
> |
addview(todo[n], vn, hr, vr); |
275 |
> |
return(1); |
276 |
|
} |
277 |
|
|
278 |
|
|
279 |
|
int |
280 |
< |
beam_sync() /* synchronize beams on server */ |
280 |
> |
beam_sync(all) /* update beam list on server */ |
281 |
> |
int all; |
282 |
|
{ |
283 |
< |
cbeamop(DR_NEWSET, cbeam, ncbeams, &odev.v, odev.hres, odev.vres); |
284 |
< |
return(ncbeams); |
285 |
< |
} |
286 |
< |
|
287 |
< |
|
288 |
< |
beam_view(vn) /* change beam view (if advisable) */ |
461 |
< |
VIEW *vn; |
462 |
< |
{ |
463 |
< |
struct cellact ca; |
464 |
< |
VOXL vlnew[8]; |
465 |
< |
int n, comn; |
466 |
< |
|
467 |
< |
if (vn == NULL || !vn->type) { /* clear our beam list */ |
468 |
< |
set_voxels(vlnew, 0); |
469 |
< |
cbeamop(DR_DELSET, cbeam, ncbeams, NULL, 0, 0); |
470 |
< |
ncbeams = 0; |
471 |
< |
dvw.type = 0; |
472 |
< |
return(1); |
473 |
< |
} |
474 |
< |
/* find our new voxels */ |
475 |
< |
n = get_voxels(vlnew, vn->vp); |
476 |
< |
if (dvw.type && !n) { |
477 |
< |
copystruct(vn, &dvw); /* cancel move */ |
478 |
< |
return(0); |
479 |
< |
} |
480 |
< |
/* set the new voxels */ |
481 |
< |
comn = set_voxels(vlnew, n); |
482 |
< |
if (!dvw.type) |
483 |
< |
comn = 0; |
484 |
< |
ca.add = 1; /* update our beam list */ |
485 |
< |
for (ca.vi = n; ca.vi--; ) |
486 |
< |
if (comn & 1<<ca.vi) /* change which cells we see */ |
487 |
< |
mvview(ca.vi, &dvw, vn); |
488 |
< |
else /* else add all new cells */ |
489 |
< |
doview(&ca, vn); |
490 |
< |
/* inform server of new beams */ |
491 |
< |
cbeamop(DR_ADDSET, cbeam+ncbeams, xcbeams, vn, odev.hres, odev.vres); |
492 |
< |
/* sort list to put orphans at end */ |
493 |
< |
cbeamsort(0); |
494 |
< |
/* tell server to delete orphans */ |
495 |
< |
cbeamop(DR_DELSET, cbeam+ncbeams, xcbeams, NULL, 0, 0); |
283 |
> |
/* sort list (put orphans at end) */ |
284 |
> |
cbeamsort(all < 0); |
285 |
> |
if (all) |
286 |
> |
cbeamop(DR_NEWSET, cbeam, ncbeams); |
287 |
> |
else |
288 |
> |
cbeamop(DR_ADJSET, cbeam, ncbeams+xcbeams); |
289 |
|
xcbeams = 0; /* truncate our list */ |
290 |
< |
copystruct(&dvw, vn); /* record new view */ |
498 |
< |
return(1); |
290 |
> |
return(ncbeams); |
291 |
|
} |