--- ray/src/hd/rhdobj.c 1998/08/26 17:26:26 3.4 +++ ray/src/hd/rhdobj.c 2004/01/01 11:21:55 3.16 @@ -1,28 +1,30 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhdobj.c,v 3.16 2004/01/01 11:21:55 schorsch Exp $"; #endif - /* - * Routines for loading and displaying Radiance objects under OpenGL in rholo. + * Routines for loading and displaying Radiance objects in rholo with GLX. */ +#include +#include + #include "radogl.h" #include "tonemap.h" #include "rhdisp.h" #include "rhdriver.h" #include "rhdobj.h" +#include "rtprocess.h" extern FILE *sstdout; /* user standard output */ char rhdcmd[DO_NCMDS][8] = DO_INIT; /* user command list */ -int (*dobj_lightsamp)() = NULL; /* pointer to function to get lights */ +/* pointer to function to get lights */ +void (*dobj_lightsamp)(COLR clr, FVECT direc, FVECT pos) = NULL; #define AVGREFL 0.5 /* assumed average reflectance */ -#define MAXAC 64 /* maximum number of args */ +#define MAXAC 512 /* maximum number of args */ #ifndef MINTHRESH #define MINTHRESH 5.0 /* source threshold w.r.t. mean */ @@ -53,9 +55,10 @@ typedef struct dobject { struct dobject *next; /* next object in list */ char name[64]; /* object name */ FVECT center; /* orig. object center */ - FLOAT radius; /* orig. object radius */ + RREAL radius; /* orig. object radius */ int listid; /* GL display list identifier */ - int rtp[3]; /* associated rtrace process */ + int nlists; /* number of lists allocated */ + SUBPROC rtp; /* associated rtrace process */ DLIGHTS *ol; /* object lights */ FULLXF xfb; /* coordinate transform */ short drawcode; /* drawing code */ @@ -83,10 +86,21 @@ static struct { #define curname (curobj==NULL ? (char *)NULL : curobj->name) +static DOBJECT *getdobj(char *nm); +static int freedobj(DOBJECT *op); +static int savedxf(DOBJECT *op); +static void ssph_sample(COLR clr, FVECT direc, FVECT pos); +static void ssph_direc(FVECT direc, int alt, int azi); +static int ssph_neigh(int sp[2], int next); +static int ssph_compute(void); +static int getdlights(DOBJECT *op, int force); +static void cmderror(int cn, char *err); + static DOBJECT * -getdobj(nm) /* get object from list by name */ -char *nm; +getdobj( /* get object from list by name */ + char *nm +) { register DOBJECT *op; @@ -101,9 +115,10 @@ char *nm; } -static -freedobj(op) /* free resources and memory assoc. with op */ -register DOBJECT *op; +static int +freedobj( /* free resources and memory assoc. with op */ + register DOBJECT *op +) { int foundlink = 0; DOBJECT ohead; @@ -119,19 +134,20 @@ register DOBJECT *op; } dobjects = ohead.next; if (!foundlink) { - glDeleteLists(op->listid, 1); - close_process(op->rtp); + glDeleteLists(op->listid, op->nlists); + close_process(&(op->rtp)); } while (op->xfac) freestr(op->xfav[--op->xfac]); - free((char *)op); + free((void *)op); return(1); } -static -savedxf(op) /* save transform for display object */ -register DOBJECT *op; +static int +savedxf( /* save transform for display object */ + register DOBJECT *op +) { /* free old */ while (lastxfac) @@ -149,10 +165,12 @@ register DOBJECT *op; } -static -ssph_sample(clr, direc, pos) /* add sample to current source sphere */ -COLR clr; -FVECT direc, pos; +static void +ssph_sample( /* add sample to current source sphere */ + COLR clr, + FVECT direc, + FVECT pos +) { COLOR col; double d; @@ -176,10 +194,12 @@ FVECT direc, pos; } -static -ssph_direc(direc, alt, azi) /* compute sphere sampling direction */ -FVECT direc; -int alt, azi; +static void +ssph_direc( /* compute sphere sampling direction */ + FVECT direc, + int alt, + int azi +) { double phi, d; @@ -192,9 +212,10 @@ int alt, azi; static int -ssph_neigh(sp, next) /* neighbor counter on sphere */ -register int sp[2]; -int next; +ssph_neigh( /* neighbor counter on sphere */ + register int sp[2], + int next +) { static short nneigh = 0; /* neighbor count */ static short neighlist[NAZI+6][2]; /* neighbor list (0 is home) */ @@ -207,7 +228,7 @@ int next; sp[1] = neighlist[nneigh][1]; return(1); } - if (sp[0] < 0 | sp[0] >= NALT | sp[1] < 0 | sp[1] >= NAZI) + if ((sp[0] < 0) | (sp[0] >= NALT) | (sp[1] < 0) | (sp[1] >= NAZI)) return(nneigh=0); neighlist[0][0] = sp[0]; neighlist[0][1] = sp[1]; nneigh = 1; @@ -257,8 +278,8 @@ int next; } -static -ssph_compute() /* compute source set from sphere samples */ +static int +ssph_compute(void) /* compute source set from sphere samples */ { int ncells, nsamps; COLOR csum; @@ -281,7 +302,7 @@ ssph_compute() /* compute source set from sphere sam nsamps += ssamp[alt][azi].nsamp; ncells++; } - if (dlightsets == NULL | ncells < NALT*NAZI/4) { + if ((dlightsets == NULL) | (ncells < NALT*NAZI/4)) { ncells = 0; goto done; } @@ -299,7 +320,7 @@ ssph_compute() /* compute source set from sphere sam /* avg. reflected brightness */ d = AVGREFL / (double)ncells; scalecolor(csum, d); - if (tmCvColors(&dlightsets->larb, TM_NOCHROM, csum, 1) != TM_E_OK) + if (tmCvColors(&dlightsets->larb, TM_NOCHROM, &csum, 1) != TM_E_OK) error(CONSISTENCY, "tone mapping problem in ssph_compute"); /* greedy light source clustering */ while (dlightsets->nl < MAXLIGHTS) { @@ -320,9 +341,11 @@ ssph_compute() /* compute source set from sphere sam continue; /* too dim */ ssph_direc(v, alt, azi); /* else add it in */ VSUM(ls->direc, ls->direc, v, d); - ls->omega++; + ls->omega += 1.; addcolor(ls->val, ssamp[alt][azi].val); + /* remove from list */ setcolor(ssamp[alt][azi].val, 0., 0., 0.); + ssamp[alt][azi].nsamp = 0; } d = 1./ls->omega; /* avg. brightness */ scalecolor(ls->val, d); @@ -337,15 +360,16 @@ ssph_compute() /* compute source set from sphere sam d = 1.0/ncells; scalecolor(dlightsets->lamb, d); done: /* clear sphere sample array */ - bzero((char *)ssamp, sizeof(ssamp)); + memset((void *)ssamp, '\0', sizeof(ssamp)); return(ncells); } -static -getdlights(op, force) /* get lights for display object */ -register DOBJECT *op; -int force; +static int +getdlights( /* get lights for display object */ + register DOBJECT *op, + int force +) { double d2, mind2 = FHUGE*FHUGE; FVECT ocent; @@ -370,7 +394,7 @@ int force; if (!force) return(0); /* need to compute new light set */ - copystruct(&cvw, &stdview); + cvw = stdview; cvw.type = VT_PER; VCOPY(cvw.vp, ocent); cvw.vup[0] = 1.; cvw.vup[1] = cvw.vup[2] = 0.; @@ -404,33 +428,36 @@ int force; quit(0); if (!ssph_compute()) { /* compute light sources from sphere */ dlightsets = dl->next; - free((char *)dl); + free((void *)dl); return(0); } op->ol = dl; return(1); memerr: error(SYSTEM, "out of memory in getdlights"); + return 0; /* pro forma return */ } -static int -cmderror(cn, err) /* report command error */ -int cn; -char *err; +static void +cmderror( /* report command error */ + int cn, + char *err +) { sprintf(errmsg, "%s: %s", rhdcmd[cn], err); error(COMMAND, errmsg); - return(cn); } -int -dobj_command(cmd, args) /* run object display command */ -char *cmd; -register char *args; +extern int +dobj_command( /* run object display command */ + char *cmd, + register char *args +) { - int cn, na, doxfm; + int somechange = 0; + int cn, na; register int nn; char *alist[MAXAC+1], *nm; /* find command */ @@ -457,15 +484,17 @@ register char *args; dobj_load(alist[0], alist[0]); else if (na == 2) dobj_load(alist[0], alist[1]); - else - return(cmderror(cn, "need octree [name]")); + else { + cmderror(cn, "need octree [name]"); + return(0); + } break; - case DO_UNLOAD: /* unload an object */ + case DO_UNLOAD: /* clear an object */ if (na > 1) goto toomany; if (na && alist[0][0] == '*') - dobj_cleanup(); + somechange += dobj_cleanup(); else - dobj_unload(na ? alist[0] : curname); + somechange += dobj_unload(na ? alist[0] : curname); break; case DO_XFORM: /* transform object */ case DO_MOVE: @@ -474,17 +503,19 @@ register char *args; } else { nm = curname; nn = 0; } - if (cn == DO_MOVE && nn >= na) - return(cmderror(cn, "missing transform")); - dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn); + if (cn == DO_MOVE && nn >= na) { + cmderror(cn, "missing transform"); + return(0); + } + somechange += dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn); break; case DO_UNMOVE: /* undo last transform */ - dobj_unmove(); + somechange += dobj_unmove(); break; case DO_OBJECT: /* print object statistics */ if (dobj_putstats(na ? alist[0] : curname, sstdout)) - if (na && alist[0][0] != '*' && - strcmp(alist[0], curname)) + if (na && alist[0][0] != '*' && (curobj == NULL || + strcmp(alist[0], curobj->name))) savedxf(curobj = getdobj(alist[0])); break; case DO_DUP: /* duplicate object */ @@ -493,7 +524,8 @@ register char *args; break; switch (nn) { case 0: - return(cmderror(cn, "need new object name")); + cmderror(cn, "need new object name"); + return(0); case 1: nm = curname; break; @@ -506,7 +538,7 @@ register char *args; if (!dobj_dup(nm, alist[nn-1])) break; if (na > nn) - dobj_xform(curname, 1, na-nn, alist+nn); + somechange += dobj_xform(curname, 1, na-nn, alist+nn); else curobj->drawcode = DO_HIDE; savedxf(curobj); @@ -516,21 +548,25 @@ register char *args; case DO_HIDE: if (na > 1) goto toomany; dobj_lighting(na ? alist[0] : curname, cn); + somechange++; break; default: error(CONSISTENCY, "bad command id in dobj_command"); } - dev_view(&odev.v); /* redraw */ - return(cn); + return(somechange); toomany: - return(cmderror(cn, "too many arguments")); + /* return(cmderror(cn, "too many arguments")); *//* XXX cmderror is void */ + cmderror(cn, "too many arguments"); + return 0; /* XXX not sure if this is the right return value */ } -dobj_load(oct, nam) /* create/load an octree object */ -char *oct, *nam; +extern int +dobj_load( /* create/load an octree object */ + char *oct, + char *nam +) { - extern char *getlibpath(), *getpath(); char *fpp, fpath[128]; register DOBJECT *op; /* check arguments */ @@ -542,16 +578,16 @@ char *oct, *nam; error(COMMAND, "missing name"); return(0); } - if (*nam == '*' | *nam == '-') { + if ((*nam == '*') | (*nam == '-')) { error(COMMAND, "illegal name"); return(0); } if (getdobj(nam) != NULL) { - error(COMMAND, "name already taken (unload first)"); + error(COMMAND, "name already taken (clear first)"); return(0); } /* get octree path */ - if ((fpp = getpath(oct, getlibpath(), R_OK)) == NULL) { + if ((fpp = getpath(oct, getrlibpath(), R_OK)) == NULL) { sprintf(errmsg, "cannot find octree \"%s\"", oct); error(COMMAND, errmsg); return(0); @@ -569,11 +605,12 @@ char *oct, *nam; op->xfav[op->xfac=0] = NULL; /* load octree into display list */ dolights = 0; - op->listid = rgl_octlist(fpath, op->center, &op->radius); + domats = 1; + op->listid = rgl_octlist(fpath, op->center, &op->radius, &op->nlists); /* start rtrace */ rtargv[RTARGC-1] = fpath; rtargv[RTARGC] = NULL; - open_process(op->rtp, rtargv); + open_process(&(op->rtp), rtargv); /* insert into main list */ op->next = dobjects; curobj = dobjects = op; @@ -582,8 +619,10 @@ char *oct, *nam; } -dobj_unload(nam) /* free the named object */ -char *nam; +extern int +dobj_unload( /* free the named object */ + char *nam +) { register DOBJECT *op; @@ -597,7 +636,8 @@ char *nam; } -dobj_cleanup() /* free all resources */ +extern int +dobj_cleanup(void) /* free all resources */ { register DLIGHTS *lp; @@ -606,34 +646,64 @@ dobj_cleanup() /* free all resources */ savedxf(curobj = NULL); while ((lp = dlightsets) != NULL) { dlightsets = lp->next; - free((char *)lp); + free((void *)lp); } return(1); } -dobj_xform(nam, add, ac, av) /* set/add transform for nam */ -char *nam; -int add, ac; -char **av; +extern int +dobj_xform( /* set/add transform for nam */ + char *nam, + int rel, + int ac, + char **av +) { register DOBJECT *op; + FVECT cent; + double rad; + char scoord[16]; + int i; if ((op = getdobj(nam)) == NULL) { error(COMMAND, "no object"); return(0); } - if (add) add = op->xfac; - if (ac + add > MAXAC) { + if (rel) + rel = op->xfac + 8; + if (ac + rel > MAXAC) { error(COMMAND, "too many transform arguments"); return(0); } - savedxf(curobj = op); - if (!add) + savedxf(curobj = op); /* remember current transform */ + if (rel && ac == 4 && !strcmp(av[0], "-t")) + rel = -1; /* don't move for translate */ + else { + getdcent(cent, op); /* don't move if near orig. */ + rad = getdrad(op); + if (DOT(cent,cent) < rad*rad) + rel = -1; + } + if (!rel) { /* remove old transform */ while (op->xfac) freestr(op->xfav[--op->xfac]); + } else if (rel > 0) { /* relative move */ + op->xfav[op->xfac++] = savestr("-t"); + for (i = 0; i < 3; i++) { + sprintf(scoord, "%.4e", -cent[i]); + op->xfav[op->xfac++] = savestr(scoord); + } + } while (ac--) op->xfav[op->xfac++] = savestr(*av++); + if (rel > 0) { /* move back */ + op->xfav[op->xfac++] = savestr("-t"); + for (i = 0; i < 3; i++) { + sprintf(scoord, "%.4e", cent[i]); + op->xfav[op->xfac++] = savestr(scoord); + } + } op->xfav[op->xfac] = NULL; if (fullxf(&op->xfb, op->xfac, op->xfav) != op->xfac) { error(COMMAND, "bad transform arguments"); @@ -647,9 +717,11 @@ char **av; } -dobj_putstats(nam, fp) /* put out statistics for nam */ -char *nam; -FILE *fp; +extern int +dobj_putstats( /* put out statistics for nam */ + char *nam, + FILE *fp +) { FVECT ocent; register DOBJECT *op; @@ -670,7 +742,7 @@ FILE *fp; return(0); } getdcent(ocent, op); - fprintf(fp, "%s: %s, center [%f %f %f], radius %f", op->name, + fprintf(fp, "%s: %s, center [%g %g %g], radius %g", op->name, op->drawcode==DO_HIDE ? "hidden" : op->drawcode==DO_LIGHT && op->ol!=NULL ? "lighted" : "shown", @@ -688,7 +760,8 @@ FILE *fp; } -dobj_unmove() /* undo last transform change */ +extern int +dobj_unmove(void) /* undo last transform change */ { int txfac; char *txfav[MAXAC+1]; @@ -698,13 +771,13 @@ dobj_unmove() /* undo last transform change */ return(0); } /* hold last transform */ - bcopy((char *)lastxfav, (char *)txfav, + memcpy((void *)txfav, (void *)lastxfav, (txfac=lastxfac)*sizeof(char *)); /* save this transform */ - bcopy((char *)curobj->xfav, (char *)lastxfav, + memcpy((void *)lastxfav, (void *)curobj->xfav, (lastxfac=curobj->xfac)*sizeof(char *)); /* copy back last transform */ - bcopy((char *)txfav, (char *)curobj->xfav, + memcpy((void *)curobj->xfav, (void *)txfav, (curobj->xfac=txfac)*sizeof(char *)); /* set matrices */ fullxf(&curobj->xfb, curobj->xfac, curobj->xfav); @@ -714,8 +787,11 @@ dobj_unmove() /* undo last transform change */ } -dobj_dup(oldnm, nam) /* duplicate object oldnm as nam */ -char *oldnm, *nam; +extern int +dobj_dup( /* duplicate object oldnm as nam */ + char *oldnm, + char *nam +) { register DOBJECT *op, *opdup; /* check arguments */ @@ -727,19 +803,19 @@ char *oldnm, *nam; error(COMMAND, "missing name"); return(0); } - if (*nam == '*' | *nam == '-') { + if ((*nam == '*') | (*nam == '-')) { error(COMMAND, "illegal name"); return(0); } if (getdobj(nam) != NULL) { - error(COMMAND, "name already taken (unload first)"); + error(COMMAND, "name already taken (clear first)"); return(0); } /* allocate and copy struct */ opdup = (DOBJECT *)malloc(sizeof(DOBJECT)); if (opdup == NULL) error(SYSTEM, "out of memory in dobj_dup"); - copystruct(opdup, op); + *opdup = *op; /* rename */ strcpy(opdup->name, nam); /* get our own copy of transform */ @@ -753,9 +829,11 @@ char *oldnm, *nam; } -dobj_lighting(nam, cn) /* set up lighting for display object */ -char *nam; -int cn; +extern int +dobj_lighting( /* set up lighting for display object */ + char *nam, + int cn +) { int i, res[2]; VIEW *dv; @@ -787,13 +865,16 @@ int cn; beam_view(dv, res[0], res[1]); beam_sync(1); /* update server */ } + return 0; /* XXX not sure if this is the right value */ } -double -dobj_trace(nm, rorg, rdir) /* check for ray intersection with object(s) */ -char nm[]; -FVECT rorg, rdir; +extern double +dobj_trace( /* check for ray intersection with object(s) */ + char nm[], + FVECT rorg, + FVECT rdir +) { register DOBJECT *op; FVECT xorg, xdir; @@ -827,7 +908,7 @@ FVECT rorg, rdir; VCOPY(darr, rorg); VCOPY(darr+3, rdir); } /* trace it */ - if (process(op->rtp, darr, darr, sizeof(double), + if (process(&(op->rtp), (char *)darr, (char *)darr, sizeof(double), 6*sizeof(double)) != sizeof(double)) error(SYSTEM, "rtrace communication error"); /* return distance */ @@ -837,8 +918,10 @@ FVECT rorg, rdir; } -dobj_render() /* render our objects in OpenGL */ +extern int +dobj_render(void) /* render our objects in OpenGL */ { + int nrendered = 0; GLboolean normalizing; GLfloat vec[4]; FVECT v1; @@ -849,7 +932,7 @@ dobj_render() /* render our objects in OpenGL */ if (op->drawcode != DO_HIDE) break; if (op == NULL) - return(1); + return(0); /* set up general rendering params */ glGetBooleanv(GL_NORMALIZE, &normalizing); glPushAttrib(GL_LIGHTING_BIT|GL_TRANSFORM_BIT|GL_ENABLE_BIT| @@ -921,8 +1004,8 @@ dobj_render() /* render our objects in OpenGL */ } /* set up object transform */ if (op->xfac) { - if (!normalizing && op->xfb.f.sca < 1.-FTINY | - op->xfb.f.sca > 1.+FTINY) + if (!normalizing && (op->xfb.f.sca < 1.-FTINY) | + (op->xfb.f.sca > 1.+FTINY)) glEnable(GL_NORMALIZE); glMatrixMode(GL_MODELVIEW); glPushMatrix(); @@ -935,6 +1018,7 @@ dobj_render() /* render our objects in OpenGL */ } /* render the display list */ glCallList(op->listid); + nrendered++; /* restore matrix */ if (op->xfac) { glMatrixMode(GL_MODELVIEW); @@ -952,5 +1036,5 @@ dobj_render() /* render our objects in OpenGL */ } glPopAttrib(); /* restore rendering params */ rgl_checkerr("rendering objects in dobj_render"); - return(1); + return(nrendered); }