| 1 |
< |
/* Copyright (c) 1997 Silicon Graphics, Inc. */ |
| 1 |
> |
/* Copyright (c) 1998 Silicon Graphics, Inc. */ |
| 2 |
|
|
| 3 |
|
#ifndef lint |
| 4 |
|
static char SCCSid[] = "$SunId$ SGI"; |
| 16 |
|
#define MAXDIST 42 /* maximum distance outside section */ |
| 17 |
|
#endif |
| 18 |
|
|
| 19 |
< |
extern GCOORD *getviewcells(); |
| 19 |
> |
#define MAXVOXEL 16 /* maximum number of active voxels */ |
| 20 |
|
|
| 21 |
– |
static VIEW dvw; /* current view corresponding to beam list */ |
| 22 |
– |
|
| 21 |
|
typedef struct { |
| 22 |
|
int hd; /* holodeck section number (-1 if inactive) */ |
| 23 |
|
int i[3]; /* voxel index (may be outside section) */ |
| 24 |
|
} VOXL; /* a voxel */ |
| 25 |
|
|
| 26 |
< |
static VOXL voxel[8] = { /* current voxel list */ |
| 29 |
< |
{-1}, {-1}, {-1}, {-1}, |
| 30 |
< |
{-1}, {-1}, {-1}, {-1} |
| 31 |
< |
}; |
| 26 |
> |
static VOXL voxel[MAXVOXEL] = {{-1}}; /* current voxel list */ |
| 27 |
|
|
| 28 |
|
#define CBEAMBLK 1024 /* cbeam allocation block size */ |
| 29 |
|
|
| 30 |
|
static struct beamcomp { |
| 31 |
< |
short wants; /* flags telling which voxels want us */ |
| 32 |
< |
short hd; /* holodeck section number */ |
| 33 |
< |
int bi; /* beam index */ |
| 31 |
> |
unsigned int2 wants; /* flags telling which voxels want us */ |
| 32 |
> |
unsigned int2 hd; /* holodeck section number */ |
| 33 |
> |
int4 bi; /* beam index */ |
| 34 |
> |
int4 nr; /* number of samples desired */ |
| 35 |
|
} *cbeam = NULL; /* current beam list */ |
| 36 |
|
|
| 37 |
|
static int ncbeams = 0; /* number of sorted beams in cbeam */ |
| 42 |
|
short vi; /* voxel index */ |
| 43 |
|
short add; /* zero means delete */ |
| 44 |
|
short rev; /* reverse ray direction? */ |
| 45 |
+ |
VIEW *vp; /* view for image */ |
| 46 |
+ |
short hr, vr; /* image resolution */ |
| 47 |
|
}; /* action for cell */ |
| 48 |
|
|
| 49 |
|
struct beamact { |
| 109 |
|
|
| 110 |
|
if (ncbeams <= 0) |
| 111 |
|
return(-1); |
| 112 |
< |
cb.wants = 0; cb.hd = hd; cb.bi = bi; |
| 112 |
> |
cb.wants = 0; cb.hd = hd; cb.bi = bi; cb.nr = 0; |
| 113 |
|
p = (struct beamcomp *)bsearch((char *)&cb, (char *)cbeam, ncbeams, |
| 114 |
|
sizeof(struct beamcomp), cbeamcmp); |
| 115 |
|
if (p == NULL) |
| 137 |
|
if (bi < 1 | bi > nbeams(hdlist[hd])) |
| 138 |
|
error(INTERNAL, "illegal beam index in getcbeam"); |
| 139 |
|
n = newcbeam(); /* allocate and assign */ |
| 140 |
< |
cbeam[n].wants = 0; cbeam[n].hd = hd; cbeam[n].bi = bi; |
| 140 |
> |
cbeam[n].wants = cbeam[n].nr = 0; cbeam[n].hd = hd; cbeam[n].bi = bi; |
| 141 |
|
return(n); |
| 142 |
|
} |
| 143 |
|
|
| 162 |
|
} |
| 163 |
|
|
| 164 |
|
|
| 165 |
< |
cbeamadj(v, hr, vr) /* adjust our beam list */ |
| 168 |
< |
VIEW *v; |
| 169 |
< |
int hr, vr; |
| 170 |
< |
{ |
| 171 |
< |
PACKHEAD *pa, *pa2; |
| 172 |
< |
register PACKHEAD *pp; |
| 173 |
< |
int n, n2; |
| 174 |
< |
FVECT gp; |
| 175 |
< |
int igp[3], vcflgs; |
| 176 |
< |
register int i; |
| 177 |
< |
/* figure out center voxel(s) */ |
| 178 |
< |
n = -1; vcflgs = 0; |
| 179 |
< |
for (i = 0; i < 8 && voxel[i].hd >= 0; i++) { |
| 180 |
< |
if (voxel[i].hd != n) { |
| 181 |
< |
hdgrid(gp, hdlist[n=voxel[i].hd], v->vp); |
| 182 |
< |
igp[0] = gp[0]; igp[1] = gp[1]; igp[2] = gp[2]; |
| 183 |
< |
} |
| 184 |
< |
if (voxel[i].i[0] == igp[0] && voxel[i].i[1] == igp[1] && |
| 185 |
< |
voxel[i].i[2] == igp[2]) |
| 186 |
< |
vcflgs |= 1<<i; |
| 187 |
< |
} |
| 188 |
< |
/* get additions */ |
| 189 |
< |
pa2 = (PACKHEAD *)malloc(xcbeams*sizeof(PACKHEAD)); |
| 190 |
< |
if (xcbeams && pa2 == NULL) |
| 191 |
< |
goto memerr; |
| 192 |
< |
pa = pa2 + xcbeams; n2 = 0; |
| 193 |
< |
for (i = xcbeams; i--; ) { |
| 194 |
< |
if (cbeam[ncbeams+i].wants & vcflgs) |
| 195 |
< |
pp = --pa; /* priority list */ |
| 196 |
< |
else |
| 197 |
< |
pp = pa2 + n2++; /* secondary list */ |
| 198 |
< |
pp->hd = cbeam[ncbeams+i].hd; |
| 199 |
< |
pp->bi = cbeam[ncbeams+i].bi; |
| 200 |
< |
pp->nr = npixels(v, hr, vr, hdlist[pp->hd], pp->bi) + 1; |
| 201 |
< |
pp->nc = 0; |
| 202 |
< |
} |
| 203 |
< |
n = xcbeams - n2; |
| 204 |
< |
/* now sort list for deletions */ |
| 205 |
< |
cbeamsort(0); |
| 206 |
< |
pa2 = (PACKHEAD *)realloc((char *)pa2, (n+n2+xcbeams)*sizeof(PACKHEAD)); |
| 207 |
< |
if (n+n2+xcbeams && pa2 == NULL) |
| 208 |
< |
goto memerr; |
| 209 |
< |
pa = pa2 + n2; |
| 210 |
< |
for (i = xcbeams; i--; ) { |
| 211 |
< |
pp = pa + n++; |
| 212 |
< |
pp->hd = cbeam[ncbeams+i].hd; |
| 213 |
< |
pp->bi = cbeam[ncbeams+i].bi; |
| 214 |
< |
pp->nr = 0; |
| 215 |
< |
pp->nc = 0; |
| 216 |
< |
} |
| 217 |
< |
if (n) /* adjust the set */ |
| 218 |
< |
serv_request(DR_ADJSET, n*sizeof(PACKHEAD), (char *)pa); |
| 219 |
< |
if (n2) /* make secondary additions */ |
| 220 |
< |
serv_request(DR_ADDSET, n2*sizeof(PACKHEAD), (char *)pa2); |
| 221 |
< |
xcbeams = 0; /* clean up */ |
| 222 |
< |
free((char *)pa2); |
| 223 |
< |
return; |
| 224 |
< |
memerr: |
| 225 |
< |
error(SYSTEM, "out of memory in cbeamadj"); |
| 226 |
< |
} |
| 227 |
< |
|
| 228 |
< |
|
| 229 |
< |
cbeamop(op, bl, n, v, hr, vr) /* update beams on server list */ |
| 165 |
> |
cbeamop(op, bl, n) /* update beams on server list */ |
| 166 |
|
int op; |
| 167 |
|
register struct beamcomp *bl; |
| 168 |
|
int n; |
| 233 |
– |
VIEW *v; |
| 234 |
– |
int hr, vr; |
| 169 |
|
{ |
| 170 |
|
register PACKHEAD *pa; |
| 171 |
|
register int i; |
| 174 |
|
return; |
| 175 |
|
pa = (PACKHEAD *)malloc(n*sizeof(PACKHEAD)); |
| 176 |
|
if (pa == NULL) |
| 177 |
< |
error(SYSTEM, "out of memory in cbeamadd"); |
| 177 |
> |
error(SYSTEM, "out of memory in cbeamop"); |
| 178 |
|
for (i = 0; i < n; i++) { |
| 179 |
|
pa[i].hd = bl[i].hd; |
| 180 |
|
pa[i].bi = bl[i].bi; |
| 181 |
< |
pa[i].nr = v==NULL ? 0 : |
| 248 |
< |
npixels(v, hr, vr, hdlist[bl[i].hd], bl[i].bi); |
| 181 |
> |
pa[i].nr = bl[i].nr; |
| 182 |
|
pa[i].nc = 0; |
| 183 |
|
} |
| 184 |
|
serv_request(op, n*sizeof(PACKHEAD), (char *)pa); |
| 186 |
|
} |
| 187 |
|
|
| 188 |
|
|
| 189 |
< |
int |
| 257 |
< |
set_voxels(vl, n) /* set new voxel array */ |
| 258 |
< |
VOXL vl[8]; |
| 259 |
< |
int n; |
| 260 |
< |
{ |
| 261 |
< |
short wmap[256]; |
| 262 |
< |
int vmap[8]; |
| 263 |
< |
int comn = 0; |
| 264 |
< |
int no; |
| 265 |
< |
register int i, j; |
| 266 |
< |
/* find common voxels */ |
| 267 |
< |
for (j = 0; j < 8 && voxel[j].hd >= 0; j++) { |
| 268 |
< |
vmap[j] = -1; |
| 269 |
< |
for (i = n; i--; ) |
| 270 |
< |
if (!bcmp((char *)(vl+i), (char *)(voxel+j), |
| 271 |
< |
sizeof(VOXL))) { |
| 272 |
< |
vmap[j] = i; |
| 273 |
< |
comn |= 1<<i; |
| 274 |
< |
break; |
| 275 |
< |
} |
| 276 |
< |
} |
| 277 |
< |
no = comn ? j : 0; /* compute flag mapping */ |
| 278 |
< |
for (i = 256; i--; ) { |
| 279 |
< |
wmap[i] = 0; |
| 280 |
< |
for (j = no; j--; ) |
| 281 |
< |
if (vmap[j] >= 0 && i & 1<<j) |
| 282 |
< |
wmap[i] |= 1<<vmap[j]; |
| 283 |
< |
} |
| 284 |
< |
/* fix cbeam flags */ |
| 285 |
< |
for (i = ncbeams; i--; ) |
| 286 |
< |
cbeam[i].wants = wmap[cbeam[i].wants]; |
| 287 |
< |
/* update our voxel list */ |
| 288 |
< |
bcopy((char *)vl, (char *)voxel, n*sizeof(VOXL)); |
| 289 |
< |
for (j = n; j < 8; j++) |
| 290 |
< |
voxel[j].hd = -1; |
| 291 |
< |
return(comn); /* return bit array of common voxels */ |
| 292 |
< |
} |
| 293 |
< |
|
| 294 |
< |
|
| 295 |
< |
int |
| 296 |
< |
get_voxels(vl, vp) /* find voxels corresponding to view point */ |
| 297 |
< |
VOXL vl[8]; |
| 189 |
> |
add_voxels(vp) /* add voxels corresponding to view point */ |
| 190 |
|
FVECT vp; |
| 191 |
|
{ |
| 192 |
< |
static int lastn = 0, lastd = -1; |
| 301 |
< |
int n = 0; |
| 192 |
> |
int first, n, rfl = 0; |
| 193 |
|
FVECT gp; |
| 194 |
|
double d; |
| 195 |
|
int dist, bestd = 0x7fff; |
| 196 |
|
VOXL vox; |
| 197 |
|
register int i, j, k; |
| 198 |
+ |
/* count voxels in list already */ |
| 199 |
+ |
for (first = 0; first < MAXVOXEL && voxel[first].hd >= 0; first++) |
| 200 |
+ |
; |
| 201 |
|
/* find closest voxels */ |
| 202 |
< |
for (i = 0; n < 8 && hdlist[i]; i++) { |
| 202 |
> |
for (n = first, i = 0; n < MAXVOXEL && hdlist[i]; i++) { |
| 203 |
|
hdgrid(gp, hdlist[i], vp); |
| 204 |
< |
for (j = 0; n < 8 && j < 8; j++) { |
| 204 |
> |
for (j = 0; n < MAXVOXEL && j < 8; j++) { |
| 205 |
|
dist = 0; |
| 206 |
|
for (k = 0; k < 3; k++) { |
| 207 |
|
d = gp[k] - .5 + (j>>k & 1); |
| 214 |
|
if (dist > bestd) /* others were closer */ |
| 215 |
|
continue; |
| 216 |
|
if (dist < bestd) { /* start closer list */ |
| 217 |
< |
n = 0; |
| 217 |
> |
n = first; |
| 218 |
|
bestd = dist; |
| 219 |
+ |
rfl = 0; |
| 220 |
|
} |
| 221 |
+ |
/* check if already in list */ |
| 222 |
+ |
for (k = first; k--; ) |
| 223 |
+ |
if (voxel[k].hd == i && |
| 224 |
+ |
voxel[k].i[0] == vox.i[0] && |
| 225 |
+ |
voxel[k].i[1] == vox.i[1] && |
| 226 |
+ |
voxel[k].i[2] == vox.i[2]) |
| 227 |
+ |
break; |
| 228 |
+ |
if (k >= 0) { |
| 229 |
+ |
rfl |= 1<<k; |
| 230 |
+ |
continue; |
| 231 |
+ |
} |
| 232 |
|
vox.hd = i; /* add this voxel */ |
| 233 |
< |
copystruct(&vl[n], &vox); |
| 234 |
< |
n++; |
| 233 |
> |
copystruct(&voxel[n], &vox); |
| 234 |
> |
rfl |= 1<<n++; |
| 235 |
|
} |
| 236 |
|
} |
| 237 |
|
/* check for really stupid move */ |
| 239 |
|
error(COMMAND, "move past outer limits"); |
| 240 |
|
return(0); |
| 241 |
|
} |
| 242 |
< |
/* warn of dangerous moves */ |
| 243 |
< |
if (n < lastn && bestd >= lastd) |
| 244 |
< |
error(WARNING, "moving outside holodeck section"); |
| 339 |
< |
else if (n > lastn && bestd <= lastd) |
| 340 |
< |
error(WARNING, "moving inside holodeck section"); |
| 341 |
< |
lastd = bestd; |
| 342 |
< |
return(lastn = n); |
| 242 |
> |
if (n < MAXVOXEL) |
| 243 |
> |
voxel[n].hd = -1; |
| 244 |
> |
return(rfl); |
| 245 |
|
} |
| 246 |
|
|
| 247 |
|
|
| 251 |
|
register struct beamact *bp; |
| 252 |
|
{ |
| 253 |
|
GCOORD gc[2]; |
| 254 |
< |
int bi, i; |
| 254 |
> |
int bi, i, n; |
| 255 |
|
/* compute beam index */ |
| 256 |
|
if (bp->ca.rev) { |
| 257 |
|
copystruct(gc, &bp->gc); |
| 265 |
|
if (bp->ca.add) { /* add it in */ |
| 266 |
|
i = getcbeam(voxel[bp->ca.vi].hd, bi); |
| 267 |
|
cbeam[i].wants |= 1<<bp->ca.vi; /* say we want it */ |
| 268 |
+ |
n = npixels(bp->ca.vp, bp->ca.hr, bp->ca.vr, |
| 269 |
+ |
hdlist[cbeam[i].hd], cbeam[i].bi); |
| 270 |
+ |
if (n > cbeam[i].nr) |
| 271 |
+ |
cbeam[i].nr = n; |
| 272 |
|
return(i == ncbeams+xcbeams-1); /* return 1 if totally new */ |
| 273 |
|
} |
| 274 |
|
/* else delete it */ |
| 275 |
|
i = findcbeam(voxel[bp->ca.vi].hd, bi); |
| 276 |
|
if (i >= 0 && cbeam[i].wants & 1<<bp->ca.vi) { |
| 277 |
|
cbeam[i].wants &= ~(1<<bp->ca.vi); /* we don't want it */ |
| 278 |
+ |
if (!cbeam[i].wants) |
| 279 |
+ |
cbeam[i].nr = 0; |
| 280 |
|
return(1); /* indicate change */ |
| 281 |
|
} |
| 282 |
|
return(0); |
| 299 |
|
register int i; |
| 300 |
|
/* compute cell center */ |
| 301 |
|
cgp[gcp->w>>1] = gcp->w&1 ? hp->grid[gcp->w>>1] : 0 ; |
| 302 |
< |
cgp[((gcp->w>>1)+1)%3] = gcp->i[0] + .5; |
| 303 |
< |
cgp[((gcp->w>>1)+2)%3] = gcp->i[1] + .5; |
| 302 |
> |
cgp[hdwg0[gcp->w]] = gcp->i[0] + .5; |
| 303 |
> |
cgp[hdwg1[gcp->w]] = gcp->i[1] + .5; |
| 304 |
|
hdworld(org, hp, cgp); |
| 305 |
|
/* compute direction to voxel center */ |
| 306 |
|
for (i = 3; i--; ) |
| 327 |
|
for (i = 3; i--; ) |
| 328 |
|
v1[i] = hp->xv[j][i] * d; |
| 329 |
|
d = 0.5/hp->grid[j=(axmax+2)%3]; |
| 330 |
< |
if (DOT(hp->wn[axmax], vc) < 0.) |
| 331 |
< |
d = -d; /* reverse vertex ordering */ |
| 330 |
> |
if (DOT(hp->wg[axmax], vc) < 0.) |
| 331 |
> |
d = -d; /* reverse vertex order */ |
| 332 |
|
for (i = 3; i--; ) |
| 333 |
|
v2[i] = hp->xv[j][i] * d; |
| 334 |
|
/* compute voxel pyramid */ |
| 346 |
|
|
| 347 |
|
|
| 348 |
|
int |
| 349 |
< |
doview(cap, vp) /* visit cells for a given view */ |
| 349 |
> |
doview(cap) /* visit cells for a given view */ |
| 350 |
|
struct cellact *cap; |
| 443 |
– |
VIEW *vp; |
| 351 |
|
{ |
| 352 |
|
int orient; |
| 353 |
|
FVECT org, dir[4]; |
| 354 |
|
/* compute view pyramid */ |
| 355 |
< |
orient = viewpyramid(org, dir, hdlist[voxel[cap->vi].hd], vp); |
| 355 |
> |
orient = viewpyramid(org, dir, hdlist[voxel[cap->vi].hd], cap->vp); |
| 356 |
|
if (!orient) |
| 357 |
|
error(INTERNAL, "unusable view in doview"); |
| 358 |
|
cap->rev = orient < 0; |
| 361 |
|
} |
| 362 |
|
|
| 363 |
|
|
| 364 |
< |
mvview(voxi, vold, vnew) /* move view for a voxel */ |
| 458 |
< |
int voxi; |
| 459 |
< |
VIEW *vold, *vnew; |
| 364 |
> |
beam_init() /* clear beam list for new view(s) */ |
| 365 |
|
{ |
| 366 |
< |
int netchange = 0; |
| 367 |
< |
struct cellact oca, nca; |
| 368 |
< |
int ocnt, ncnt; |
| 369 |
< |
int c; |
| 370 |
< |
GCOORD *ogcl, *ngcl; |
| 466 |
< |
register GCOORD *ogcp, *ngcp; |
| 467 |
< |
/* get old and new cell lists */ |
| 468 |
< |
ogcp = ogcl = getviewcells(&ocnt, hdlist[voxel[voxi].hd], vold); |
| 469 |
< |
ngcp = ngcl = getviewcells(&ncnt, hdlist[voxel[voxi].hd], vnew); |
| 470 |
< |
/* set up actions */ |
| 471 |
< |
oca.vi = nca.vi = voxi; |
| 472 |
< |
oca.add = 0; nca.add = 1; |
| 473 |
< |
if ((oca.rev = ocnt < 0)) |
| 474 |
< |
ocnt = -ocnt; |
| 475 |
< |
if ((nca.rev = ncnt < 0)) |
| 476 |
< |
ncnt = -ncnt; |
| 477 |
< |
if (nca.rev == oca.rev) /* add and delete cells in order */ |
| 478 |
< |
while (ocnt > 0 & ncnt > 0) |
| 479 |
< |
if ((c = cellcmp(ogcp, ngcp)) > 0) { /* new cell */ |
| 480 |
< |
netchange += docell(ngcp++, &nca); |
| 481 |
< |
ncnt--; |
| 482 |
< |
} else if (c < 0) { /* old cell */ |
| 483 |
< |
netchange -= docell(ogcp++, &oca); |
| 484 |
< |
ocnt--; |
| 485 |
< |
} else { /* same cell */ |
| 486 |
< |
ogcp++; ocnt--; |
| 487 |
< |
ngcp++; ncnt--; |
| 488 |
< |
} |
| 489 |
< |
/* take care of list tails */ |
| 490 |
< |
for ( ; ncnt > 0; ncnt--) |
| 491 |
< |
netchange += docell(ngcp++, &nca); |
| 492 |
< |
for ( ; ocnt > 0; ocnt--) |
| 493 |
< |
netchange -= docell(ogcp++, &oca); |
| 494 |
< |
/* clean up */ |
| 495 |
< |
if (ogcl != NULL) free((char *)ogcl); |
| 496 |
< |
if (ngcl != NULL) free((char *)ngcl); |
| 497 |
< |
return(netchange); |
| 366 |
> |
register int i; |
| 367 |
> |
/* clear desire flags */ |
| 368 |
> |
for (i = ncbeams+xcbeams; i--; ) |
| 369 |
> |
cbeam[i].wants = cbeam[i].nr = 0; |
| 370 |
> |
voxel[0].hd = -1; /* clear voxel list */ |
| 371 |
|
} |
| 372 |
|
|
| 373 |
|
|
| 374 |
< |
int |
| 502 |
< |
beam_sync() /* synchronize beams on server */ |
| 503 |
< |
{ |
| 504 |
< |
cbeamop(DR_NEWSET, cbeam, ncbeams, &odev.v, odev.hres, odev.vres); |
| 505 |
< |
return(ncbeams); |
| 506 |
< |
} |
| 507 |
< |
|
| 508 |
< |
|
| 509 |
< |
beam_view(vn) /* change beam view (if advisable) */ |
| 374 |
> |
beam_view(vn, hr, vr) /* add beam view (if advisable) */ |
| 375 |
|
VIEW *vn; |
| 376 |
+ |
int hr, vr; |
| 377 |
|
{ |
| 378 |
|
struct cellact ca; |
| 379 |
< |
VOXL vlnew[8]; |
| 380 |
< |
int n, comn; |
| 381 |
< |
|
| 382 |
< |
if (vn == NULL || !vn->type) { /* clear our beam list */ |
| 383 |
< |
set_voxels(vlnew, 0); |
| 384 |
< |
cbeamop(DR_DELSET, cbeam, ncbeams, NULL, 0, 0); |
| 519 |
< |
ncbeams = 0; |
| 520 |
< |
dvw.type = 0; |
| 521 |
< |
return(1); |
| 522 |
< |
} |
| 523 |
< |
/* find our new voxels */ |
| 524 |
< |
n = get_voxels(vlnew, vn->vp); |
| 525 |
< |
if (dvw.type && !n) { |
| 526 |
< |
copystruct(vn, &dvw); /* cancel move */ |
| 379 |
> |
int vfl; |
| 380 |
> |
/* sort our list */ |
| 381 |
> |
cbeamsort(1); |
| 382 |
> |
/* add new voxels */ |
| 383 |
> |
vfl = add_voxels(vn->vp); |
| 384 |
> |
if (!vfl) |
| 385 |
|
return(0); |
| 386 |
< |
} |
| 529 |
< |
/* set the new voxels */ |
| 530 |
< |
comn = set_voxels(vlnew, n); |
| 531 |
< |
if (!dvw.type) |
| 532 |
< |
comn = 0; |
| 386 |
> |
ca.vp = vn; ca.hr = hr; ca.vr = vr; |
| 387 |
|
ca.add = 1; /* update our beam list */ |
| 388 |
< |
for (ca.vi = n; ca.vi--; ) |
| 389 |
< |
if (comn & 1<<ca.vi) /* change which cells we see */ |
| 390 |
< |
mvview(ca.vi, &dvw, vn); |
| 391 |
< |
else /* else add all new cells */ |
| 392 |
< |
doview(&ca, vn); |
| 393 |
< |
#if 1 |
| 394 |
< |
cbeamadj(vn, odev.hres, odev.vres); |
| 395 |
< |
#else |
| 396 |
< |
/* inform server of new beams */ |
| 397 |
< |
cbeamop(DR_ADDSET, cbeam+ncbeams, xcbeams, vn, odev.hres, odev.vres); |
| 388 |
> |
for (ca.vi = 0; vfl; vfl >>= 1, ca.vi++) |
| 389 |
> |
if (vfl & 1) |
| 390 |
> |
doview(&ca); |
| 391 |
> |
return(1); |
| 392 |
> |
} |
| 393 |
> |
|
| 394 |
> |
|
| 395 |
> |
int |
| 396 |
> |
beam_sync(all) /* update beam list on server */ |
| 397 |
> |
int all; |
| 398 |
> |
{ |
| 399 |
|
/* sort list to put orphans at end */ |
| 400 |
|
cbeamsort(0); |
| 401 |
< |
/* tell server to delete orphans */ |
| 402 |
< |
cbeamop(DR_DELSET, cbeam+ncbeams, xcbeams, NULL, 0, 0); |
| 401 |
> |
if (all) |
| 402 |
> |
cbeamop(DR_NEWSET, cbeam, ncbeams); |
| 403 |
> |
else |
| 404 |
> |
cbeamop(DR_ADJSET, cbeam, ncbeams+xcbeams); |
| 405 |
|
xcbeams = 0; /* truncate our list */ |
| 406 |
< |
#endif |
| 550 |
< |
copystruct(&dvw, vn); /* record new view */ |
| 551 |
< |
return(1); |
| 406 |
> |
return(ncbeams); |
| 407 |
|
} |
