5 |
|
#endif |
6 |
|
|
7 |
|
/* |
8 |
< |
* Routines for loading and displaying Radiance objects under OpenGL in rholo. |
8 |
> |
* Routines for loading and displaying Radiance objects in rholo with GLX. |
9 |
|
*/ |
10 |
|
|
11 |
|
#include "radogl.h" |
22 |
|
|
23 |
|
#define AVGREFL 0.5 /* assumed average reflectance */ |
24 |
|
|
25 |
< |
#define MAXAC 64 /* maximum number of args */ |
25 |
> |
#define MAXAC 512 /* maximum number of args */ |
26 |
|
|
27 |
|
#ifndef MINTHRESH |
28 |
|
#define MINTHRESH 5.0 /* source threshold w.r.t. mean */ |
55 |
|
FVECT center; /* orig. object center */ |
56 |
|
FLOAT radius; /* orig. object radius */ |
57 |
|
int listid; /* GL display list identifier */ |
58 |
+ |
int nlists; /* number of lists allocated */ |
59 |
|
int rtp[3]; /* associated rtrace process */ |
60 |
|
DLIGHTS *ol; /* object lights */ |
61 |
|
FULLXF xfb; /* coordinate transform */ |
120 |
|
} |
121 |
|
dobjects = ohead.next; |
122 |
|
if (!foundlink) { |
123 |
< |
glDeleteLists(op->listid, 1); |
123 |
> |
glDeleteLists(op->listid, op->nlists); |
124 |
|
close_process(op->rtp); |
125 |
|
} |
126 |
|
while (op->xfac) |
321 |
|
continue; /* too dim */ |
322 |
|
ssph_direc(v, alt, azi); /* else add it in */ |
323 |
|
VSUM(ls->direc, ls->direc, v, d); |
324 |
< |
ls->omega++; |
324 |
> |
ls->omega += 1.; |
325 |
|
addcolor(ls->val, ssamp[alt][azi].val); |
326 |
+ |
/* remove from list */ |
327 |
|
setcolor(ssamp[alt][azi].val, 0., 0., 0.); |
328 |
+ |
ssamp[alt][azi].nsamp = 0; |
329 |
|
} |
330 |
|
d = 1./ls->omega; /* avg. brightness */ |
331 |
|
scalecolor(ls->val, d); |
417 |
|
} |
418 |
|
|
419 |
|
|
420 |
< |
static int |
420 |
> |
static |
421 |
|
cmderror(cn, err) /* report command error */ |
422 |
|
int cn; |
423 |
|
char *err; |
424 |
|
{ |
425 |
|
sprintf(errmsg, "%s: %s", rhdcmd[cn], err); |
426 |
|
error(COMMAND, errmsg); |
424 |
– |
return(cn); |
427 |
|
} |
428 |
|
|
429 |
|
|
432 |
|
char *cmd; |
433 |
|
register char *args; |
434 |
|
{ |
435 |
+ |
int somechange = 0; |
436 |
|
int cn, na, doxfm; |
437 |
|
register int nn; |
438 |
|
char *alist[MAXAC+1], *nm; |
460 |
|
dobj_load(alist[0], alist[0]); |
461 |
|
else if (na == 2) |
462 |
|
dobj_load(alist[0], alist[1]); |
463 |
< |
else |
464 |
< |
return(cmderror(cn, "need octree [name]")); |
463 |
> |
else { |
464 |
> |
cmderror(cn, "need octree [name]"); |
465 |
> |
return(0); |
466 |
> |
} |
467 |
|
break; |
468 |
< |
case DO_UNLOAD: /* unload an object */ |
468 |
> |
case DO_UNLOAD: /* clear an object */ |
469 |
|
if (na > 1) goto toomany; |
470 |
|
if (na && alist[0][0] == '*') |
471 |
< |
dobj_cleanup(); |
471 |
> |
somechange += dobj_cleanup(); |
472 |
|
else |
473 |
< |
dobj_unload(na ? alist[0] : curname); |
473 |
> |
somechange += dobj_unload(na ? alist[0] : curname); |
474 |
|
break; |
475 |
|
case DO_XFORM: /* transform object */ |
476 |
|
case DO_MOVE: |
479 |
|
} else { |
480 |
|
nm = curname; nn = 0; |
481 |
|
} |
482 |
< |
if (cn == DO_MOVE && nn >= na) |
483 |
< |
return(cmderror(cn, "missing transform")); |
484 |
< |
dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn); |
482 |
> |
if (cn == DO_MOVE && nn >= na) { |
483 |
> |
cmderror(cn, "missing transform"); |
484 |
> |
return(0); |
485 |
> |
} |
486 |
> |
somechange += dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn); |
487 |
|
break; |
488 |
|
case DO_UNMOVE: /* undo last transform */ |
489 |
< |
dobj_unmove(); |
489 |
> |
somechange += dobj_unmove(); |
490 |
|
break; |
491 |
|
case DO_OBJECT: /* print object statistics */ |
492 |
|
if (dobj_putstats(na ? alist[0] : curname, sstdout)) |
493 |
< |
if (na && alist[0][0] != '*' && |
494 |
< |
strcmp(alist[0], curname)) |
493 |
> |
if (na && alist[0][0] != '*' && (curobj == NULL || |
494 |
> |
strcmp(alist[0], curobj->name))) |
495 |
|
savedxf(curobj = getdobj(alist[0])); |
496 |
|
break; |
497 |
|
case DO_DUP: /* duplicate object */ |
500 |
|
break; |
501 |
|
switch (nn) { |
502 |
|
case 0: |
503 |
< |
return(cmderror(cn, "need new object name")); |
503 |
> |
cmderror(cn, "need new object name"); |
504 |
> |
return(0); |
505 |
|
case 1: |
506 |
|
nm = curname; |
507 |
|
break; |
514 |
|
if (!dobj_dup(nm, alist[nn-1])) |
515 |
|
break; |
516 |
|
if (na > nn) |
517 |
< |
dobj_xform(curname, 1, na-nn, alist+nn); |
517 |
> |
somechange += dobj_xform(curname, 1, na-nn, alist+nn); |
518 |
|
else |
519 |
|
curobj->drawcode = DO_HIDE; |
520 |
|
savedxf(curobj); |
524 |
|
case DO_HIDE: |
525 |
|
if (na > 1) goto toomany; |
526 |
|
dobj_lighting(na ? alist[0] : curname, cn); |
527 |
+ |
somechange++; |
528 |
|
break; |
529 |
|
default: |
530 |
|
error(CONSISTENCY, "bad command id in dobj_command"); |
531 |
|
} |
532 |
< |
dev_view(&odev.v); /* redraw */ |
524 |
< |
return(cn); |
532 |
> |
return(somechange); |
533 |
|
toomany: |
534 |
|
return(cmderror(cn, "too many arguments")); |
535 |
|
} |
555 |
|
return(0); |
556 |
|
} |
557 |
|
if (getdobj(nam) != NULL) { |
558 |
< |
error(COMMAND, "name already taken (unload first)"); |
558 |
> |
error(COMMAND, "name already taken (clear first)"); |
559 |
|
return(0); |
560 |
|
} |
561 |
|
/* get octree path */ |
577 |
|
op->xfav[op->xfac=0] = NULL; |
578 |
|
/* load octree into display list */ |
579 |
|
dolights = 0; |
580 |
< |
op->listid = rgl_octlist(fpath, op->center, &op->radius); |
580 |
> |
domats = 1; |
581 |
> |
op->listid = rgl_octlist(fpath, op->center, &op->radius, &op->nlists); |
582 |
|
/* start rtrace */ |
583 |
|
rtargv[RTARGC-1] = fpath; |
584 |
|
rtargv[RTARGC] = NULL; |
621 |
|
} |
622 |
|
|
623 |
|
|
624 |
< |
dobj_xform(nam, add, ac, av) /* set/add transform for nam */ |
624 |
> |
dobj_xform(nam, rel, ac, av) /* set/add transform for nam */ |
625 |
|
char *nam; |
626 |
< |
int add, ac; |
626 |
> |
int rel, ac; |
627 |
|
char **av; |
628 |
|
{ |
629 |
|
register DOBJECT *op; |
630 |
+ |
FVECT cent; |
631 |
+ |
double rad; |
632 |
+ |
char scoord[16]; |
633 |
+ |
int i; |
634 |
|
|
635 |
|
if ((op = getdobj(nam)) == NULL) { |
636 |
|
error(COMMAND, "no object"); |
637 |
|
return(0); |
638 |
|
} |
639 |
< |
if (add) add = op->xfac; |
640 |
< |
if (ac + add > MAXAC) { |
639 |
> |
if (rel) |
640 |
> |
rel = op->xfac + 8; |
641 |
> |
if (ac + rel > MAXAC) { |
642 |
|
error(COMMAND, "too many transform arguments"); |
643 |
|
return(0); |
644 |
|
} |
645 |
< |
savedxf(curobj = op); |
646 |
< |
if (!add) |
645 |
> |
savedxf(curobj = op); /* remember current transform */ |
646 |
> |
if (rel && ac == 4 && !strcmp(av[0], "-t")) |
647 |
> |
rel = -1; /* don't move for translate */ |
648 |
> |
else { |
649 |
> |
getdcent(cent, op); /* don't move if near orig. */ |
650 |
> |
rad = getdrad(op); |
651 |
> |
if (DOT(cent,cent) < rad*rad) |
652 |
> |
rel = -1; |
653 |
> |
} |
654 |
> |
if (!rel) { /* remove old transform */ |
655 |
|
while (op->xfac) |
656 |
|
freestr(op->xfav[--op->xfac]); |
657 |
+ |
} else if (rel > 0) { /* relative move */ |
658 |
+ |
op->xfav[op->xfac++] = savestr("-t"); |
659 |
+ |
for (i = 0; i < 3; i++) { |
660 |
+ |
sprintf(scoord, "%.4e", -cent[i]); |
661 |
+ |
op->xfav[op->xfac++] = savestr(scoord); |
662 |
+ |
} |
663 |
+ |
} |
664 |
|
while (ac--) |
665 |
|
op->xfav[op->xfac++] = savestr(*av++); |
666 |
+ |
if (rel > 0) { /* move back */ |
667 |
+ |
op->xfav[op->xfac++] = savestr("-t"); |
668 |
+ |
for (i = 0; i < 3; i++) { |
669 |
+ |
sprintf(scoord, "%.4e", cent[i]); |
670 |
+ |
op->xfav[op->xfac++] = savestr(scoord); |
671 |
+ |
} |
672 |
+ |
} |
673 |
|
op->xfav[op->xfac] = NULL; |
674 |
|
if (fullxf(&op->xfb, op->xfac, op->xfav) != op->xfac) { |
675 |
|
error(COMMAND, "bad transform arguments"); |
706 |
|
return(0); |
707 |
|
} |
708 |
|
getdcent(ocent, op); |
709 |
< |
fprintf(fp, "%s: %s, center [%f %f %f], radius %f", op->name, |
709 |
> |
fprintf(fp, "%s: %s, center [%g %g %g], radius %g", op->name, |
710 |
|
op->drawcode==DO_HIDE ? "hidden" : |
711 |
|
op->drawcode==DO_LIGHT && op->ol!=NULL ? "lighted" : |
712 |
|
"shown", |
768 |
|
return(0); |
769 |
|
} |
770 |
|
if (getdobj(nam) != NULL) { |
771 |
< |
error(COMMAND, "name already taken (unload first)"); |
771 |
> |
error(COMMAND, "name already taken (clear first)"); |
772 |
|
return(0); |
773 |
|
} |
774 |
|
/* allocate and copy struct */ |
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 |
|
} |