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.5 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.6 by greg, Fri Jun 20 00:25:49 2003 UTC

#	Line 14 | Line 14 | extern "C" {
14
15		#include "lookup.h"
16
17	–	#ifndef uint4
18	–	#define uint4   unsigned int4
19	–	#endif
17		#ifndef BYTE
18		#define BYTE    unsigned char
19		#endif
#	Line 52 | Line 49 | extern "C" {
49
50		/* A triangle mesh patch */
51		typedef struct {
52	<	uint4           (*xyz)[3];      /* up to 256 patch vertices */
53	<	int4            *norm;          /* vertex normals */
54	<	uint4           (*uv)[2];       /* vertex local coordinates */
52	>	uint32          (*xyz)[3];      /* up to 256 patch vertices */
53	>	int32           *norm;          /* vertex normals */
54	>	uint32          (*uv)[2];       /* vertex local coordinates */
55		struct PTri {
56		BYTE            v1, v2, v3;     /* local vertices */
57		}               *tri;           /* local triangles */
58		short           solemat;        /* sole material */
59	<	int2            *trimat;        /* or local material indices */
59	>	int16           *trimat;        /* or local material indices */
60		struct PJoin1 {
61	<	int4            v1j;            /* non-local vertex */
62	<	int2            mat;            /* material index */
61	>	int32           v1j;            /* non-local vertex */
62	>	int16           mat;            /* material index */
63		BYTE            v2, v3;         /* local vertices */
64		}               *j1tri;         /* joiner triangles */
65		struct PJoin2 {
66	<	int4            v1j, v2j;       /* non-local vertices */
67	<	int2            mat;            /* material index */
66	>	int32           v1j, v2j;       /* non-local vertices */
67	>	int16           mat;            /* material index */
68		BYTE            v3;             /* local vertex */
69		}               *j2tri;         /* double joiner triangles */
70		short           nverts;         /* vertex count */
#	Line 120 | Line 117 | typedef struct {
117
118		extern MESH     *getmesh(char *mname, int flags);
119		extern MESHINST *getmeshinst(OBJREC *o, int flags);
120	<	extern int      getmeshtrivid(int4 tvid[3], OBJECT *mo,
120	>	extern int      getmeshtrivid(int32 tvid[3], OBJECT *mo,
121		MESH *mp, OBJECT ti);
122	<	extern int      getmeshvert(MESHVERT *vp, MESH *mp, int4 vid, int what);
122	>	extern int      getmeshvert(MESHVERT *vp, MESH *mp, int32 vid, int what);
123		extern int      getmeshtri(MESHVERT tv[3], OBJECT *mo,
124		MESH *mp, OBJECT ti, int what);
125		extern OBJREC   *getmeshpseudo(MESH *mp, OBJECT mo);
126	<	extern int4     addmeshvert(MESH *mp, MESHVERT *vp);
126	>	extern int32    addmeshvert(MESH *mp, MESHVERT *vp);
127		extern OBJECT   addmeshtri(MESH *mp, MESHVERT tv[3], OBJECT mo);
128		extern char     *checkmesh(MESH *mp);
129		extern void     printmeshstats(MESH *ms, FILE *fp);

Diff Legend

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