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

Comparing ray/src/common/modobject.c (file contents):
Revision 2.7 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.22 by greg, Fri Dec 6 20:54:23 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   *  Routines for tracking object modifiers
# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in object.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include  "standard.h"
13  
# Line 72 | Line 17 | static const char      RCSid[] = "$Id$";
17  
18  
19   static struct ohtab {
20 <        int  hsiz;                      /* current table size */
21 <        OBJECT  *htab;                  /* table, if allocated */
20 >        int     hsiz;                   /* current table size */
21 >        OBJECT  *htab;                  /* table, if allocated */
22   }  modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */
23  
24 < static int  otndx();
24 > static int  otndx(char *, struct ohtab *);
25  
26  
27 < int
28 < objndx(op)                      /* get object number from pointer */
29 < register OBJREC  *op;
27 > OBJECT
28 > objndx(                         /* get object number from pointer */
29 >        OBJREC  *op
30 > )
31   {
32 <        register int  i, j;
32 >        int     i;
33 >        ssize_t j;
34  
35 <        for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
35 >        for (i = (nobjects-1)>>OBJBLKSHFT; i >= 0; i--) {
36                  j = op - objblock[i];
37 <                if (j >= 0 && j < OBJBLKSIZ)
38 <                        return((i<<OBJBLKSHFT) + j);
37 >                if ((0 <= j) & (j < OBJBLKSIZ))
38 >                        return(((OBJECT)i<<OBJBLKSHFT) + (OBJECT)j);
39          }
40 <        return(OVOID);
40 >        return(OVOID);          /* not in our array -- may still be valid */
41   }
42  
43  
44 < int
45 < lastmod(obj, mname)             /* find modifier definition before obj */
46 < OBJECT  obj;
47 < char  *mname;
44 > OBJECT
45 > lastmod(                        /* find modifier definition before obj */
46 >        OBJECT  obj,
47 >        char  *mname
48 > )
49   {
50 <        register OBJREC  *op;
51 <        register int  i;
50 >        OBJREC  *op;
51 >        OBJECT  i;
52  
53          i = modifier(mname);            /* try hash table first */
54 <        if (i < obj)
54 >        if ((obj == OVOID) | (i < obj))
55                  return(i);
56          for (i = obj; i-- > 0; ) {      /* need to search */
57                  op = objptr(i);
58 <                if (ismodifier(op->otype) && !strcmp(op->oname, mname))
58 >                if ((ismodifier(op->otype) != 0) & (op->oname[0] == mname[0])
59 >                                && !strcmp(op->oname, mname))
60                          return(i);
61          }
62          return(OVOID);
63   }
64  
65  
66 < int
67 < modifier(mname)                 /* get a modifier number from its name */
68 < char  *mname;
66 > OBJECT
67 > modifier(                       /* get a modifier number from its name */
68 >        char  *mname
69 > )
70   {
71 <        register int  ndx;
71 >        int  ndx;
72  
73          ndx = otndx(mname, &modtab);
74          return(modtab.htab[ndx]);
# Line 126 | Line 76 | char  *mname;
76  
77  
78   #ifdef  GETOBJ
79 < int
80 < object(oname)                   /* get an object number from its name */
81 < char  *oname;
79 > OBJECT
80 > object(                         /* get an object number from its name */
81 >        char  *oname
82 > )
83   {
84 <        register int  ndx;
84 >        int  ndx;
85  
86          ndx = otndx(oname, &objtab);
87          return(objtab.htab[ndx]);
# Line 138 | Line 89 | char  *oname;
89   #endif
90  
91  
92 + int
93 + eqreal(                         /* are two real values close enough to equal? */
94 +        double  d1,
95 +        double  d2
96 + )
97 + {
98 +        if (d2 != 0.0)
99 +                d1 = d1/d2 - 1.0;
100 +        return((-FTINY <= d1) & (d1 <= FTINY));
101 + }
102 +
103 +
104 + int
105 + eqobjects(                      /* check if two objects are equal */
106 +        OBJECT  obj1,
107 +        OBJECT  obj2
108 + )
109 + {
110 +        OBJREC  *op1, *op2;
111 +        int     i, n;
112 +
113 +        while (obj1 != obj2) {
114 +                if (obj1 == OVOID)
115 +                        return(0);
116 +                if (obj2 == OVOID)
117 +                        return(0);
118 +                op1 = objptr(obj1);
119 +                op2 = objptr(obj2);
120 +                if (op1->otype != op2->otype)
121 +                        return(0);
122 +                if (op1->oargs.nsargs != op2->oargs.nsargs)
123 +                        return(0);
124 +                if (op1->oargs.nfargs != op2->oargs.nfargs)
125 +                        return(0);
126 + #ifdef IARGS
127 +                if (op1->oargs.niargs != op2->oargs.niargs)
128 +                        return(0);
129 +                for (i = op1->oargs.niargs; i-- > 0; )
130 +                        if (op1->oargs.iarg[i] != op2->oargs.iarg[i])
131 +                                return(0);
132 + #endif
133 +                for (i = op1->oargs.nfargs; i-- > 0; )
134 +                        if (!eqreal(op1->oargs.farg[i], op2->oargs.farg[i]))
135 +                                return(0);
136 +                n = 0;
137 +                switch (op1->otype) {   /* special cases (KEEP CONSISTENT!) */
138 +                case MOD_ALIAS:
139 +                case MAT_ILLUM:
140 +                case MAT_MIRROR:
141 +                        n = (op1->oargs.nsargs > 0);
142 +                        break;
143 +                case MIX_FUNC:
144 +                case MIX_DATA:
145 +                case MIX_TEXT:
146 +                case MIX_PICT:
147 +                        n = 2*(op1->oargs.nsargs >= 2);
148 +                        break;
149 +                case MAT_CLIP:
150 +                        n = op1->oargs.nsargs;
151 +                        break;
152 +                }
153 +                                        /* check other string arguments */
154 +                for (i = op1->oargs.nsargs; i-- > n; )
155 +                        if (strcmp(op1->oargs.sarg[i], op2->oargs.sarg[i]))
156 +                                return(0);
157 +                while (n-- > 0)         /* check modifier references */
158 +                        if (!eqobjects( lastmod(obj1, op1->oargs.sarg[n]),
159 +                                        lastmod(obj2, op2->oargs.sarg[n]) ))
160 +                                return(0);
161 +                obj1 = op1->omod;
162 +                obj2 = op2->omod;
163 +        }
164 +        return(1);
165 + }
166 +
167 +
168   void
169 < insertobject(obj)               /* insert new object into our list */
170 < register OBJECT  obj;
169 > insertobject(                   /* insert new object into our list */
170 >        OBJECT  obj
171 > )
172   {
173 <        register int  i;
173 >        int  i;
174  
175          if (ismodifier(objptr(obj)->otype)) {
176                  i = otndx(objptr(obj)->oname, &modtab);
177 +                if (eqobjects(obj, modtab.htab[i]))
178 +                        return; /* don't index if same as earlier def. */
179                  modtab.htab[i] = obj;
180          }
181   #ifdef  GETOBJ
# Line 160 | Line 190 | register OBJECT  obj;
190  
191  
192   void
193 < clearobjndx()                   /* clear object hash tables */
193 > truncobjndx(void)               /* remove bogus table entries past end */
194   {
195 <        if (modtab.htab != NULL) {
196 <                free((void *)modtab.htab);
197 <                modtab.htab = NULL;
198 <                modtab.hsiz = 100;
195 >        int     ndx;
196 >
197 >        if (nobjects <= 0) {
198 >                if (modtab.htab != NULL) {
199 >                        free(modtab.htab);
200 >                        modtab.htab = NULL;
201 >                        modtab.hsiz = 100;
202 >                }
203 >                if (objtab.htab != NULL) {
204 >                        free(objtab.htab);
205 >                        objtab.htab = NULL;
206 >                        objtab.hsiz = 100;
207 >                }
208 >                return;
209          }
210 <        if (objtab.htab != NULL) {
211 <                free((void *)objtab.htab);
212 <                objtab.htab = NULL;
213 <                objtab.hsiz = 100;
214 <        }
210 >        for (ndx = modtab.hsiz*(modtab.htab != NULL); ndx--; )
211 >                if (modtab.htab[ndx] >= nobjects)
212 >                        modtab.htab[ndx] = OVOID;
213 >
214 >        for (ndx = objtab.hsiz*(objtab.htab != NULL); ndx--; )
215 >                if (objtab.htab[ndx] >= nobjects)
216 >                        objtab.htab[ndx] = OVOID;
217   }
218  
219  
220   static int
221 < nexthsiz(oldsiz)                /* return next hash table size */
222 < int  oldsiz;
221 > nexthsiz(                       /* return next hash table size */
222 >        int  oldsiz
223 > )
224   {
225          static int  hsiztab[] = {
226 <                251, 509, 1021, 2039, 4093, 8191, 16381, 0
226 >                251, 509, 1021, 2039, 4093, 8191, 16381,
227 >                32749, 65521, 131071, 262139, 0
228          };
229 <        register int  *hsp;
229 >        int  *hsp;
230  
231          for (hsp = hsiztab; *hsp; hsp++)
232                  if (*hsp > oldsiz)
# Line 192 | Line 236 | int  oldsiz;
236  
237  
238   static int
239 < otndx(name, tab)                /* get object table index for name */
240 < char  *name;
241 < register struct ohtab  *tab;
239 > otndx(                          /* get object table index for name */
240 >        char  *name,
241 >        struct ohtab  *tab
242 > )
243   {
244 +        char    *onm;
245          OBJECT  *oldhtab;
246          int  hval, i;
247 <        register int  ndx;
247 >        int  ndx;
248  
249          if (tab->htab == NULL) {                /* new table */
250                  tab->hsiz = nexthsiz(tab->hsiz);
# Line 213 | Line 259 | register struct ohtab  *tab;
259          hval = shash(name);
260   tryagain:
261          for (i = 0; i < tab->hsiz; i++) {
262 <                ndx = (hval + i*i) % tab->hsiz;
263 <                if (tab->htab[ndx] == OVOID ||
218 <                                !strcmp(objptr(tab->htab[ndx])->oname, name))
262 >                ndx = (hval + (unsigned long)i*i) % tab->hsiz;
263 >                if (tab->htab[ndx] == OVOID)
264                          return(ndx);
265 +                onm = objptr(tab->htab[ndx])->oname;
266 +                if (onm != NULL && !strcmp(onm, name))
267 +                        return(ndx);
268          }
269                                          /* table is full, reallocate */
270          oldhtab = tab->htab;
# Line 224 | Line 272 | tryagain:
272          tab->htab = NULL;
273          while (ndx--)
274                  if (oldhtab[ndx] != OVOID) {
275 <                        i = otndx(objptr(oldhtab[ndx])->oname, tab);
275 >                        onm = objptr(oldhtab[ndx])->oname;
276 >                        if (onm == NULL)
277 >                                continue;
278 >                        i = otndx(onm, tab);
279                          tab->htab[i] = oldhtab[ndx];
280                  }
281 <        free((void *)oldhtab);
281 >        free(oldhtab);
282          goto tryagain;                  /* should happen only once! */
283   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines