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.1 by greg, Tue Nov 12 17:00:55 1991 UTC vs.
Revision 2.12 by greg, Sat Feb 22 02:07:26 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		*  oconv.c - main program for object to octree conversion.
6		*
#	Line 18 | Line 15 | static char SCCSid[] = "$SunId$ LBL";
15
16		#include  "otypes.h"
17
18	<	#ifndef  DEFPATH
22	<	#define  DEFPATH        ":/usr/local/lib/ray"
23	<	#endif
18	>	#include  "paths.h"
19
20	<	#define  OMARGIN        (10*FTINY)      /* margin around global cube */
20	>	#define  OMARGIN        (10*FTINY)      /* margin around global cube */
21
22	<	#define  MAXOBJFIL      63              /* maximum number of scene files */
22	>	#define  MAXOBJFIL      127             /* maximum number of scene files */
23
24		char  *progname;                        /* argv[0] */
25
31	–	char  *libpath;                         /* library search path */
32	–
26		int  nowarn = 0;                        /* supress warnings? */
27
28		int  objlim = 5;                        /* # of objects before split */
29
30	<	int  resolu = 1024;                     /* octree resolution limit */
30	>	int  resolu = 8192;                     /* octree resolution limit */
31
32		CUBE  thescene = {EMPTY, {0.0, 0.0, 0.0}, 0.0};         /* our scene */
33
34		char  *ofname[MAXOBJFIL+1];             /* object file names */
35		int  nfiles = 0;                        /* number of object files */
36
37	<	double  mincusize;                      /* minimum cube size from resolu */
37	>	double  mincusize;                      /* minimum cube size from resolu */
38
39	<	int  (*addobjnotify[])() = {NULL};      /* new object notifier functions */
39	>	void  (*addobjnotify[])() = {NULL};     /* new object notifier functions */
40
41
42		main(argc, argv)                /* convert object files to an octree */
43		int  argc;
44	<	char  **argv;
44	>	char  *argv[];
45		{
53	–	char  *getenv();
54	–	double  atof();
46		FVECT  bbmin, bbmax;
47		char  *infile = NULL;
48	+	int  inpfrozen = 0;
49		int  outflags = IO_ALL;
50	<	OBJECT  startobj;
50	>	OBJECT  startobj;
51		int  i;
52
53	<	progname = argv[0];
53	>	progname = argv[0] = fixargv0(argv[0]);
54
63	–	if ((libpath = getenv("RAYPATH")) == NULL)
64	–	libpath = DEFPATH;
65	–
55		initotypes();
56
57		for (i = 1; i < argc && argv[i][0] == '-'; i++)
#	Line 96 | Line 85 | char  **argv;
85		break;
86		}
87		breakopt:
88	+	#ifdef MSDOS
89	+	setmode(fileno(stdout), O_BINARY);
90	+	#endif
91		if (infile != NULL) {           /* get old octree & objects */
92		if (thescene.cusize > FTINY)
93		error(USER, "only one of '-b' or '-i'");
94		nfiles = readoct(infile, IO_ALL, &thescene, ofname);
95	<	if (nfiles == 0 && outflags & IO_FILES) {
96	<	error(WARNING, "frozen octree");
97	<	outflags &= ~IO_FILES;
98	<	}
99	<	}
108	<
109	<	printargs(argc, argv, stdout);  /* info. header */
95	>	if (nfiles == 0)
96	>	inpfrozen++;
97	>	} else
98	>	newheader("RADIANCE", stdout);  /* new binary file header */
99	>	printargs(argc, argv, stdout);
100		fputformat(OCTFMT, stdout);
101		printf("\n");
102
103		startobj = nobjects;            /* previous objects already converted */
104	<
104	>
105		for ( ; i < argc; i++)          /* read new scene descriptions */
106		if (!strcmp(argv[i], "-")) {    /* from stdin */
107		readobj(NULL);
#	Line 123 | Line 113 | breakopt:
113		}
114
115		ofname[nfiles] = NULL;
116	+
117	+	if (inpfrozen && outflags & IO_FILES) {
118	+	error(WARNING, "frozen octree");
119	+	outflags &= ~IO_FILES;
120	+	}
121		/* find bounding box */
122		bbmin[0] = bbmin[1] = bbmin[2] = FHUGE;
123		bbmax[0] = bbmax[1] = bbmax[2] = -FHUGE;
#	Line 150 | Line 145 | breakopt:
145		}
146
147		mincusize = thescene.cusize / resolu - FTINY;
148	<
148	>
149		for (i = startobj; i < nobjects; i++)           /* add new objects */
150		addobject(&thescene, i);
151	<
151	>
152		thescene.cutree = combine(thescene.cutree);     /* optimize */
153
154		writeoct(outflags, &thescene, ofname);  /* write structures to stdout */
#	Line 162 | Line 157 | breakopt:
157		}
158
159
160	+	void
161		quit(code)                              /* exit program */
162		int  code;
163		{
#	Line 169 | Line 165 | int  code;
165		}
166
167
168	+	void
169		cputs()                                 /* interactive error */
170		{
171		/* referenced, but not used */
172		}
173
174
175	+	void
176		wputs(s)                                /* warning message */
177		char  *s;
178		{
#	Line 183 | Line 181 | char  *s;
181		}
182
183
184	+	void
185		eputs(s)                                /* put string to stderr */
186		register char  *s;
187		{
#	Line 198 | Line 197 | register char  *s;
197		}
198
199
200	<	#define  bitop(f,i,op)          (f[((i)>>3)] op (1<<((i)&7)))
201	<	#define  tstbit(f,i)            bitop(f,i,&)
202	<	#define  setbit(f,i)            bitop(f,i,|=)
203	<	#define  clrbit(f,i)            bitop(f,i,&=~)
204	<	#define  tglbit(f,i)            bitop(f,i,^=)
200	>	#define  bitop(f,i,op)          (f[((i)>>3)] op (1<<((i)&7)))
201	>	#define  tstbit(f,i)            bitop(f,i,&)
202	>	#define  setbit(f,i)            bitop(f,i,|=)
203	>	#define  clrbit(f,i)            bitop(f,i,&=~)
204	>	#define  tglbit(f,i)            bitop(f,i,^=)
205
206
207		addobject(cu, obj)                      /* add an object to a cube */
208		register CUBE  *cu;
209	<	OBJECT  obj;
209	>	OBJECT  obj;
210		{
211		CUBE  cukid;
212	<	OCTREE  ot;
213	<	OBJECT  oset[MAXSET+1];
214	<	unsigned char  inflg[MAXSET/8], volflg[MAXSET/8];
212	>	OCTREE  ot;
213	>	OBJECT  oset[MAXSET+1];
214	>	unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
215		int  in;
216		register int  i, j;
217
#	Line 220 | Line 219 | OBJECT  obj;
219
220		if (in == O_MISS)
221		return;                         /* no intersection */
222	<
222	>
223		if (istree(cu->cutree)) {
224		/* do children */
225		cukid.cusize = cu->cusize * 0.5;
#	Line 245 | Line 244 | OBJECT  obj;
244		/* add to full node */
245		objset(oset, cu->cutree);
246		cukid.cusize = cu->cusize * 0.5;
247	<
247	>
248		if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
249		/* add to set */
250		if (oset[0] >= MAXSET) {
251	<	sprintf(errmsg,
253	<	"set overflow in addobject (%s)",
251	>	sprintf(errmsg, "set overflow in addobject (%s)",
252		objptr(obj)->oname);
253		error(INTERNAL, errmsg);
254		}
#	Line 269 | Line 267 | OBJECT  obj;
267		if (isvolume(objptr(oset[j])->otype)) {
268		setbit(volflg,j-1);
269		if ((*ofun[objptr(oset[j])->otype].funp)
270	<	(objptr(oset[j]),cu) == O_IN)
270	>	(objptr(oset[j]), cu) == O_IN)
271		setbit(inflg,j-1);
272		}
273		/* assign subcubes */
#	Line 286 | Line 284 | OBJECT  obj;
284		addobject(&cukid, oset[j]);
285		/* then this object */
286		addobject(&cukid, obj);
287	<	/* partial volumes */
287	>	/* then partial volumes */
288		for (j = 1; j <= oset[0]; j++)
289		if (tstbit(volflg,j-1) &&
290		!tstbit(inflg,j-1))
291		addobject(&cukid, oset[j]);
292	<	/* full volumes */
292	>	/* full volumes last */
293		for (j = 1; j <= oset[0]; j++)
294		if (tstbit(inflg,j-1))
295		addobject(&cukid, oset[j]);

Diff Legend

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