diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h index 9bdd204b..19a33c65 100644 --- a/vcg/math/matrix44.h +++ b/vcg/math/matrix44.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.23 2005/03/15 11:40:56 cignoni +Added operator*=( std::vector ...) to apply a matrix to a vector of vertexes (replacement of the old style mesh.Apply(tr). + Revision 1.22 2004/12/15 18:45:50 tommyfranken *** empty log message *** @@ -386,7 +389,7 @@ template void Matrix44::operator*=( const Matrix44 & m ) { } template < class PointType , class T > void operator*=( std::vector &vert, const Matrix44 & m ) { - std::vector::iterator ii; + typename std::vector::iterator ii; for(ii=vert.begin();ii!=vert.end();++ii) (*ii).P()=m * (*ii).P(); } diff --git a/wrap/io_trimesh/import_ply.h b/wrap/io_trimesh/import_ply.h index 5660aa60..9d5ea397 100644 --- a/wrap/io_trimesh/import_ply.h +++ b/wrap/io_trimesh/import_ply.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.12 2005/02/08 17:28:22 tarini +changed 120 "const static" to "static const", and added missing "format" fields to all PropDescriptor literals, to keep Mingw compiler happy + Revision 1.11 2005/01/03 10:35:47 cignoni Improved the compatibility for ply format for faces having the list size (e.g. number of vertexes of a face) as a char instead of a uchar. Added a couple of new face descriptors, corrected a bug in error reporting function (and restructured) and translated a few comments. @@ -69,6 +72,7 @@ Initial commit #include #include #include +#include #include namespace vcg { diff --git a/wrap/ply/plystuff.h b/wrap/ply/plystuff.h index 7005440e..4b91bdca 100644 --- a/wrap/ply/plystuff.h +++ b/wrap/ply/plystuff.h @@ -31,6 +31,9 @@ of Greg Turk and on the work of Claudio Rocchini History $Log: not supported by cvs2svn $ +Revision 1.2 2005/03/15 11:46:52 cignoni +Cleaning of the automatic bbox caching support for ply files. First working version. + */ @@ -43,22 +46,24 @@ $Log: not supported by cvs2svn $ #include #include #include -#include #include #include using namespace vcg; #ifdef WIN32 +#include #define pb_mkdir(n) _mkdir(n) #define pb_access _access #define pb_stat _stat +#define pb_fstat _fstat #define pb_open _open #define pb_close _close #else #define pb_mkdir(n) mkdir(n,0) #define pb_access access #define pb_stat stat +#define pb_fstat fstat #define pb_open open #define pb_close close #endif @@ -118,14 +123,14 @@ bool CheckCacheTime( const char * fname, const char * cname ) h = pb_open(fname,_O_BINARY|_O_RDONLY); if(h==0) return false; - r = _fstat(h,&st); + r = pb_fstat(h,&st); pb_close(h); if(r==-1) return false; ft = st.st_mtime; h = pb_open(cname,_O_BINARY|_O_RDONLY); if(h==0) return false; - r = _fstat(h,&st); + r = pb_fstat(h,&st); //_read(h,&box,sizeof(box)); pb_close(h); if(r==-1) return false;