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

Comparing ray/src/common/mesh.h (file contents):
Revision 2.1 by greg, Tue Mar 11 17:08:55 2003 UTC vs.
Revision 2.9 by schorsch, Mon Jul 14 22:23:59 2003 UTC

# Line 4 | Line 4
4   *
5   *  Include after standard.h, object.h and octree.h
6   */
7 + #ifndef _RAD_MESH_H_
8 + #define _RAD_MESH_H_
9  
10 < #include "copyright.h"
10 > #include "lookup.h"
11  
12 < #ifndef uint4
13 < #define uint4   unsigned int4
12 > #ifdef __cplusplus
13 > extern "C" {
14   #endif
15 +
16   #ifndef BYTE
17   #define BYTE    unsigned char
18   #endif
# Line 26 | Line 29
29   * never generates 0, so we can use this for unspecified normals.
30   *
31   * Vertex ID's are encoded using the bottom 8 bits of a 4-byte integer
32 < * to index a vertex in a patch indicated by the 20 bits above (9-29).
33 < * For triangle ID's, the top 10 bits (11-31) indicate the patch, and
34 < * the 10th bit indicates whether the triangle joins patches.
32 > * to index a vertex in a patch indicated by the 22 bits above (8-29).
33 > * For triangle ID's, the top 22 bits (10-31) indicate the patch, and
34 > * the bit 9 (0x200) indicates whether the triangle joins patches.
35   * If not, then the bottom 9 bits index into the local PTri array.
36 < * If it's a joiner, then the 9th bit indicates whether the triangle joins
36 > * If it's a joiner, then the 8th bit indicates whether the triangle joins
37   * two patches, in which case the bottom 8 bits index the PJoin2 array.
38   * Otherwise, the bottom 8 bits index the PJoin1 array.
39   *
# Line 40 | Line 43
43   * a lot of effort, but it can reduce mesh storage by a factor of 3
44   * or more.  This is important, as the whole point is to model very
45   * complicated geometry with this structure, and memory is the main
46 < * limitation.  (We also optimize intersection tests for triangles.)
46 > * limitation.
47   */
48  
49   /* A triangle mesh patch */
50   typedef struct {
51 <        uint4           (*xyz)[3];      /* up to 256 patch vertices */
52 <        int4            *norm;          /* vertex normals */
53 <        uint4           (*uv)[2];       /* vertex local coordinates */
51 >        uint32          (*xyz)[3];      /* up to 256 patch vertices */
52 >        int32           *norm;          /* vertex normals */
53 >        uint32          (*uv)[2];       /* vertex local coordinates */
54          struct PTri {
55                  BYTE            v1, v2, v3;     /* local vertices */
56          }               *tri;           /* local triangles */
57 +        short           solemat;        /* sole material */
58 +        int16           *trimat;        /* or local material indices */
59          struct PJoin1 {
60 <                int4            v1j;            /* non-local vertex */
60 >                int32           v1j;            /* non-local vertex */
61 >                int16           mat;            /* material index */
62                  BYTE            v2, v3;         /* local vertices */
63          }               *j1tri;         /* joiner triangles */
64          struct PJoin2 {
65 <                int4            v1j, v2j;       /* non-local vertices */
65 >                int32           v1j, v2j;       /* non-local vertices */
66 >                int16           mat;            /* material index */
67                  BYTE            v3;             /* local vertex */
68          }               *j2tri;         /* double joiner triangles */
69          short           nverts;         /* vertex count */
# Line 71 | 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 */
85          int             npatches;       /* number of mesh patches */
86 <        char            *cdata;         /* opaque client data pointer */
86 >        OBJREC          *pseudo;        /* mesh pseudo objects */
87 >        LUTAB           lut;            /* vertex lookup table */
88          struct mesh     *next;          /* next mesh in list */
89   } MESH;
90  
# Line 95 | 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 */
112   #define MESHFMT         "Radiance_tmesh"
113                                  /* magic number for mesh files */
114 < #define MESHMAGIC       ( 0 *MAXOBJSIZ+311)     /* increment first value */
114 > #define MESHMAGIC       ( 1 *MAXOBJSIZ+311)     /* increment first value */
115  
106 – #ifdef NOPROTO
116  
108 – extern MESH     *getmesh();
109 – extern INSTANCE *getmeshinst();
110 – extern int      getmeshtrivid();
111 – extern int      getmeshvert();
112 – extern int      getmeshtri();
113 – extern int4     addmeshvert();
114 – extern OBJECT   addmeshtri();
115 – extern void     printmeshstats();
116 – extern void     freemesh();
117 – extern void     freemeshinst();
118 – extern void     readmesh();
119 – extern void     writemesh();
120 –
121 – #else
122 –
117   extern MESH     *getmesh(char *mname, int flags);
118   extern MESHINST *getmeshinst(OBJREC *o, int flags);
119 < extern int      getmeshtrivid(int4 tvid[3], MESH *mp, OBJECT ti);
120 < extern int      getmeshvert(MESHVERT *vp, MESH *mp, int4 vid, int what);
121 < extern int      getmeshtri(MESHVERT tv[3], MESH *mp, OBJECT ti, int what);
122 < extern int4     addmeshvert(MESH *mp, MESHVERT *vp);
123 < extern OBJECT   addmeshtri(MESH *mp, MESHVERT tv[3]);
119 > extern int      getmeshtrivid(int32 tvid[3], OBJECT *mo,
120 >                                MESH *mp, OBJECT ti);
121 > extern int      getmeshvert(MESHVERT *vp, MESH *mp, int32 vid, int what);
122 > extern int      getmeshtri(MESHVERT tv[3], OBJECT *mo,
123 >                                MESH *mp, OBJECT ti, int what);
124 > extern OBJREC   *getmeshpseudo(MESH *mp, OBJECT mo);
125 > extern int32    addmeshvert(MESH *mp, MESHVERT *vp);
126 > extern OBJECT   addmeshtri(MESH *mp, MESHVERT tv[3], OBJECT mo);
127 > extern char     *checkmesh(MESH *mp);
128   extern void     printmeshstats(MESH *ms, FILE *fp);
129   extern void     freemesh(MESH *ms);
130   extern void     freemeshinst(OBJREC *o);
131   extern void     readmesh(MESH *mp, char *path, int flags);
132   extern void     writemesh(MESH *mp, FILE *fp);
133  
134 < #endif /* NOPROTO */
134 >
135 > #ifdef __cplusplus
136 > }
137 > #endif
138 > #endif /* _RAD_MESH_H_ */
139 >

Diff Legend

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