ViewVC Help

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

root/Development/ray/src/common/mesh.h

Comparing ray/src/common/mesh.h (file contents):
Revision 2.13 by greg, Fri Dec 3 18:36:17 2004 UTC vs.
Revision 2.15 by greg, Tue Nov 6 01:04:23 2012 UTC

#	Line 13 | Line 13
13		extern "C" {
14		#endif
15
16	<	#ifndef BYTE
17	<	#define BYTE    unsigned char
16	>	#ifndef uby8
17	>	#define uby8    unsigned char
18		#endif
19
20		/*
#	Line 53 | Line 53 | typedef struct {
53		int32           *norm;          /* vertex normals */
54		uint32          (*uv)[2];       /* vertex local coordinates */
55		struct PTri {
56	<	BYTE            v1, v2, v3;     /* local vertices */
56	>	uby8            v1, v2, v3;     /* local vertices */
57		}               *tri;           /* local triangles */
58		short           solemat;        /* sole material */
59		int16           *trimat;        /* or local material indices */
60		struct PJoin1 {
61		int32           v1j;            /* non-local vertex */
62		int16           mat;            /* material index */
63	<	BYTE            v2, v3;         /* local vertices */
63	>	uby8            v2, v3;         /* local vertices */
64		}               *j1tri;         /* joiner triangles */
65		struct PJoin2 {
66		int32           v1j, v2j;       /* non-local vertices */
67		int16           mat;            /* material index */
68	<	BYTE            v3;             /* local vertex */
68	>	uby8            v3;             /* local vertex */
69		}               *j2tri;         /* double joiner triangles */
70		short           nverts;         /* vertex count */
71		short           ntris;          /* local triangle count */
#	Line 117 | Line 117 | typedef struct {
117
118		extern MESH     *getmesh(char *mname, int flags);
119		extern MESHINST *getmeshinst(OBJREC *o, int flags);
120	+	extern int      nextmeshtri(OBJECT *tip, MESH *mp);
121		extern int      getmeshtrivid(int32 tvid[3], OBJECT *mo,
122		MESH *mp, OBJECT ti);
123		extern int      getmeshvert(MESHVERT *vp, MESH *mp, int32 vid, int what);

Diff Legend

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