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 2.5 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.14 by greg, Thu Dec 12 20:04:46 2024 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  instance.c - routines for octree objects.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use ins source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions ins binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer ins
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear ins the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear ins their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  "rtmath.h"
11 > #include  "rterror.h"
12 > #include  "rtio.h"
13 > #include  "paths.h"
14  
15   #include  "octree.h"
68
16   #include  "object.h"
70
17   #include  "instance.h"
18  
19   #define  IO_ILLEGAL     (IO_FILES|IO_INFO)
# Line 76 | Line 22 | static SCENE  *slist = NULL;           /* list of loaded octree
22  
23  
24   SCENE *
25 < getscene(sname, flags)                  /* load octree sname */
26 < char  *sname;
27 < int  flags;
25 > getscene(                               /* get new octree reference */
26 >        char  *sname,
27 >        int  flags
28 > )
29   {
30          char  *pathname;
31 <        register SCENE  *sc;
31 >        SCENE  *sc;
32  
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) {
37 <                                sc->nref++;
38 <                                return(sc);             /* loaded */
92 <                        }
93 <                        break;                  /* load the rest */
94 <                }
95 <        if (sc == NULL) {
96 <                sc = (SCENE *)malloc(sizeof(SCENE));
35 >                if (!strcmp(sname, sc->name))
36 >                        break;
37 >        if (sc == NULL) {               /* new instance? */
38 >                sc = (SCENE *)calloc(1, sizeof(SCENE));
39                  if (sc == NULL)
40 <                        error(SYSTEM, "out of memory ins getscene");
40 >                        error(SYSTEM, "out of memory in getscene");
41                  sc->name = savestr(sname);
100                sc->nref = 1;
101                sc->ldflags = 0;
42                  sc->scube.cutree = EMPTY;
103                sc->scube.cuorg[0] = sc->scube.cuorg[1] =
104                                sc->scube.cuorg[2] = 0.;
105                sc->scube.cusize = 0.;
106                sc->firstobj = sc->nobjs = 0;
43                  sc->next = slist;
44                  slist = sc;
45          }
46 <        if ((pathname = getpath(sname, getlibpath(), R_OK)) == NULL) {
46 >        sc->nref++;                     /* bump reference count */
47 >        if (!(flags &= ~sc->ldflags))   /* nothing to load? */
48 >                return(sc);
49 >        if ((pathname = getpath(sname, getrlibpath(), R_OK)) == NULL) {
50                  sprintf(errmsg, "cannot find octree file \"%s\"", sname);
51 <                error(USER, errmsg);
51 >                error(SYSTEM, errmsg);
52          }
114        flags &= ~sc->ldflags;          /* skip what's already loaded */
53          if (flags & IO_SCENE)
54                  sc->firstobj = nobjects;
55 <        readoct(pathname, flags, &sc->scube, NULL);
55 >        if (flags)
56 >                readoct(pathname, flags, &sc->scube, NULL);
57          if (flags & IO_SCENE)
58                  sc->nobjs = nobjects - sc->firstobj;
59          sc->ldflags |= flags;
# Line 123 | Line 62 | int  flags;
62  
63  
64   INSTANCE *
65 < getinstance(o, flags)                   /* get instance structure */
66 < register OBJREC  *o;
67 < int  flags;
65 > getinstance(                            /* get instance structure */
66 >        OBJREC  *o,
67 >        int  flags
68 > )
69   {
70 <        register INSTANCE  *ins;
70 >        INSTANCE  *ins;
71  
72          flags &= ~IO_ILLEGAL;           /* not allowed */
73          if ((ins = (INSTANCE *)o->os) == NULL) {
74                  if ((ins = (INSTANCE *)malloc(sizeof(INSTANCE))) == NULL)
75 <                        error(SYSTEM, "out of memory ins getinstance");
75 >                        error(SYSTEM, "out of memory in getinstance");
76                  if (o->oargs.nsargs < 1)
77                          objerror(o, USER, "bad # of arguments");
78                  if (fullxf(&ins->x, o->oargs.nsargs-1,
# Line 145 | Line 85 | int  flags;
85                  ins->obj = NULL;
86                  o->os = (char *)ins;
87          }
88 <        if (ins->obj == NULL || (ins->obj->ldflags & flags) != flags)
88 >        if (ins->obj == NULL) {
89                  ins->obj = getscene(o->oargs.sarg[0], flags);
90 +        } else if ((flags &= ~ins->obj->ldflags)) {
91 +                if (flags & IO_SCENE)
92 +                        ins->obj->firstobj = nobjects;
93 +                if (flags)
94 +                        readoct(getpath(o->oargs.sarg[0], getrlibpath(), R_OK),
95 +                                        flags, &ins->obj->scube, NULL);
96 +                if (flags & IO_SCENE)
97 +                        ins->obj->nobjs = nobjects - ins->obj->firstobj;
98 +                ins->obj->ldflags |= flags;
99 +        }
100          return(ins);
101   }
102  
103  
104   void
105 < freescene(sc)           /* release a scene reference */
106 < SCENE *sc;
105 > freescene(              /* release a scene reference */
106 >        SCENE *sc
107 > )
108   {
109          SCENE  shead;
110 <        register SCENE  *scp;
110 >        SCENE  *scp;
111  
112          if (sc == NULL)
113                  return;
114          if (sc->nref <= 0)
115                  error(CONSISTENCY, "unreferenced scene in freescene");
116 <        sc->nref--;
166 <        if (sc->nref)                   /* still in use? */
116 >        if (--sc->nref)                 /* still in use? */
117                  return;
118          shead.next = slist;             /* else remove from our list */
119          for (scp = &shead; scp->next != NULL; scp = scp->next)
# Line 178 | Line 128 | SCENE *sc;
128          freestr(sc->name);              /* free memory */
129          octfree(sc->scube.cutree);
130          freeobjects(sc->firstobj, sc->nobjs);
131 <        free((void *)sc);
131 >        free(sc);
132   }
133  
134  
135   void
136 < freeinstance(o)         /* free memory associated with instance */
137 < OBJREC  *o;
136 > freeinstance(           /* free memory associated with instance */
137 >        OBJREC  *o
138 > )
139   {
140          if (o->os == NULL)
141                  return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines