ViewVC Help

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

root/Development/ray/src/common/instance.c

Comparing ray/src/common/instance.c (file contents):
Revision 2.5 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.12 by greg, Tue Mar 22 03:56:17 2016 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 */
25	>	getscene(sname, flags)                  /* get new octree reference */
26		char  *sname;
27		int  flags;
28		{
#	Line 85 | Line 31 | int  flags;
31
32		flags &= ~IO_ILLEGAL;           /* not allowed */
33		for (sc = slist; sc != NULL; sc = sc->next)
34	<	if (!strcmp(sname, sc->name)) {
35	<	if ((sc->ldflags & flags) == flags) {
90	<	sc->nref++;
91	<	return(sc);             /* loaded */
92	<	}
93	<	break;                  /* load the rest */
94	<	}
34	>	if (!strcmp(sname, sc->name))
35	>	break;
36		if (sc == NULL) {
37		sc = (SCENE *)malloc(sizeof(SCENE));
38		if (sc == NULL)
39	<	error(SYSTEM, "out of memory ins getscene");
39	>	error(SYSTEM, "out of memory in getscene");
40		sc->name = savestr(sname);
41	<	sc->nref = 1;
41	>	sc->nref = 0;
42		sc->ldflags = 0;
43		sc->scube.cutree = EMPTY;
44		sc->scube.cuorg[0] = sc->scube.cuorg[1] =
#	Line 107 | Line 48 | int  flags;
48		sc->next = slist;
49		slist = sc;
50		}
51	<	if ((pathname = getpath(sname, getlibpath(), R_OK)) == NULL) {
51	>	if ((pathname = getpath(sname, getrlibpath(), R_OK)) == NULL) {
52		sprintf(errmsg, "cannot find octree file \"%s\"", sname);
53	<	error(USER, errmsg);
53	>	error(SYSTEM, errmsg);
54		}
55		flags &= ~sc->ldflags;          /* skip what's already loaded */
56		if (flags & IO_SCENE)
57		sc->firstobj = nobjects;
58	<	readoct(pathname, flags, &sc->scube, NULL);
58	>	if (flags)
59	>	readoct(pathname, flags, &sc->scube, NULL);
60		if (flags & IO_SCENE)
61		sc->nobjs = nobjects - sc->firstobj;
62		sc->ldflags |= flags;
63	+	sc->nref++;                     /* increase reference count */
64		return(sc);
65		}
66
#	Line 132 | Line 75 | int  flags;
75		flags &= ~IO_ILLEGAL;           /* not allowed */
76		if ((ins = (INSTANCE *)o->os) == NULL) {
77		if ((ins = (INSTANCE *)malloc(sizeof(INSTANCE))) == NULL)
78	<	error(SYSTEM, "out of memory ins getinstance");
78	>	error(SYSTEM, "out of memory in getinstance");
79		if (o->oargs.nsargs < 1)
80		objerror(o, USER, "bad # of arguments");
81		if (fullxf(&ins->x, o->oargs.nsargs-1,
#	Line 145 | Line 88 | int  flags;
88		ins->obj = NULL;
89		o->os = (char *)ins;
90		}
91	<	if (ins->obj == NULL || (ins->obj->ldflags & flags) != flags)
91	>	if (ins->obj == NULL)
92		ins->obj = getscene(o->oargs.sarg[0], flags);
93	+	else if ((flags &= ~ins->obj->ldflags)) {
94	+	if (flags & IO_SCENE)
95	+	ins->obj->firstobj = nobjects;
96	+	if (flags)
97	+	readoct(getpath(o->oargs.sarg[0], getrlibpath(), R_OK),
98	+	flags, &ins->obj->scube, NULL);
99	+	if (flags & IO_SCENE)
100	+	ins->obj->nobjs = nobjects - ins->obj->firstobj;
101	+	ins->obj->ldflags |= flags;
102	+	}
103		return(ins);
104		}
105
#	Line 189 | Line 142 | OBJREC  *o;
142		if (o->os == NULL)
143		return;
144		freescene((*(INSTANCE *)o->os).obj);
145	<	free(o->os);
145	>	free((void *)o->os);
146		o->os = NULL;
147		}

Diff Legend

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