ViewVC Help

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

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

Comparing ray/src/common/readmesh.c (file contents):
Revision 2.3 by schorsch, Thu Jun 5 19:29:34 2003 UTC vs.
Revision 2.5 by schorsch, Sun Jun 8 12:03:09 2003 UTC

#	Line 6 | Line 6 | static const char RCSid[] = "$Id$";
6		*/
7
8		#include  "standard.h"
9	+	#include  "platform.h"
10		#include  "octree.h"
11		#include  "object.h"
12		#include  "mesh.h"
13	+	#include  "resolu.h"
14
15		static char     *meshfn;        /* input file name */
16		static FILE     *meshfp;        /* mesh file pointer */
#	Line 73 | Line 75 | gettree()                              /* get a pre-ordered octree */
75		register int  i;
76
77		switch (getc(meshfp)) {
78	<	case OT_EMPTY:
79	<	return(EMPTY);
80	<	case OT_FULL:
81	<	return(getfullnode());
82	<	case OT_TREE:
83	<	if ((ot = octalloc()) == EMPTY)
84	<	mesherror(SYSTEM, "out of tree space in readmesh");
85	<	for (i = 0; i < 8; i++)
86	<	octkid(ot, i) = gettree();
87	<	return(ot);
88	<	case EOF:
89	<	mesherror(USER, "truncated mesh octree");
90	<	default:
91	<	mesherror(USER, "damaged mesh octree");
78	>	case OT_EMPTY:
79	>	return(EMPTY);
80	>	case OT_FULL:
81	>	return(getfullnode());
82	>	case OT_TREE:
83	>	if ((ot = octalloc()) == EMPTY)
84	>	mesherror(SYSTEM, "out of tree space in readmesh");
85	>	for (i = 0; i < 8; i++)
86	>	octkid(ot, i) = gettree();
87	>	return(ot);
88	>	case EOF:
89	>	mesherror(USER, "truncated mesh octree");
90	>	default:
91	>	mesherror(USER, "damaged mesh octree");
92		}
93	+	return NULL; /* pro forma return */
94		}
95
96

Diff Legend

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