First working version of optional sample

apps/sample/trimesh_optional/trimesh_optional.cpp

@@ -0,0 +1,82 @@
+#include <stdio.h>
+#include <time.h>
+
+#include<vcg/simplex/vertexplus/base.h>
+#include<vcg/simplex/faceplus/base.h>
+#include<vcg/simplex/face/topology.h>
+
+#include<vcg/simplex/vertexplus/component_ocf.h>
+#include<vcg/simplex/faceplus/component_ocf.h>
+
+#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/trimesh/create/platonic.h>
+#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/trimesh/update/flag.h>
+#include<vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/trimesh/refine.h>
+
+using namespace vcg;
+using namespace std;
+
+
+
+class CEdge;    // dummy prototype never used
+class CFace;
+class CFaceOcf;
+class CVertex;
+class CVertexOcf;
+
+// Opt stuff
+
+class CVertex     : public VertexSimp2< CVertex,    CEdge, CFace,    vert::Coord3f, vert::Normal3f >{};
+class CVertexOcf  : public VertexSimp2< CVertexOcf, CEdge, CFaceOcf, vert::Coord3f, vert::Normal3f >{};
+
+class CFace       : public FaceSimp2< CVertex,    CEdge, CFace,                   face::FFAdj,    face::VertexRef, face::Flag, face::Normal3f > {};
+class CFaceOcf    : public FaceSimp2< CVertexOcf, CEdge, CFaceOcf, face::InfoOcf, face::FFAdjOcf, face::VertexRef, face::Flag, face::Normal3fOcf > {};
+
+class CMeshOcf    : public vcg::tri::TriMesh< vector<CVertexOcf>, face::vector_ocf<CFaceOcf> > {};
+class CMesh       : public vcg::tri::TriMesh< vector<CVertex   >,           vector<CFace   > > {};
+
+
+int main(int , char **)
+{
+  CMesh cm;
+  CMeshOcf cmo;
+  tri::Tetrahedron(cm);
+  tri::Tetrahedron(cmo);
+  
+  printf("Generated mesh has %i vertices and %i triangular faces\n",cm.vn,cm.fn);
+  
+  /// Calculates both vertex and face normals.
+  /// The normal of a vertex v is the weigthed average of the normals of the faces incident on v.
+  /// normals are not normalized
+
+ 
+
+  cmo.face.EnableFFAdjacency();
+ 
+  vcg::tri::UpdateTopology<CMesh   >::FaceFace(cm);
+  vcg::tri::UpdateTopology<CMeshOcf>::FaceFace(cmo);
+	
+  vcg::tri::UpdateFlags<CMesh   >::FaceBorderFromFF(cm);
+	vcg::tri::UpdateFlags<CMeshOcf>::FaceBorderFromFF(cmo);
+
+	vcg::tri::UpdateNormals<CMesh   >::PerVertexNormalized(cm);
+	vcg::tri::UpdateNormals<CMeshOcf>::PerVertexNormalized(cmo);
+
+  printf("Size of CFace            %3i\n",sizeof(CFace));
+  printf("Size of CFaceOcf         %3i\n",sizeof(CFaceOcf));
+
+  printf("Normal of face 0 is %f %f %f\n\n",cm.face[0].N()[0],cm.face[0].N()[1],cm.face[0].N()[2]);
+  int t0=0,t1=0,t2=0;
+  while(t2-t0<3000)
+  {
+    t0=clock();
+    Refine(cm,MidPointButterfly<CMesh>(),0); 
+    t1=clock();
+    Refine(cmo,MidPointButterfly<CMeshOcf>(),0); 
+    t2=clock();
+    printf("Mesh is %i %i in Std:%i Ocf:%i\n",cm.vn,cm.fn,t1-t0,t2-t1);
+  }
+  return 0;
+}

apps/sample/trimesh_optional/trimesh_optional.pro

@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.00a) ven 24. giu 14:14:20 2005
+######################################################################
+#  To solve issue related to slash vs. backslash under cygwin try:
+#  env MINGW_IN_SHELL=1 qmake -spec win32-g++ 
+
+TARGET = trimesh_optional
+LIBPATH += 
+DEPENDPATH += . 
+INCLUDEPATH += . ../../..
+CONFIG += console stl
+TEMPLATE = app
+SOURCES += trimesh_optional.cpp ../../../wrap/ply/plylib.cpp

apps/sample/trimesh_topology/trimesh_topology.cpp

@@ -2,6 +2,7 @@
 
 #include<vcg/simplex/vertex/vertex.h>
 #include<vcg/simplex/face/with/affm.h>
+#include<vcg/simplex/face/topology.h>
 #include<vcg/complex/trimesh/base.h>
 #include<vcg/complex/trimesh/create/platonic.h>
 
@@ -34,14 +35,14 @@ int main(int ,char ** ){
 
   // Now for each face the F() members are meaningful
   
-  if(m.face[0].IsBorder(0)) printf("Edge 0 of face 0 is a border\n");
+  if(face::IsBorder(m.face[0],0)) printf("Edge 0 of face 0 is a border\n");
                        else printf("Edge 0 of face 0 is NOT a border\n"); // always this path!
 
   vcg::face::FFDetach<MyFace>(m.face[0],0);  // Detach the face [0] from the mesh
   vcg::face::FFDetach<MyFace>(m.face[0],1);
   vcg::face::FFDetach<MyFace>(m.face[0],2);
 
-  if(m.face[0].IsBorder(0)) printf("Edge 0 of face 0 is a border\n"); // always this path!
+  if(face::IsBorder(m.face[0],0)) printf("Edge 0 of face 0 is a border\n"); // always this path!
                        else printf("Edge 0 of face 0 is NOT a border\n"); 
 
   m.face[0].SetD(); // deleting face [0] (i.e. marked as deleted) 
@@ -59,7 +60,7 @@ int main(int ,char ** ){
 			{	
 				for(int j=0;j<3;j++)
 				{
-					if ((*fi).IsBorder(j) && !m.IsMarked(&*fi))
+					if ( face::IsBorder(*fi,j) && !m.IsMarked(&*fi))
             {
               m.Mark(&*fi);
               hei.Set(&*fi,j,fi->V(j));