--- ray/src/ot/cvmesh.h 2003/03/11 17:08:55 2.1 +++ ray/src/ot/cvmesh.h 2003/03/14 21:27:46 2.2 @@ -1,4 +1,4 @@ -/* RCSid $Id: cvmesh.h,v 2.1 2003/03/11 17:08:55 greg Exp $ */ +/* RCSid $Id: cvmesh.h,v 2.2 2003/03/14 21:27:46 greg Exp $ */ /* * Header for Radiance triangle mesh conversion * @@ -20,15 +20,20 @@ extern int cvpoly(); extern int cvtri(); extern void cvmeshbounds(); extern MESH *cvmesh(); +void wfreadobj(); #else extern MESH *cvinit(char *nm); -extern int cvpoly(int n, FVECT *vp, FVECT *vn, FLOAT (*vc)[2]); -extern int cvtri(FVECT vp1, FVECT vp2, FVECT vp3, +extern int cvpoly(OBJECT mo, int n, FVECT *vp, + FVECT *vn, FLOAT (*vc)[2]); +extern int cvtri(OBJECT mo, FVECT vp1, FVECT vp2, FVECT vp3, FVECT vn1, FVECT vn2, FVECT vn3, FLOAT vc1[2], FLOAT vc2[2], FLOAT vc3[2]); extern void cvmeshbounds(void); extern MESH *cvmesh(void); + /* defined in wfconv.c */ +void wfreadobj(char *objfn); + #endif /* NOPROTO */