ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/src/common/modobject.c

Comparing src/common/modobject.c (file contents):
Revision 1.2 by greg, Mon Jul 29 15:47:46 1991 UTC vs.
Revision 2.7 by greg, Sat Feb 22 02:07:22 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1986 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  Routines for tracking object modifiers
6	+	*
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	+	*/
66	+
67		#include  "standard.h"
68
69		#include  "object.h"
#	Line 15 | Line 71 | static char SCCSid[] = "$SunId$ LBL";
71		#include  "otypes.h"
72
73
18	–	extern int  (*addobjnotify[])();        /* people to notify of new objects */
19	–
74		static struct ohtab {
75		int  hsiz;                      /* current table size */
76		OBJECT  *htab;                  /* table, if allocated */
77		}  modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */
78
79	+	static int  otndx();
80
81	<	#ifdef  GETOBJ
81	>
82		int
83	<	object(oname)                   /* get an object number from its name */
84	<	char  *oname;
83	>	objndx(op)                      /* get object number from pointer */
84	>	register OBJREC  *op;
85		{
86	<	register int  ndx;
86	>	register int  i, j;
87
88	<	ndx = otndx(oname, &objtab);
89	<	return(objtab.htab[ndx]);
88	>	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
89	>	j = op - objblock[i];
90	>	if (j >= 0 && j < OBJBLKSIZ)
91	>	return((i<<OBJBLKSHFT) + j);
92	>	}
93	>	return(OVOID);
94		}
36	–	#endif
95
96
97		int
98	+	lastmod(obj, mname)             /* find modifier definition before obj */
99	+	OBJECT  obj;
100	+	char  *mname;
101	+	{
102	+	register OBJREC  *op;
103	+	register int  i;
104	+
105	+	i = modifier(mname);            /* try hash table first */
106	+	if (i < obj)
107	+	return(i);
108	+	for (i = obj; i-- > 0; ) {      /* need to search */
109	+	op = objptr(i);
110	+	if (ismodifier(op->otype) && !strcmp(op->oname, mname))
111	+	return(i);
112	+	}
113	+	return(OVOID);
114	+	}
115	+
116	+
117	+	int
118		modifier(mname)                 /* get a modifier number from its name */
119		char  *mname;
120		{
#	Line 47 | Line 125 | char  *mname;
125		}
126
127
128	+	#ifdef  GETOBJ
129	+	int
130	+	object(oname)                   /* get an object number from its name */
131	+	char  *oname;
132	+	{
133	+	register int  ndx;
134	+
135	+	ndx = otndx(oname, &objtab);
136	+	return(objtab.htab[ndx]);
137	+	}
138	+	#endif
139	+
140	+
141	+	void
142		insertobject(obj)               /* insert new object into our list */
143		register OBJECT  obj;
144		{
145		register int  i;
146
55	–	#ifdef  GETOBJ
56	–	i = otndx(objptr(obj)->oname, &objtab);
57	–	objtab.htab[i] = obj;
58	–	#endif
147		if (ismodifier(objptr(obj)->otype)) {
148		i = otndx(objptr(obj)->oname, &modtab);
149		modtab.htab[i] = obj;
150		}
151	+	#ifdef  GETOBJ
152	+	else {
153	+	i = otndx(objptr(obj)->oname, &objtab);
154	+	objtab.htab[i] = obj;
155	+	}
156	+	#endif
157		for (i = 0; addobjnotify[i] != NULL; i++)
158		(*addobjnotify[i])(obj);
159		}
160
161
162	+	void
163	+	clearobjndx()                   /* clear object hash tables */
164	+	{
165	+	if (modtab.htab != NULL) {
166	+	free((void *)modtab.htab);
167	+	modtab.htab = NULL;
168	+	modtab.hsiz = 100;
169	+	}
170	+	if (objtab.htab != NULL) {
171	+	free((void *)objtab.htab);
172	+	objtab.htab = NULL;
173	+	objtab.hsiz = 100;
174	+	}
175	+	}
176	+
177	+
178		static int
179		nexthsiz(oldsiz)                /* return next hash table size */
180		int  oldsiz;
#	Line 82 | Line 192 | int  oldsiz;
192
193
194		static int
85	–	shash(s)                        /* hash a string */
86	–	register char  *s;
87	–	{
88	–	register int  h = 0;
89	–
90	–	while (*s)
91	–	h = (h<<1 & 0x7fff) ^ *s++;
92	–	return(h);
93	–	}
94	–
95	–
96	–	static int
195		otndx(name, tab)                /* get object table index for name */
196		char  *name;
197		register struct ohtab  *tab;
#	Line 129 | Line 227 | tryagain:
227		i = otndx(objptr(oldhtab[ndx])->oname, tab);
228		tab->htab[i] = oldhtab[ndx];
229		}
230	<	free((char *)oldhtab);
230	>	free((void *)oldhtab);
231		goto tryagain;                  /* should happen only once! */
232		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)