From 8844ade1643e51dbe01b3dceee48236ad9fffdab Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Mon, 30 Nov 2009 10:00:55 +0000
Subject: [PATCH] vcg mesh face normals support added

---
 src/fgt/filter_physics/ODEFacade.cpp    | 8 +++++---
 src/fgt/filter_physics/ODEFacade.h      | 4 +++-
 src/fgt/filter_physics/filter_physics.h | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/fgt/filter_physics/ODEFacade.cpp b/src/fgt/filter_physics/ODEFacade.cpp
index 81fa8ba49..19ac1d757 100644
--- a/src/fgt/filter_physics/ODEFacade.cpp
+++ b/src/fgt/filter_physics/ODEFacade.cpp
@@ -48,6 +48,7 @@ void ODEFacade::registerTriMesh(MeshModel& mesh, bool scenery){
 
     ODEMesh* odeMesh = new ODEMesh();
     odeMesh->vertices = new dReal[mesh.cm.vert.size()][3];
+    odeMesh->normals = new dReal[mesh.cm.face.size()][3];
     odeMesh->indices = new dTriIndex[mesh.cm.face.size()][3];
 
     int i = 0;
@@ -58,14 +59,15 @@ void ODEFacade::registerTriMesh(MeshModel& mesh, bool scenery){
     }
 
     i = 0;
-    for(CMeshO::ConstFaceIterator fi = mesh.cm.face.begin(); fi != mesh.cm.face.end(); fi++, i++){
+    for(CMeshO::FaceIterator fi = mesh.cm.face.begin(); fi != mesh.cm.face.end(); fi++, i++){
         for(int j = 0; j < 3; j++){
             odeMesh->indices[i][j] = fi->V(j) - &mesh.cm.vert[0];
+            odeMesh->normals[i][j] = fi->N()[j];
         }
     }
 
     odeMesh->data = dGeomTriMeshDataCreate();
-    dGeomTriMeshDataBuildSingle(odeMesh->data, odeMesh->vertices, 3*sizeof(dReal), mesh.cm.vert.size(), odeMesh->indices, 3*mesh.cm.face.size(), 3*sizeof(dTriIndex));
+    dGeomTriMeshDataBuildSingle1(odeMesh->data, odeMesh->vertices, 3*sizeof(dReal), mesh.cm.vert.size(), odeMesh->indices, 3*mesh.cm.face.size(), 3*sizeof(dTriIndex), odeMesh->normals);
 
     odeMesh->geom = dCreateTriMesh(m_space, odeMesh->data, 0, 0, 0);
 
@@ -167,7 +169,7 @@ void ODEFacade::collisionCallback(dGeomID o1, dGeomID o2){
 
     for(int i = 0; i < m_maxContacts; i++){
         contacts[i].surface.mode = dContactBounce | dContactSoftCFM;
-        contacts[i].surface.mu = dInfinity;
+        contacts[i].surface.mu = 0.5;
         contacts[i].surface.bounce = 0.1;
         contacts[i].surface.bounce_vel = 0.1;
         contacts[i].surface.soft_cfm = 0.01;
diff --git a/src/fgt/filter_physics/ODEFacade.h b/src/fgt/filter_physics/ODEFacade.h
index 0313d4e52..eb818d602 100644
--- a/src/fgt/filter_physics/ODEFacade.h
+++ b/src/fgt/filter_physics/ODEFacade.h
@@ -30,11 +30,12 @@ protected:
 
     private:
         struct ODEMesh{
-            ODEMesh() : body(0), vertices(0), indices(0){
+            ODEMesh() : body(0), vertices(0), normals(0), indices(0){
             }
 
             ~ODEMesh(){
                 delete[] vertices;
+                delete[] normals;
                 delete[] indices;
             }
 
@@ -44,6 +45,7 @@ protected:
 
             dTriMeshDataID data;
             dReal (*vertices)[3];
+            dReal (*normals)[3];
             dTriIndex (*indices)[3];
         };
 
diff --git a/src/fgt/filter_physics/filter_physics.h b/src/fgt/filter_physics/filter_physics.h
index 053f9d1df..7a84d84f8 100644
--- a/src/fgt/filter_physics/filter_physics.h
+++ b/src/fgt/filter_physics/filter_physics.h
@@ -29,14 +29,14 @@ class FilterPhysics : public QObject, public MeshFilterInterface
     virtual QString filterName(FilterIDType filter) const;
     virtual QString filterInfo(FilterIDType filter) const;
 
-    virtual const int getRequirements(QAction*){return MeshModel::MM_FACEVERT;}
+    virtual int getRequirements(QAction*){return MeshModel::MM_FACEVERT | MeshModel::MM_FACENORMAL;}
     virtual int postCondition( QAction* ) const{return MeshModel::MM_TRANSFMATRIX;}
 
     virtual bool autoDialog(QAction*) {return true;}
     virtual void initParameterSet(QAction*, MeshDocument&, RichParameterSet&);
     virtual bool applyFilter(QAction* filter, MeshDocument &md, RichParameterSet& par, vcg::CallBackPos* cb);
     virtual bool applyFilter(QAction*, MeshModel&, RichParameterSet&, vcg::CallBackPos*) { assert(0); return false;}
-    virtual const FilterClass getClass(QAction *);
+    virtual FilterClass getClass(QAction *);
 
     private:
     GravitySubFilter m_gravityFilter;