234 |
|
for (i = p->nr; i--; ) { |
235 |
|
hdray(ro, rd, hdlist[p->hd], gc, packra(p)[i].r); |
236 |
|
d = hddepth(hdlist[p->hd], packra(p)[i].d); |
237 |
< |
VSUM(wp, ro, rd, d); /* might be behind viewpoint */ |
238 |
< |
dev_value(packra(p)[i].v, wp, rd); |
237 |
> |
if (d < .99*FHUGE) { |
238 |
> |
VSUM(wp, ro, rd, d); /* might be behind viewpoint */ |
239 |
> |
dev_value(packra(p)[i].v, rd, wp); |
240 |
> |
} else |
241 |
> |
dev_value(packra(p)[i].v, rd, NULL); |
242 |
|
} |
243 |
|
#ifdef DEBUG |
244 |
|
if (imm_mode) nimmrays += p->nr; |
276 |
|
if (!dev_view(v)) /* notify display driver */ |
277 |
|
goto again; |
278 |
|
dev_flush(); /* update screen */ |
279 |
< |
beam_init(); /* compute new beam set */ |
279 |
> |
beam_init(0); /* compute new beam set */ |
280 |
|
for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) |
281 |
|
if (!beam_view(dv, res[0], res[1])) { |
282 |
|
if (!nhist) { |
306 |
|
if (fgets(cmd, sizeof(cmd), sstdin) == NULL) { |
307 |
|
fclose(sstdin); |
308 |
|
sstdin = NULL; |
309 |
< |
return(0); |
309 |
> |
return(-1); |
310 |
|
} |
311 |
+ |
if (!*cmd) |
312 |
+ |
return(DC_RESUME); |
313 |
|
for (args = cmd; *args && !isspace(*args); args++) |
314 |
|
; |
315 |
|
while (isspace(*args)) |
316 |
|
*args++ = '\0'; |
312 |
– |
if (!*cmd) |
313 |
– |
return(DC_RESUME); |
317 |
|
if (*args && args[i=strlen(args)-1] == '\n') |
318 |
|
args[i] = '\0'; |
319 |
|
for (i = 0; i < DC_NCMDS; i++) |
320 |
|
if (!strcmp(cmd, cmdlist[i])) |
321 |
|
break; |
322 |
|
if (i >= DC_NCMDS) { |
323 |
< |
sprintf(errmsg, "unknown command: %s", cmd); |
321 |
< |
error(COMMAND, errmsg); |
323 |
> |
dev_auxcom(cmd, args); |
324 |
|
return(-1); |
325 |
|
} |
326 |
|
switch (i) { |
409 |
|
break; |
410 |
|
case DS_OUTSECT: |
411 |
|
do_outside = 1; |
412 |
< |
break; |
412 |
> |
goto noargs; |
413 |
|
case DS_EYESEP: |
414 |
|
if (msg.nbytes <= 1 || (eyesepdist = atof(buf)) <= FTINY) |
415 |
|
error(INTERNAL, "bad eye separation from server"); |
425 |
|
} |
426 |
|
#endif |
427 |
|
imm_mode = msg.type==DS_STARTIMM; |
428 |
< |
/* fall through */ |
428 |
> |
goto noargs; |
429 |
|
case DS_ACKNOW: |
430 |
|
case DS_SHUTDOWN: |
431 |
< |
if (msg.nbytes) { |
430 |
< |
sprintf(errmsg, |
431 |
< |
"unexpected body with server message %d", |
432 |
< |
msg.type); |
433 |
< |
error(INTERNAL, errmsg); |
434 |
< |
} |
435 |
< |
break; |
431 |
> |
goto noargs; |
432 |
|
default: |
433 |
|
error(INTERNAL, "unrecognized result from server process"); |
434 |
|
} |
435 |
|
return(msg.type); /* return message type */ |
436 |
+ |
noargs: |
437 |
+ |
if (msg.nbytes) { |
438 |
+ |
sprintf(errmsg, "unexpected body with server message %d", |
439 |
+ |
msg.type); |
440 |
+ |
error(INTERNAL, errmsg); |
441 |
+ |
} |
442 |
+ |
return(msg.type); |
443 |
|
readerr: |
444 |
|
if (feof(stdin)) |
445 |
|
error(SYSTEM, "server process died"); |