432 |
|
char *cmd; |
433 |
|
register char *args; |
434 |
|
{ |
435 |
+ |
int somechange = 0; |
436 |
+ |
VIEW sameview; |
437 |
|
int cn, na, doxfm; |
438 |
|
register int nn; |
439 |
|
char *alist[MAXAC+1], *nm; |
467 |
|
case DO_UNLOAD: /* clear an object */ |
468 |
|
if (na > 1) goto toomany; |
469 |
|
if (na && alist[0][0] == '*') |
470 |
< |
dobj_cleanup(); |
470 |
> |
somechange += dobj_cleanup(); |
471 |
|
else |
472 |
< |
dobj_unload(na ? alist[0] : curname); |
472 |
> |
somechange += dobj_unload(na ? alist[0] : curname); |
473 |
|
break; |
474 |
|
case DO_XFORM: /* transform object */ |
475 |
|
case DO_MOVE: |
480 |
|
} |
481 |
|
if (cn == DO_MOVE && nn >= na) |
482 |
|
return(cmderror(cn, "missing transform")); |
483 |
< |
dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn); |
483 |
> |
somechange += dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn); |
484 |
|
break; |
485 |
|
case DO_UNMOVE: /* undo last transform */ |
486 |
< |
dobj_unmove(); |
486 |
> |
somechange += dobj_unmove(); |
487 |
|
break; |
488 |
|
case DO_OBJECT: /* print object statistics */ |
489 |
|
if (dobj_putstats(na ? alist[0] : curname, sstdout)) |
510 |
|
if (!dobj_dup(nm, alist[nn-1])) |
511 |
|
break; |
512 |
|
if (na > nn) |
513 |
< |
dobj_xform(curname, 1, na-nn, alist+nn); |
513 |
> |
somechange += dobj_xform(curname, 1, na-nn, alist+nn); |
514 |
|
else |
515 |
|
curobj->drawcode = DO_HIDE; |
516 |
|
savedxf(curobj); |
520 |
|
case DO_HIDE: |
521 |
|
if (na > 1) goto toomany; |
522 |
|
dobj_lighting(na ? alist[0] : curname, cn); |
523 |
+ |
somechange++; |
524 |
|
break; |
525 |
|
default: |
526 |
|
error(CONSISTENCY, "bad command id in dobj_command"); |
527 |
|
} |
528 |
< |
dev_view(&odev.v); /* redraw */ |
528 |
> |
if (somechange) { |
529 |
> |
copystruct(&sameview, &odev.v); /* make 'em think new view */ |
530 |
> |
dev_view(&sameview); /* redraw */ |
531 |
> |
} |
532 |
|
return(cn); |
533 |
|
toomany: |
534 |
|
return(cmderror(cn, "too many arguments")); |
577 |
|
op->xfav[op->xfac=0] = NULL; |
578 |
|
/* load octree into display list */ |
579 |
|
dolights = 0; |
580 |
+ |
domats = 1; |
581 |
|
op->listid = rgl_octlist(fpath, op->center, &op->radius); |
582 |
|
/* start rtrace */ |
583 |
|
rtargv[RTARGC-1] = fpath; |
873 |
|
} |
874 |
|
|
875 |
|
|
876 |
+ |
int |
877 |
|
dobj_render() /* render our objects in OpenGL */ |
878 |
|
{ |
879 |
+ |
int nrendered = 0; |
880 |
|
GLboolean normalizing; |
881 |
|
GLfloat vec[4]; |
882 |
|
FVECT v1; |
887 |
|
if (op->drawcode != DO_HIDE) |
888 |
|
break; |
889 |
|
if (op == NULL) |
890 |
< |
return(1); |
890 |
> |
return(0); |
891 |
|
/* set up general rendering params */ |
892 |
|
glGetBooleanv(GL_NORMALIZE, &normalizing); |
893 |
|
glPushAttrib(GL_LIGHTING_BIT|GL_TRANSFORM_BIT|GL_ENABLE_BIT| |
973 |
|
} |
974 |
|
/* render the display list */ |
975 |
|
glCallList(op->listid); |
976 |
+ |
nrendered++; |
977 |
|
/* restore matrix */ |
978 |
|
if (op->xfac) { |
979 |
|
glMatrixMode(GL_MODELVIEW); |
991 |
|
} |
992 |
|
glPopAttrib(); /* restore rendering params */ |
993 |
|
rgl_checkerr("rendering objects in dobj_render"); |
994 |
< |
return(1); |
994 |
> |
return(nrendered); |
995 |
|
} |