From 32fe64bd8726ec8da8bfb32aeb6026a3185378dd Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Sun, 7 Feb 2010 13:58:57 +0000 Subject: [PATCH] Some compiler warnings removed --- src/fgt/filter_physics/DynamicMeshSubFilter.cpp | 8 ++++---- src/fgt/filter_physics/GravitySubFilter.cpp | 2 +- src/fgt/filter_physics/MeshSubFilter.cpp | 4 ++-- src/fgt/filter_physics/ODEFacade.cpp | 2 +- src/fgt/filter_physics/RandomDropFilter.cpp | 2 +- src/fgt/filter_physics/RandomFillFilter.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/fgt/filter_physics/DynamicMeshSubFilter.cpp b/src/fgt/filter_physics/DynamicMeshSubFilter.cpp index 355656342..c09d829e5 100644 --- a/src/fgt/filter_physics/DynamicMeshSubFilter.cpp +++ b/src/fgt/filter_physics/DynamicMeshSubFilter.cpp @@ -12,7 +12,7 @@ void DynamicMeshSubFilter::initParameterSet(QAction* action,MeshDocument& md, Ri par.addParam(new RichDynamicFloat("timeline", 0, 0, 100, "Timeline %", "Controls the timeline of the simulation")); } -bool DynamicMeshSubFilter::applyFilter(QAction* filter, MeshDocument &md, RichParameterSet& par, vcg::CallBackPos* cb){ +bool DynamicMeshSubFilter::applyFilter(QAction*, MeshDocument &md, RichParameterSet& par, vcg::CallBackPos* cb){ if(parametersAreNotCorrect(md, par)) return false; @@ -22,7 +22,7 @@ bool DynamicMeshSubFilter::applyFilter(QAction* filter, MeshDocument &md, RichPa return true; } -bool DynamicMeshSubFilter::parametersAreNotCorrect(MeshDocument& md, RichParameterSet& par){ +bool DynamicMeshSubFilter::parametersAreNotCorrect(MeshDocument&, RichParameterSet& par){ return par.getInt("seconds") < 0 || par.getInt("fps") <= 0 || par.getInt("iterations") <= 0 || par.getInt("contacts") <= 0 || par.getFloat("bounciness") < 0 || par.getFloat("bounciness") > 1; } @@ -35,8 +35,8 @@ bool DynamicMeshSubFilter::configurationHasChanged(MeshDocument& md, RichParamet changed |= m_gravity != par.getFloat("gravity"); changed |= m_friction != par.getFloat("friction"); - if(md.size() == m_files.size()) - for(int i = 0; i < m_files.size(); i++) + if(unsigned(md.size()) == m_files.size()) + for(unsigned i = 0; i < m_files.size(); i++) changed |= m_files.at(i) != md.getMesh(i)->fileName; else changed = true; diff --git a/src/fgt/filter_physics/GravitySubFilter.cpp b/src/fgt/filter_physics/GravitySubFilter.cpp index b02689b48..f6cc2735d 100644 --- a/src/fgt/filter_physics/GravitySubFilter.cpp +++ b/src/fgt/filter_physics/GravitySubFilter.cpp @@ -51,7 +51,7 @@ void GravitySubFilter::initialize(MeshDocument& md, RichParameterSet& par, vcg:: m_layersTrans.clear(); m_layersTrans.resize(md.size()); - for(int i = 0; i < m_layersTrans.size(); i++){ + for(unsigned i = 0; i < m_layersTrans.size(); i++){ m_layersTrans[i].reserve(m_steps); } diff --git a/src/fgt/filter_physics/MeshSubFilter.cpp b/src/fgt/filter_physics/MeshSubFilter.cpp index 99267b7d4..3f9f6facf 100644 --- a/src/fgt/filter_physics/MeshSubFilter.cpp +++ b/src/fgt/filter_physics/MeshSubFilter.cpp @@ -5,7 +5,7 @@ int MeshSubFilter::m_currentFilterType = 0; MeshSubFilter::MeshSubFilter(){ } -void MeshSubFilter::initParameterSet(QAction* action,MeshDocument& md, RichParameterSet & par){ +void MeshSubFilter::initParameterSet(QAction*, MeshDocument&, RichParameterSet & par){ par.addParam(new RichInt("fps", 100, "Frames per second", "The number of times per second the physics simulation is updated")); par.addParam(new RichInt("iterations", 20, "Physics method iterations", "The number of iterations of the iterative physics equation solver method")); par.addParam(new RichInt("contacts", 20, "Max contacts", "Maximum number of contact points to generate per object pair")); @@ -13,7 +13,7 @@ void MeshSubFilter::initParameterSet(QAction* action,MeshDocument& md, RichParam par.addParam(new RichFloat("friction", 10, "Friction", "The coulomb friction coefficient of a collision")); } -void MeshSubFilter::initialize(MeshDocument& md, RichParameterSet&, vcg::CallBackPos* cb){ +void MeshSubFilter::initialize(MeshDocument&, RichParameterSet&, vcg::CallBackPos*){ //TODO: Not working properly with meshlab for now; when the issue will be patched in meshlab, this code and the MM_TRANSFMATRIX // postCondition in filter_physics.h can be uncommented */ diff --git a/src/fgt/filter_physics/ODEFacade.cpp b/src/fgt/filter_physics/ODEFacade.cpp index 797c67260..4876f4864 100644 --- a/src/fgt/filter_physics/ODEFacade.cpp +++ b/src/fgt/filter_physics/ODEFacade.cpp @@ -170,7 +170,7 @@ void ODEFacade::collisionCallback(dGeomID o1, dGeomID o2){ dBodyID body1 = dGeomGetBody(o1); dBodyID body2 = dGeomGetBody(o2); - for(int i = 0; i < m_contacts.size(); i++){ + for(unsigned i = 0; i < m_contacts.size(); i++){ m_contacts[i].surface.mode = dContactBounce; m_contacts[i].surface.mu = m_friction; m_contacts[i].surface.bounce = m_bounciness; diff --git a/src/fgt/filter_physics/RandomDropFilter.cpp b/src/fgt/filter_physics/RandomDropFilter.cpp index ca69b571d..79f666a6f 100644 --- a/src/fgt/filter_physics/RandomDropFilter.cpp +++ b/src/fgt/filter_physics/RandomDropFilter.cpp @@ -84,7 +84,7 @@ void RandomDropFilter::initialize(MeshDocument& md, RichParameterSet& par, vcg:: m_layersTrans.clear(); m_layersTrans.resize(md.size()); - for(int i = 0; i < m_layersTrans.size(); i++){ + for(unsigned i = 0; i < m_layersTrans.size(); i++){ m_layersTrans[i].reserve(m_steps); } diff --git a/src/fgt/filter_physics/RandomFillFilter.cpp b/src/fgt/filter_physics/RandomFillFilter.cpp index c90a7d621..d1e7aa2c2 100644 --- a/src/fgt/filter_physics/RandomFillFilter.cpp +++ b/src/fgt/filter_physics/RandomFillFilter.cpp @@ -30,7 +30,7 @@ void RandomFillFilter::initParameterSet(QAction* action,MeshDocument& md, RichPa par.addParam(new RichBool("useRandomVertices", true, "Random spawn points", "If true the filling objects will spawn at random positions in the container mesh instead of being spawn at the center of mass")); } -bool RandomFillFilter::applyFilter(QAction* filter, MeshDocument &md, RichParameterSet& par, vcg::CallBackPos* cb){ +bool RandomFillFilter::applyFilter(QAction*, MeshDocument &md, RichParameterSet& par, vcg::CallBackPos* cb){ if(parametersAreNotCorrect(md, par)) return false;