[ViewVC] Diff of: radiance/ray/src/common/mesh.h

Comparing ray/src/common/mesh.h (file contents):
Revision 2.8 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.11 by greg, Thu Sep 18 16:53:53 2003 UTC

#	Line 6 \| Line 6
6		*/
7		#ifndef _RAD_MESH_H_
8		#define _RAD_MESH_H_
9	+
10	+	#include "lookup.h"
11	+
12		#ifdef __cplusplus
13		extern "C" {
14		#endif
15
13	–	#include "lookup.h"
14	–
16		#ifndef BYTE
17		#define BYTE unsigned char
18		#endif
#	Line 49 \| Line 50 \| extern "C" {
50		typedef struct {
51		uint32 (xyz)[3]; / up to 256 patch vertices */
52		int32 norm; / vertex normals */
53	<	uint32 (uv)[2]; / vertex local coordinates */
53	>	uint16 (uv)[2]; / vertex local coordinates */
54		struct PTri {
55		BYTE v1, v2, v3; /* local vertices */
56		} tri; / local triangles */
#	Line 66 \| Line 67 \| typedef struct {
67		BYTE v3; /* local vertex */
68		} j2tri; / double joiner triangles */
69		short nverts; /* vertex count */
70	<	short ntris; /* triangle count */
70	>	short ntris; /* local triangle count */
71		short nj1tris; /* joiner triangle count */
72		short nj2tris; /* double joiner triangle count */
73		} MESHPATCH;
#	Line 110 \| Line 111 \| typedef struct {
111		/* mesh format identifier */
112		#define MESHFMT "Radiance_tmesh"
113		/* magic number for mesh files */
114	<	#define MESHMAGIC ( 1 MAXOBJSIZ+311) / increment first value */
114	>	#define MESHMAGIC ( 2 MAXOBJSIZ+311) / increment first value */
115
116
117		extern MESH getmesh(char mname, int flags);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines