ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/instance.c
(Generate patch)

Comparing ray/src/common/instance.c (file contents):
Revision 1.1 by greg, Thu Feb 2 10:34:35 1989 UTC vs.
Revision 2.3 by greg, Tue Feb 2 13:24:50 1993 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1988 Regents of the University of California */
1 > /* Copyright (c) 1990 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 16 | Line 16 | static char SCCSid[] = "$SunId$ LBL";
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  
# Line 28 | Line 30 | int  flags;
30          char  *pathname;
31          register SCENE  *sc;
32  
33 <        flags &= ~IO_FILES;                     /* 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)
# Line 41 | Line 43 | int  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)) == NULL) {
54 >        if ((pathname = getpath(sname, libpath, 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   }
# Line 61 | Line 73 | int  flags;
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");
80                  if (o->oargs.nsargs < 1)
81                          objerror(o, USER, "bad # of arguments");
82 <                in->f.sca = 1.0;
70 <                setident4(in->f.xfm);
71 <                if (xf(in->f.xfm, &in->f.sca, o->oargs.nsargs-1,
82 >                if (fullxf(&in->x, o->oargs.nsargs-1,
83                                  o->oargs.sarg+1) != o->oargs.nsargs-1)
84                          objerror(o, USER, "bad transform");
85 <                if (in->f.sca < 0.0)
86 <                        in->f.sca = -in->f.sca;
87 <                in->b.sca = 1.0;
88 <                setident4(in->b.xfm);
78 <                invxf(in->b.xfm, &in->b.sca,o->oargs.nsargs-1,o->oargs.sarg+1);
79 <                if (in->b.sca < 0.0)
80 <                        in->b.sca = -in->b.sca;
85 >                if (in->x.f.sca < 0.0)
86 >                        in->x.f.sca = -in->x.f.sca;
87 >                if (in->x.b.sca < 0.0)
88 >                        in->x.b.sca = -in->x.b.sca;
89                  in->obj = NULL;
90 <                (INSTANCE *)o->os = in;
90 >                o->os = (char *)in;
91          }
92          if (in->obj == NULL || (in->obj->ldflags & flags) != flags)
93                  in->obj = getscene(o->oargs.sarg[0], flags);
94          return(in);
95 + }
96 +
97 +
98 + freeinstance(o)         /* free memory associated with instance */
99 + OBJREC  *o;
100 + {
101 +        if (o->os == NULL)
102 +                return;
103 +        free(o->os);
104 +        o->os = NULL;
105   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines