ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/mesh.h
(Generate patch)

Comparing ray/src/common/mesh.h (file contents):
Revision 2.6 by greg, Fri Jun 20 00:25:49 2003 UTC vs.
Revision 2.10 by greg, Tue Aug 26 04:24:26 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 "copyright.h"
14 –
15 – #include "lookup.h"
16 –
16   #ifndef BYTE
17   #define BYTE    unsigned char
18   #endif
# Line 68 | 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 79 | Line 78 | typedef struct mesh {
78          int             nref;           /* reference count */
79          int             ldflags;        /* what we've loaded */
80          CUBE            mcube;          /* bounds and octree */
81 <        FLOAT           uvlim[2][2];    /* local coordinate extrema */
81 >        RREAL           uvlim[2][2];    /* local coordinate extrema */
82          OBJECT          mat0;           /* base material index */
83          OBJECT          nmats;          /* number of materials */
84          MESHPATCH       *patch;         /* mesh patch list */
# Line 106 | Line 105 | typedef struct {
105          int             fl;             /* setting flags */
106          FVECT           v;              /* vertex location */
107          FVECT           n;              /* vertex normal */
108 <        FLOAT           uv[2];          /* local coordinates */
108 >        RREAL           uv[2];          /* local coordinates */
109   } MESHVERT;
110  
111                                  /* mesh format identifier */

Diff Legend

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