--- ray/src/common/modobject.c 1991/07/29 15:47:46 1.2
+++ ray/src/common/modobject.c 2003/02/22 02:07:22 2.7
@@ -1,13 +1,69 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: modobject.c,v 2.7 2003/02/22 02:07:22 greg Exp $";
#endif
-
/*
* Routines for tracking object modifiers
+ *
+ * External symbols declared in object.h
*/
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes Radiance software
+ * (http://radsite.lbl.gov/)
+ * developed by the Lawrence Berkeley National Laboratory
+ * (http://www.lbl.gov/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ * and "The Regents of the University of California" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ * nor may "Radiance" appear in their name, without prior written
+ * permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory. For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * .
+ */
+
#include "standard.h"
#include "object.h"
@@ -15,28 +71,50 @@ static char SCCSid[] = "$SunId$ LBL";
#include "otypes.h"
-extern int (*addobjnotify[])(); /* people to notify of new objects */
-
static struct ohtab {
int hsiz; /* current table size */
OBJECT *htab; /* table, if allocated */
} modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */
+static int otndx();
-#ifdef GETOBJ
+
int
-object(oname) /* get an object number from its name */
-char *oname;
+objndx(op) /* get object number from pointer */
+register OBJREC *op;
{
- register int ndx;
+ register int i, j;
- ndx = otndx(oname, &objtab);
- return(objtab.htab[ndx]);
+ for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
+ j = op - objblock[i];
+ if (j >= 0 && j < OBJBLKSIZ)
+ return((i< 0; ) { /* need to search */
+ op = objptr(i);
+ if (ismodifier(op->otype) && !strcmp(op->oname, mname))
+ return(i);
+ }
+ return(OVOID);
+}
+
+
+int
modifier(mname) /* get a modifier number from its name */
char *mname;
{
@@ -47,24 +125,56 @@ char *mname;
}
+#ifdef GETOBJ
+int
+object(oname) /* get an object number from its name */
+char *oname;
+{
+ register int ndx;
+
+ ndx = otndx(oname, &objtab);
+ return(objtab.htab[ndx]);
+}
+#endif
+
+
+void
insertobject(obj) /* insert new object into our list */
register OBJECT obj;
{
register int i;
-#ifdef GETOBJ
- i = otndx(objptr(obj)->oname, &objtab);
- objtab.htab[i] = obj;
-#endif
if (ismodifier(objptr(obj)->otype)) {
i = otndx(objptr(obj)->oname, &modtab);
modtab.htab[i] = obj;
}
+#ifdef GETOBJ
+ else {
+ i = otndx(objptr(obj)->oname, &objtab);
+ objtab.htab[i] = obj;
+ }
+#endif
for (i = 0; addobjnotify[i] != NULL; i++)
(*addobjnotify[i])(obj);
}
+void
+clearobjndx() /* clear object hash tables */
+{
+ if (modtab.htab != NULL) {
+ free((void *)modtab.htab);
+ modtab.htab = NULL;
+ modtab.hsiz = 100;
+ }
+ if (objtab.htab != NULL) {
+ free((void *)objtab.htab);
+ objtab.htab = NULL;
+ objtab.hsiz = 100;
+ }
+}
+
+
static int
nexthsiz(oldsiz) /* return next hash table size */
int oldsiz;
@@ -82,18 +192,6 @@ int oldsiz;
static int
-shash(s) /* hash a string */
-register char *s;
-{
- register int h = 0;
-
- while (*s)
- h = (h<<1 & 0x7fff) ^ *s++;
- return(h);
-}
-
-
-static int
otndx(name, tab) /* get object table index for name */
char *name;
register struct ohtab *tab;
@@ -129,6 +227,6 @@ tryagain:
i = otndx(objptr(oldhtab[ndx])->oname, tab);
tab->htab[i] = oldhtab[ndx];
}
- free((char *)oldhtab);
+ free((void *)oldhtab);
goto tryagain; /* should happen only once! */
}