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

Comparing ray/src/common/objutil.h (file contents):
Revision 2.8 by greg, Tue Jun 23 19:29:40 2020 UTC vs.
Revision 2.12 by greg, Wed Mar 3 18:53:08 2021 UTC

# Line 17 | Line 17
17   #define POPEN_SUPPORT           1       /* support "!command" i/o */
18   #endif
19                                          /* face flags */
20 < #define FACE_SELECTED           01
21 < #define FACE_DEGENERATE         02
22 < #define FACE_DUPLICATE          04
20 > #define FACE_DEGENERATE         01
21 > #define FACE_DUPLICATE          02
22 > #define FACE_SELECTED           04
23 > #define FACE_CUSTOM(n)          (FACE_SELECTED<<(n))
24  
25   struct Face;                            /* forward declaration */
26  
# Line 88 | Line 89 | Scene *                newScene(void);
89   /* Add a .OBJ file to a scene */
90   Scene *         loadOBJ(Scene *sc, const char *fspec);
91  
92 < /* Duplicate a scene */
93 < Scene *         dupScene(const Scene *sc);
92 > /* Duplicate a scene, optionally selecting faces */
93 > Scene *         dupScene(const Scene *sc, int flreq, int flexc);
94  
95   /* Transform entire scene */
96   int             xfScene(Scene *sc, int xac, char *xav[]);
# Line 176 | Line 177 | void           setMaterial(Scene *sc, const char *nm);
177   /* Add a new face to our scene, using current group and material */
178   Face *          addFace(Scene *sc, VNDX vid[], int nv);
179  
180 + /* Delete unreferenced vertices, normals, texture coords */
181 + void            deleteUnreferenced(Scene *sc);
182 +
183   /* Free a scene */
184   void            freeScene(Scene *sc);
185  
# Line 188 | Line 192 | extern int      verbose;
192   extern char     *emalloc(unsigned int n);
193   extern char     *ecalloc(unsigned int ne, unsigned int n);
194   extern char     *erealloc(char *cp, unsigned int n);
195 < extern void     efree(char *cp);
195 > extern void     efree(char *cp);
196 >
197 > #define getGroupID(sc,nm)       findName(nm, (const char **)(sc)->grpname, (sc)->ngrps)
198 > #define getMaterialID(sc,nm)    findName(nm, (const char **)(sc)->matname, (sc)->nmats)
199  
200   #define CHUNKSIZ        128     /* object allocation chunk size */
201  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines