ViewVC Help

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

root/Development/ray/src/ot/oconv.c

Comparing ray/src/ot/oconv.c (file contents):
Revision 2.4 by greg, Mon Sep 21 12:11:39 1992 UTC vs.
Revision 2.18 by greg, Wed Oct 22 02:06:34 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1992 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		*  oconv.c - main program for object to octree conversion.
6		*
7		*     7/29/85
8		*/
9
10	+	#include  "platform.h"
11		#include  "standard.h"
14	–
12		#include  "octree.h"
16	–
13		#include  "object.h"
18	–
14		#include  "otypes.h"
20	–
15		#include  "paths.h"
16
17		#define  OMARGIN        (10*FTINY)      /* margin around global cube */
18
19	<	#define  MAXOBJFIL      63              /* maximum number of scene files */
19	>	#define  MAXOBJFIL      127             /* maximum number of scene files */
20
21		char  *progname;                        /* argv[0] */
22
29	–	char  *libpath;                         /* library search path */
30	–
23		int  nowarn = 0;                        /* supress warnings? */
24
25	<	int  objlim = 5;                        /* # of objects before split */
25	>	int  objlim = 6;                        /* # of objects before split */
26
27	<	int  resolu = 1024;                     /* octree resolution limit */
27	>	int  resolu = 16384;                    /* octree resolution limit */
28
29		CUBE  thescene = {EMPTY, {0.0, 0.0, 0.0}, 0.0};         /* our scene */
30
#	Line 41 | Line 33 | int  nfiles = 0;                       /* number of object files */
33
34		double  mincusize;                      /* minimum cube size from resolu */
35
36	<	int  (*addobjnotify[])() = {NULL};      /* new object notifier functions */
36	>	void  (*addobjnotify[])() = {NULL};     /* new object notifier functions */
37
38
39		main(argc, argv)                /* convert object files to an octree */
40		int  argc;
41	<	char  **argv;
41	>	char  *argv[];
42		{
51	–	extern char  *getenv();
43		FVECT  bbmin, bbmax;
44		char  *infile = NULL;
45	+	int  inpfrozen = 0;
46		int  outflags = IO_ALL;
47		OBJECT  startobj;
48		int  i;
57	–
58	–	progname = argv[0];
49
50	<	if ((libpath = getenv(ULIBVAR)) == NULL)
61	<	libpath = DEFPATH;
50	>	progname = argv[0] = fixargv0(argv[0]);
51
52		initotypes();
53
#	Line 93 | Line 82 | char  **argv;
82		break;
83		}
84		breakopt:
85	<	#ifdef MSDOS
97	<	setmode(fileno(stdout), O_BINARY);
98	<	#endif
85	>	SET_FILE_BINARY(stdout);
86		if (infile != NULL) {           /* get old octree & objects */
87		if (thescene.cusize > FTINY)
88		error(USER, "only one of '-b' or '-i'");
89		nfiles = readoct(infile, IO_ALL, &thescene, ofname);
90	<	if (nfiles == 0 && outflags & IO_FILES) {
91	<	error(WARNING, "frozen octree");
92	<	outflags &= ~IO_FILES;
93	<	}
94	<	}
108	<
109	<	printargs(argc, argv, stdout);  /* info. header */
90	>	if (nfiles == 0)
91	>	inpfrozen++;
92	>	} else
93	>	newheader("RADIANCE", stdout);  /* new binary file header */
94	>	printargs(argc, argv, stdout);
95		fputformat(OCTFMT, stdout);
96		printf("\n");
97
98		startobj = nobjects;            /* previous objects already converted */
99	<
99	>
100		for ( ; i < argc; i++)          /* read new scene descriptions */
101		if (!strcmp(argv[i], "-")) {    /* from stdin */
102		readobj(NULL);
#	Line 123 | Line 108 | breakopt:
108		}
109
110		ofname[nfiles] = NULL;
111	+
112	+	if (inpfrozen && outflags & IO_FILES) {
113	+	error(WARNING, "frozen octree");
114	+	outflags &= ~IO_FILES;
115	+	}
116		/* find bounding box */
117		bbmin[0] = bbmin[1] = bbmin[2] = FHUGE;
118		bbmax[0] = bbmax[1] = bbmax[2] = -FHUGE;
#	Line 150 | Line 140 | breakopt:
140		}
141
142		mincusize = thescene.cusize / resolu - FTINY;
143	<
143	>
144		for (i = startobj; i < nobjects; i++)           /* add new objects */
145		addobject(&thescene, i);
146	<
146	>
147		thescene.cutree = combine(thescene.cutree);     /* optimize */
148
149		writeoct(outflags, &thescene, ofname);  /* write structures to stdout */
#	Line 162 | Line 152 | breakopt:
152		}
153
154
155	+	void
156		quit(code)                              /* exit program */
157		int  code;
158		{
#	Line 169 | Line 160 | int  code;
160		}
161
162
163	+	void
164		cputs()                                 /* interactive error */
165		{
166		/* referenced, but not used */
167		}
168
169
170	+	void
171		wputs(s)                                /* warning message */
172		char  *s;
173		{
#	Line 183 | Line 176 | char  *s;
176		}
177
178
179	+	void
180		eputs(s)                                /* put string to stderr */
181		register char  *s;
182		{
#	Line 197 | Line 191 | register char  *s;
191		inln = 0;
192		}
193
194	+	/* conflicting def's in param.h */
195	+	#undef  tstbit
196	+	#undef  setbit
197	+	#undef  clrbit
198	+	#undef  tglbit
199
200		#define  bitop(f,i,op)          (f[((i)>>3)] op (1<<((i)&7)))
201		#define  tstbit(f,i)            bitop(f,i,&)
#	Line 209 | Line 208 | addobject(cu, obj)                     /* add an object to a cube */
208		register CUBE  *cu;
209		OBJECT  obj;
210		{
211	<	CUBE  cukid;
213	<	OCTREE  ot;
214	<	OBJECT  oset[MAXSET+1];
215	<	unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
216	<	int  in;
217	<	register int  i, j;
211	>	int  inc;
212
213	<	in = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu);
213	>	inc = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu);
214
215	<	if (in == O_MISS)
215	>	if (inc == O_MISS)
216		return;                         /* no intersection */
217	<
217	>
218		if (istree(cu->cutree)) {
219	<	/* do children */
219	>	CUBE  cukid;                    /* do children */
220	>	int  i, j;
221		cukid.cusize = cu->cusize * 0.5;
222		for (i = 0; i < 8; i++) {
223		cukid.cutree = octkid(cu->cutree, i);
#	Line 237 | Line 232 | OBJECT obj;
232		return;
233		}
234		if (isempty(cu->cutree)) {
235	<	/* singular set */
235	>	OBJECT  oset[2];                /* singular set */
236		oset[0] = 1; oset[1] = obj;
237		cu->cutree = fullnode(oset);
238		return;
239		}
240		/* add to full node */
241	+	add2full(cu, obj, inc);
242	+	}
243	+
244	+
245	+	add2full(cu, obj, inc)                  /* add object to full node */
246	+	register CUBE  *cu;
247	+	OBJECT  obj;
248	+	int  inc;
249	+	{
250	+	OCTREE  ot;
251	+	OBJECT  oset[MAXSET+1];
252	+	CUBE  cukid;
253	+	unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
254	+	register int  i, j;
255	+
256		objset(oset, cu->cutree);
257		cukid.cusize = cu->cusize * 0.5;
258	<
259	<	if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
258	>
259	>	if (inc==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
260		/* add to set */
261		if (oset[0] >= MAXSET) {
262		sprintf(errmsg, "set overflow in addobject (%s)",

Diff Legend

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