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

Diff Legend

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