--- ray/src/common/instance.c 1989/02/02 10:34:35 1.1 +++ ray/src/common/instance.c 1989/10/13 19:45:50 1.5 @@ -28,7 +28,7 @@ int flags; char *pathname; register SCENE *sc; - flags &= ~IO_FILES; /* not allowed */ + flags &= ~(IO_FILES|IO_INFO); /* not allowed */ for (sc = slist; sc != NULL; sc = sc->next) if (!strcmp(sname, sc->name)) { if ((sc->ldflags & flags) == flags) @@ -44,7 +44,7 @@ int flags; sc->next = slist; slist = sc; } - if ((pathname = getpath(sname, libpath)) == NULL) { + if ((pathname = getpath(sname, libpath, R_OK)) == NULL) { sprintf(errmsg, "cannot find octree file \"%s\"", sname); error(USER, errmsg); } @@ -66,20 +66,16 @@ int flags; error(SYSTEM, "out of memory in getinstance"); if (o->oargs.nsargs < 1) objerror(o, USER, "bad # of arguments"); - in->f.sca = 1.0; - setident4(in->f.xfm); if (xf(in->f.xfm, &in->f.sca, o->oargs.nsargs-1, o->oargs.sarg+1) != o->oargs.nsargs-1) objerror(o, USER, "bad transform"); if (in->f.sca < 0.0) in->f.sca = -in->f.sca; - in->b.sca = 1.0; - setident4(in->b.xfm); invxf(in->b.xfm, &in->b.sca,o->oargs.nsargs-1,o->oargs.sarg+1); if (in->b.sca < 0.0) in->b.sca = -in->b.sca; in->obj = NULL; - (INSTANCE *)o->os = in; + o->os = (char *)in; } if (in->obj == NULL || (in->obj->ldflags & flags) != flags) in->obj = getscene(o->oargs.sarg[0], flags);