--- ray/src/common/rglinst.c 1998/06/17 17:18:38 3.2 +++ ray/src/common/rglinst.c 2004/05/25 06:30:46 3.14 @@ -1,13 +1,19 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rglinst.c,v 3.14 2004/05/25 06:30:46 greg Exp $"; #endif - /* * Routines for reading instances and converting to OpenGL. */ +#include "copyright.h" + +#include +#include +#include + +#include "platform.h" +#include "paths.h" +#include "resolu.h" #include "radogl.h" #include "octree.h" @@ -20,27 +26,26 @@ typedef struct { char octfile[256]; /* octree file path */ } OCTINST; /* octree to instantiate */ -OBJECT nobjects; /* number of objects loaded so far */ +static double ogetflt(void); +static long ogetint(int); +static char *ogetstr(char *); +static int loadobj(void); +static void skiptree(void); +static void octerror(int etyp, char *msg); +static OCTINST *getoct(char *); -extern int free(); - -static double ogetflt(); -static long ogetint(); -static char *ogetstr(); -static int loadobj(), octerror(), skiptree(); -static OCTINST *getoct(); - static char *infn; /* input file name */ static FILE *infp; /* input file stream */ static int objsize; /* size of stored OBJECT's */ static short otypmap[NUMOTYPE+8]; /* object type map */ -static long imhash(mod) char *mod; {return((long)mod);} +static unsigned long imhash(mod) char *mod; {return((unsigned long)mod);} static LUTAB imtab = {imhash,NULL,NULL,NULL,0,NULL,0}; static LUTAB ottab = LU_SINIT(free,free); +int o_instance(o) /* convert instance to list call */ register OBJREC *o; { @@ -56,7 +61,7 @@ register OBJREC *o; o->oargs.nsargs-1) objerror(o, USER, "bad transform"); glPushAttrib(GL_TRANSFORM_BIT); - if (xfs.sca < 1.-FTINY | xfs.sca > 1.+FTINY) + if ((xfs.sca < 1.-FTINY) | (xfs.sca > 1.+FTINY)) glEnable(GL_NORMALIZE); glMatrixMode(GL_MODELVIEW); glPushMatrix(); @@ -69,21 +74,24 @@ register OBJREC *o; } ot = getoct(o->oargs.sarg[0]); /* get octree reference */ if (ot->localmatl &= o->os != NULL) /* set material */ - setmaterial(o->os, ot->cent, 0); + setmaterial((MATREC *)o->os, ot->cent, 0); /* call the assigned list */ glCallList(ot->listid); if (o->oargs.nsargs > 1) { /* end transform */ + glMatrixMode(GL_MODELVIEW); glPopMatrix(); glPopAttrib(); } rgl_checkerr("creating instance"); + return(0); } static int -buildoctlist(lp) /* build octree list */ +buildoctlist(lp, p) /* build octree list */ LUENT *lp; +void *p; { int old_dolights = dolights, old_domats = domats; register OCTINST *op = (OCTINST *)lp->data; @@ -110,9 +118,9 @@ loadoctrees() /* load octrees we've saved up */ while (ottab.tsiz) { if (!levelsleft--) error(USER, "too many octree levels -- instance loop?"); - copystruct(&looptab, &ottab); + looptab = ottab; ottab.tsiz = 0; - nocts += lu_doall(&looptab, buildoctlist); + nocts += lu_doall(&looptab, buildoctlist, NULL); lu_done(&looptab); } return(nocts); @@ -123,7 +131,6 @@ static OCTINST * getoct(name) /* get/assign octree list id */ char *name; { - extern char *getpath(), *getlibpath(); char *path; register LUENT *lp; register OCTINST *op; @@ -137,7 +144,7 @@ char *name; strcpy(lp->key, name); } if ((op = (OCTINST *)lp->data) == NULL) { - path = getpath(name, getlibpath(), R_OK); + path = getpath(name, getrlibpath(), R_OK); if (path == NULL) { sprintf(errmsg, "cannot find octree \"%s\"", name); error(USER, errmsg); @@ -151,6 +158,7 @@ char *name; return(op); memerr: error(SYSTEM, "out of memory in getoct"); + return NULL; /* pro forma return */ } @@ -169,16 +177,14 @@ FVECT cent; sprintf(errmsg, "cannot open octree file \"%s\"", fname); error(SYSTEM, errmsg); } -#ifdef MSDOS - setmode(fileno(infp), O_BINARY); -#endif + SET_FILE_BINARY(infp); /* get header */ if (checkheader(infp, OCTFMT, NULL) < 0) octerror(USER, "not an octree"); /* check format */ if ((objsize = ogetint(2)-OCTMAGIC) <= 0 || objsize > MAXOBJSIZ || objsize > sizeof(long)) - octerror("incompatible octree format"); + octerror(USER, "incompatible octree format"); if (cent != NULL) { /* get boundaries (compute center) */ for (i = 0; i < 3; i++) cent[i] = atof(ogetstr(sbuf)); @@ -196,6 +202,7 @@ FVECT cent; } +int loadoct(fname) /* read in objects from octree */ char *fname; { @@ -207,9 +214,7 @@ char *fname; infn = fname; infp = fopen(fname, "r"); /* assume already checked */ -#ifdef MSDOS - setmode(fileno(infp), O_BINARY); -#endif + SET_FILE_BINARY(infp); /* skip header */ getheader(infp, NULL, NULL); /* get format */ @@ -285,7 +290,7 @@ ogetflt() /* get a floating point number */ } -static +static void skiptree() /* skip octree on input */ { register int i; @@ -310,7 +315,7 @@ skiptree() /* skip octree on input */ } -static +static int loadobj() /* get next object */ { static OBJREC ob; @@ -336,7 +341,7 @@ loadobj() /* get next object */ /* get name id */ ob.oname = ogetstr(idbuf); /* get string arguments */ - if (ob.oargs.nsargs = ogetint(2)) { + if ((ob.oargs.nsargs = ogetint(2))) { ob.oargs.sarg = (char **)malloc (ob.oargs.nsargs*sizeof(char *)); if (ob.oargs.sarg == NULL) @@ -358,9 +363,9 @@ loadobj() /* get next object */ ob.oargs.iarg = NULL; #endif /* get real arguments */ - if (ob.oargs.nfargs = ogetint(2)) { - ob.oargs.farg = (FLOAT *)malloc - (ob.oargs.nfargs*sizeof(FLOAT)); + if ((ob.oargs.nfargs = ogetint(2))) { + ob.oargs.farg = (RREAL *)malloc + (ob.oargs.nfargs*sizeof(RREAL)); if (ob.oargs.farg == NULL) goto memerr; for (i = 0; i < ob.oargs.nfargs; i++) @@ -380,10 +385,11 @@ loadobj() /* get next object */ return(nobjects++); /* return object id */ memerr: error(SYSTEM, "out of memory in loadobj"); + return OVOID; /* pro forma return */ } -static +static void octerror(etyp, msg) /* octree error */ int etyp; char *msg;