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 1.1 by greg, Thu Feb 2 10:33:04 1989 UTC vs.
Revision 1.8 by greg, Mon Apr 2 15:19:46 1990 UTC

#	Line 18 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18
19		#include  "otypes.h"
20
21	+	#define  OMARGIN        (10*FTINY)      /* margin around global cube */
22	+
23		#define  MAXOBJFIL      63              /* maximum number of scene files */
24
25		char  *progname;                        /* argv[0] */
#	Line 37 | Line 39 | int  nfiles = 0;                       /* number of object files */
39
40		double  mincusize;                      /* minimum cube size from resolu */
41
42	+	int  (*addobjnotify[])() = {NULL};      /* new object notifier functions */
43
44	+
45		main(argc, argv)                /* convert object files to an octree */
46		int  argc;
47		char  **argv;
#	Line 57 | Line 61 | char  **argv;
61
62		for (i = 1; i < argc && argv[i][0] == '-'; i++)
63		switch (argv[i][1]) {
64	+	case '\0':                              /* scene from stdin */
65	+	goto breakopt;
66		case 'i':                               /* input octree */
67		infile = argv[++i];
68		break;
69		case 'b':                               /* bounding cube */
70	<	thescene.cuorg[0] = atof(argv[++i]) - FTINY;
71	<	thescene.cuorg[1] = atof(argv[++i]) - FTINY;
72	<	thescene.cuorg[2] = atof(argv[++i]) - FTINY;
73	<	thescene.cusize = atof(argv[++i]) + 2*FTINY;
70	>	thescene.cuorg[0] = atof(argv[++i]) - OMARGIN;
71	>	thescene.cuorg[1] = atof(argv[++i]) - OMARGIN;
72	>	thescene.cuorg[2] = atof(argv[++i]) - OMARGIN;
73	>	thescene.cusize = atof(argv[++i]) + 2*OMARGIN;
74		break;
75		case 'n':                               /* set limit */
76		objlim = atoi(argv[++i]);
#	Line 83 | Line 89 | char  **argv;
89		error(USER, errmsg);
90		break;
91		}
92	<
92	>	breakopt:
93		if (infile != NULL) {           /* get old octree & objects */
94		if (thescene.cusize > FTINY)
95		error(USER, "only one of '-b' or '-i'");
#	Line 99 | Line 105 | char  **argv;
105
106		startobj = nobjects;            /* previous objects already converted */
107
108	<	for ( ; i < argc; i++) {                /* read new files */
109	<	if (nfiles >= MAXOBJFIL)
110	<	error(INTERNAL, "too many scene files");
111	<	readobj(ofname[nfiles++] = argv[i]);
112	<	}
108	>	for ( ; i < argc; i++)          /* read new scene descriptions */
109	>	if (!strcmp(argv[i], "-")) {    /* from stdin */
110	>	readobj(NULL);
111	>	outflags &= ~IO_FILES;
112	>	} else {                        /* from file */
113	>	if (nfiles >= MAXOBJFIL)
114	>	error(INTERNAL, "too many scene files");
115	>	readobj(ofname[nfiles++] = argv[i]);
116	>	}
117	>
118		ofname[nfiles] = NULL;
119		/* find bounding box */
120		bbmin[0] = bbmin[1] = bbmin[2] = FHUGE;
#	Line 114 | Line 125 | char  **argv;
125		if (thescene.cusize == 0.0) {
126		if (bbmin[0] <= bbmax[0]) {
127		for (i = 0; i < 3; i++) {
128	<	bbmin[i] -= FTINY;
129	<	bbmax[i] += FTINY;
128	>	bbmin[i] -= OMARGIN;
129	>	bbmax[i] += OMARGIN;
130		}
120	–	VCOPY(thescene.cuorg, bbmin);
131		for (i = 0; i < 3; i++)
132		if (bbmax[i] - bbmin[i] > thescene.cusize)
133		thescene.cusize = bbmax[i] - bbmin[i];
134	+	for (i = 0; i < 3; i++)
135	+	thescene.cuorg[i] =
136	+	(bbmax[i]+bbmin[i]-thescene.cusize)*.5;
137		}
138		} else {
139		for (i = 0; i < 3; i++)
#	Line 190 | Line 203 | OBJECT  obj;
203
204		in = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu);
205
206	<	if (!in)
206	>	if (in == O_MISS)
207		return;                         /* no intersection */
208
209		if (istree(cu->cutree)) {
#	Line 217 | Line 230 | OBJECT  obj;
230		objset(oset, cu->cutree);
231		cukid.cusize = cu->cusize * 0.5;
232
233	<	if (in == 2 || oset[0] < objlim || cukid.cusize < mincusize) {
233	>	if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
234		/* add to set */
235		if (oset[0] >= MAXSET) {
236		sprintf(errmsg,
#	Line 239 | Line 252 | OBJECT  obj;
252		if ((1<<j) & i)
253		cukid.cuorg[j] += cukid.cusize;
254		}
255	+	/* surfaces first */
256		for (j = 1; j <= oset[0]; j++)
257	<	addobject(&cukid, oset[j]);
257	>	if (!isvolume(objptr(oset[j])->otype))
258	>	addobject(&cukid, oset[j]);
259	>	/* then this object */
260		addobject(&cukid, obj);
261	+	/* volumes last */
262	+	for (j = 1; j <= oset[0]; j++)
263	+	if (isvolume(objptr(oset[j])->otype))
264	+	addobject(&cukid, oset[j]);
265		octkid(ot, i) = cukid.cutree;
266		}
267		cu->cutree = ot;

Diff Legend

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