diff --git a/apps/test/trimesh/main.cpp b/apps/test/trimesh/main.cpp index ef499246..0810c742 100644 --- a/apps/test/trimesh/main.cpp +++ b/apps/test/trimesh/main.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -17,6 +18,7 @@ #include #include #include +#include #include using namespace vcg; @@ -42,28 +44,39 @@ int main(int argc, char *argv[]) printf("Sizeof(FaceFN) = %i \n",sizeof(FaceFN)); //printf("Sizeof(FaceFA) = %i \n",sizeof(FaceFA)); - //typedef tri::TriMesh< vector, vector< FaceFN > > MyMesh; - //MyMesh tm; - //tri::Tetrahedron(tm); - + typedef tri::TriMesh< vector, vector< FaceFN > > MyMesh; + MyMesh tm; + tri::Tetrahedron(tm); + tri::io::ExporterPLY::Save(tm,"Tetrabin.ply"); + tri::Octahedron(tm); + tri::io::ExporterPLY::Save(tm,"Octbin.ply"); + tri::Icosahedron(tm); + tri::io::ExporterPLY::Save(tm,"Icobin.ply"); + //tri::io::ExporterSTL::Save(tm,"Tetra.stl",false); //tri::io::ExporterPLY::Save(tm,"Tetraascii.ply",false); - //tri::io::ExporterPLY::Save(tm,"Tetrabin.ply"); //tri::io::ExporterSTL::Save(tm,"armawarp.stl",false); //tri::UpdateNormals::PerVertexNormalized(tm); //tri::UpdateNormals::PerFaceNormalized(tm); //tri::UpdateNormals::PerVertex(tm); //tri::UpdateNormals::PerFace(tm); - tri::io::ImporterPLY::Open(ta,"bigtest.ply"); + /*tri::io::ImporterPLY::Open(ta,"bigtest.ply"); printf("Loaded Mesh Has %i vn %i fn\n",ta.vn,ta.fn); tri::UpdateTopology::FaceFace(ta); tri::UpdateFlags::FaceBorderFromFF(ta); tri::UpdateColor::FaceBF(ta); tri::io::PlyInfo pi; pi.mask=tri::io::PLYMask::PM_FACECOLOR; - tri::io::ExporterPLY::Save(ta,"color.ply",true, pi); - + tri::io::ExporterPLY::Save(ta,"color.ply",true, pi);*/ + + face::Pos fp; + + tri::io::ImporterSTL::Open(ta,"knotbin.stl"); + tri::io::ExporterPLY::Save(ta,"knotbin.ply"); + + tri::io::ImporterSTL::Open(ta,"knotasc.stl"); + tri::io::ExporterPLY::Save(ta,"knotasc.ply"); return 0; } \ No newline at end of file diff --git a/docs/Doxygen/namespaces.dxy b/docs/Doxygen/namespaces.dxy index d1a6566d..b6d1fcfa 100644 --- a/docs/Doxygen/namespaces.dxy +++ b/docs/Doxygen/namespaces.dxy @@ -1 +1 @@ - /** Main namespace */ namespace vcg {} /** Everything about meshes lie in this namespace */ namespace vcg::tri {} /** Wrapper for symbols and structs defind in the old ply library */ namespace vcg::ply {} /** For all the functions and classes used to read and write meshes */ namespace vcg::tri::io {} \ No newline at end of file + /** Main namespace. It contain all the other namespaces and */ namespace vcg {} /** Everything about meshes lie in this namespace */ namespace vcg::tri {} /** Global algorithms and classes working on generic faces are defined in this namespace. Typical example are the topological surgery functions (like vcg::face::Detach and vcg::face::IsBorder) and the class vcg::face::Pos for defining \e positions over a mesh. Note that for sake of brevity the main face class is defined outside this namespace. */ namespace vcg::face {} /** Wrapper for symbols and structs defind in the old ply library */ namespace vcg::ply {} /** For all the functions and classes used to read and write meshes */ namespace vcg::tri::io {} /** For all the generic math functions and classes. */ namespace vcg::math {} \ No newline at end of file diff --git a/docs/StyleGuide.html b/docs/StyleGuide.html index 199e7fa6..a4211d8d 100644 --- a/docs/StyleGuide.html +++ b/docs/StyleGuide.html @@ -123,6 +123,8 @@ Construct to build an object from different a integral type.

Comment and documenting

-

All the classes, algorithms and functions MUST be documented using Doxygen. Please add a short intro before each class explaining design choices and for non trivial classes give some short usage example. For complex classes try to group similar members under categories. Non trivial algorithms should refer the paper/book where they are explained.

+

All the classes, algorithms and functions MUST be documented using Doxygen. Please add a short intro before each class explaining design choices and for non trivial classes give some short usage example. For complex classes try to group similar members under categories. Non trivial algorithms should refer the paper/book where they are explained.

+

Namespaces and files should be also documented trying to explain how the file/namespace partitioning works. +

\ No newline at end of file diff --git a/vcg/complex/trimesh/base.h b/vcg/complex/trimesh/base.h index 45bfbe08..79be7d02 100644 --- a/vcg/complex/trimesh/base.h +++ b/vcg/complex/trimesh/base.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.4 2004/03/10 00:57:44 cignoni +minor changes + Revision 1.3 2004/03/07 21:54:56 cignoni some more reflection functions @@ -47,6 +50,8 @@ People should subclass his vertex class from these one... namespace vcg { namespace tri { +/** \addtogroup trimesh */ +/*@{*/ /** Class Mesh. This is class for definition of a mesh. @@ -238,7 +243,7 @@ ScalarType Volume() }; // end class Mesh - +/*@}*/ } // end namespace } // end namespace diff --git a/vcg/simplex/face/topology.h b/vcg/simplex/face/topology.h index b5067a34..0f5f3831 100644 --- a/vcg/simplex/face/topology.h +++ b/vcg/simplex/face/topology.h @@ -23,7 +23,7 @@ /**************************************************************************** History -$LOG$ +$Log: not supported by cvs2svn $ ****************************************************************************/ @@ -62,7 +62,7 @@ inline bool IsBorder(FaceType const & f, const int j ) } -/// This function counts the boreders of the face +/// Count border edges of the face template inline int BorderCount(FaceType const & f) { @@ -78,7 +78,7 @@ inline int BorderCount(FaceType const & f) } -/// This function counts the number of incident faces in a complex edge +/// Counts the number of incident faces in a complex edge template inline int ComplexSize(FaceType const & f, const int e) {