| 16 |
|
|
| 17 |
|
#include "instance.h" |
| 18 |
|
|
| 19 |
+ |
#define IO_ILLEGAL (IO_FILES|IO_INFO) |
| 20 |
+ |
|
| 21 |
|
static SCENE *slist = NULL; /* list of loaded octrees */ |
| 22 |
|
|
| 23 |
|
|
| 26 |
|
char *sname; |
| 27 |
|
int flags; |
| 28 |
|
{ |
| 29 |
< |
extern char *libpath; |
| 29 |
> |
extern char *getlibpath(); |
| 30 |
|
char *pathname; |
| 31 |
|
register SCENE *sc; |
| 32 |
|
|
| 33 |
< |
flags &= ~(IO_FILES|IO_INFO); /* not allowed */ |
| 33 |
> |
flags &= ~IO_ILLEGAL; /* not allowed */ |
| 34 |
|
for (sc = slist; sc != NULL; sc = sc->next) |
| 35 |
|
if (!strcmp(sname, sc->name)) { |
| 36 |
|
if ((sc->ldflags & flags) == flags) |
| 43 |
|
error(SYSTEM, "out of memory in getscene"); |
| 44 |
|
sc->name = savestr(sname); |
| 45 |
|
sc->ldflags = 0; |
| 46 |
+ |
sc->scube.cutree = EMPTY; |
| 47 |
+ |
sc->scube.cuorg[0] = sc->scube.cuorg[1] = |
| 48 |
+ |
sc->scube.cuorg[2] = 0.; |
| 49 |
+ |
sc->scube.cusize = 0.; |
| 50 |
+ |
sc->firstobj = sc->nobjs = 0; |
| 51 |
|
sc->next = slist; |
| 52 |
|
slist = sc; |
| 53 |
|
} |
| 54 |
< |
if ((pathname = getpath(sname, libpath, R_OK)) == NULL) { |
| 54 |
> |
if ((pathname = getpath(sname, getlibpath(), R_OK)) == NULL) { |
| 55 |
|
sprintf(errmsg, "cannot find octree file \"%s\"", sname); |
| 56 |
|
error(USER, errmsg); |
| 57 |
|
} |
| 58 |
< |
readoct(pathname, flags & ~sc->ldflags, &sc->scube, NULL); |
| 58 |
> |
flags &= ~sc->ldflags; /* skip what's already loaded */ |
| 59 |
> |
if (flags & IO_SCENE) |
| 60 |
> |
sc->firstobj = nobjects; |
| 61 |
> |
readoct(pathname, flags, &sc->scube, NULL); |
| 62 |
> |
if (flags & IO_SCENE) |
| 63 |
> |
sc->nobjs = nobjects - sc->firstobj; |
| 64 |
|
sc->ldflags |= flags; |
| 65 |
|
return(sc); |
| 66 |
|
} |
| 73 |
|
{ |
| 74 |
|
register INSTANCE *in; |
| 75 |
|
|
| 76 |
+ |
flags &= ~IO_ILLEGAL; /* not allowed */ |
| 77 |
|
if ((in = (INSTANCE *)o->os) == NULL) { |
| 78 |
|
if ((in = (INSTANCE *)malloc(sizeof(INSTANCE))) == NULL) |
| 79 |
|
error(SYSTEM, "out of memory in getinstance"); |
