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.4 by greg, Thu Oct 5 07:54:06 1989 UTC vs.
Revision 2.2 by greg, Thu Aug 6 16:46:47 1992 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 28 | Line 28 | int  flags;
28          char  *pathname;
29          register SCENE  *sc;
30  
31 <        flags &= ~IO_FILES;                     /* not allowed */
31 >        flags &= ~(IO_FILES|IO_INFO);           /* not allowed */
32          for (sc = slist; sc != NULL; sc = sc->next)
33                  if (!strcmp(sname, sc->name)) {
34                          if ((sc->ldflags & flags) == flags)
# Line 41 | Line 41 | int  flags;
41                          error(SYSTEM, "out of memory in getscene");
42                  sc->name = savestr(sname);
43                  sc->ldflags = 0;
44 +                sc->scube.cutree = EMPTY;
45 +                sc->scube.cuorg[0] = sc->scube.cuorg[1] =
46 +                                sc->scube.cuorg[2] = 0.;
47 +                sc->scube.cusize = 0.;
48 +                sc->firstobj = sc->nobjs = 0;
49                  sc->next = slist;
50                  slist = sc;
51          }
# Line 48 | Line 53 | int  flags;
53                  sprintf(errmsg, "cannot find octree file \"%s\"", sname);
54                  error(USER, errmsg);
55          }
56 +        if (flags & ~sc->ldflags & IO_SCENE)
57 +                sc->firstobj = nobjects;
58          readoct(pathname, flags & ~sc->ldflags, &sc->scube, NULL);
59 +        if (flags & ~sc->ldflags & IO_SCENE)
60 +                sc->nobjs = nobjects - sc->firstobj;
61          sc->ldflags |= flags;
62          return(sc);
63   }
# Line 66 | Line 75 | int  flags;
75                          error(SYSTEM, "out of memory in getinstance");
76                  if (o->oargs.nsargs < 1)
77                          objerror(o, USER, "bad # of arguments");
78 <                if (xf(in->f.xfm, &in->f.sca, o->oargs.nsargs-1,
78 >                if (fullxf(&in->x, o->oargs.nsargs-1,
79                                  o->oargs.sarg+1) != o->oargs.nsargs-1)
80                          objerror(o, USER, "bad transform");
81 <                if (in->f.sca < 0.0)
82 <                        in->f.sca = -in->f.sca;
83 <                invxf(in->b.xfm, &in->b.sca,o->oargs.nsargs-1,o->oargs.sarg+1);
84 <                if (in->b.sca < 0.0)
76 <                        in->b.sca = -in->b.sca;
81 >                if (in->x.f.sca < 0.0)
82 >                        in->x.f.sca = -in->x.f.sca;
83 >                if (in->x.b.sca < 0.0)
84 >                        in->x.b.sca = -in->x.b.sca;
85                  in->obj = NULL;
86                  o->os = (char *)in;
87          }
88          if (in->obj == NULL || (in->obj->ldflags & flags) != flags)
89                  in->obj = getscene(o->oargs.sarg[0], flags);
90          return(in);
91 + }
92 +
93 +
94 + freeinstance(o)         /* free memory associated with instance */
95 + OBJREC  *o;
96 + {
97 +        if (o->os == NULL)
98 +                return;
99 +        free(o->os);
100 +        o->os = NULL;
101   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines