--- ray/src/common/instance.h 1989/02/02 10:34:17 1.1 +++ ray/src/common/instance.h 1992/08/06 08:18:56 2.2 @@ -1,4 +1,4 @@ -/* Copyright (c) 1988 Regents of the University of California */ +/* Copyright (c) 1990 Regents of the University of California */ /* SCCSid "$SunId$ LBL" */ @@ -10,21 +10,16 @@ #include "octree.h" -#define GET_BOUNDS IO_BOUNDS /* just load boundaries */ -#define GET_ALL (IO_BOUNDS|IO_SCENE|IO_TREE) /* everything */ - typedef struct scene { char *name; /* octree name */ int ldflags; /* what was loaded */ CUBE scube; /* scene cube */ + OBJECT firstobj, nobjs; /* first object and count */ struct scene *next; /* next in list */ } SCENE; /* loaded octree */ typedef struct { - struct { - double sca; /* scaling */ - double xfm[4][4]; /* transform */ - } f, b; /* forward and backward */ + FULLXF x; /* forward and backward transforms */ SCENE *obj; /* loaded object */ } INSTANCE; /* instance of octree */