From 21bb8bc6254b8ffd0ada603c668acc916d13b78b Mon Sep 17 00:00:00 2001
From: Daniel Chappuis <chappuis.daniel@gmail.com>
Date: Wed, 30 Mar 2016 23:01:11 +0200
Subject: [PATCH] Fix warnings in testbed application

---
 testbed/common/ConcaveMesh.cpp                  | 6 +++---
 testbed/opengl-framework/src/Light.cpp          | 6 ------
 testbed/scenes/concavemesh/ConcaveMeshScene.cpp | 1 -
 testbed/scenes/joints/JointsScene.cpp           | 3 ---
 testbed/src/Gui.cpp                             | 2 +-
 testbed/src/TestbedApplication.cpp              | 6 +++---
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/testbed/common/ConcaveMesh.cpp b/testbed/common/ConcaveMesh.cpp
index 4338a70d..3125a396 100644
--- a/testbed/common/ConcaveMesh.cpp
+++ b/testbed/common/ConcaveMesh.cpp
@@ -47,7 +47,7 @@ ConcaveMesh::ConcaveMesh(const openglframework::Vector3 &position,
     mScalingMatrix = openglframework::Matrix4::identity();
 
     // For each subpart of the mesh
-    for (int i=0; i<getNbParts(); i++) {
+    for (uint i=0; i<getNbParts(); i++) {
 
         // Vertex and Indices array for the triangle mesh (data in shared and not copied)
         rp3d::TriangleVertexArray* vertexArray =
@@ -104,7 +104,7 @@ ConcaveMesh::ConcaveMesh(const openglframework::Vector3 &position, float mass,
     mScalingMatrix = openglframework::Matrix4::identity();
 
     // For each subpart of the mesh
-    for (int i=0; i<getNbParts(); i++) {
+    for (uint i=0; i<getNbParts(); i++) {
 
         // Vertex and Indices array for the triangle mesh (data in shared and not copied)
         rp3d::TriangleVertexArray* vertexArray =
@@ -146,7 +146,7 @@ ConcaveMesh::ConcaveMesh(const openglframework::Vector3 &position, float mass,
 ConcaveMesh::~ConcaveMesh() {
 
     // Destroy the triangle mesh data for the physics engine
-    for (int i=0; i<mPhysicsTriangleMesh.getNbSubparts(); i++) {
+    for (uint i=0; i<mPhysicsTriangleMesh.getNbSubparts(); i++) {
         delete mPhysicsTriangleMesh.getSubpart(i);
     }
 
diff --git a/testbed/opengl-framework/src/Light.cpp b/testbed/opengl-framework/src/Light.cpp
index 42de71f5..40358597 100644
--- a/testbed/opengl-framework/src/Light.cpp
+++ b/testbed/opengl-framework/src/Light.cpp
@@ -53,10 +53,4 @@ void Light::init() {
 
     // Enable the light
     enable();
-
-    // Set the diffuse and specular color
-    GLfloat diffuseColor[] = {mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a};
-    GLfloat specularColor[] = {mSpecularColor.r,mSpecularColor.g,mSpecularColor.b,mSpecularColor.a};
-    //glLightfv(mLightID, GL_DIFFUSE, diffuseColor);
-    //glLightfv(mLightID, GL_SPECULAR, specularColor);
 }
diff --git a/testbed/scenes/concavemesh/ConcaveMeshScene.cpp b/testbed/scenes/concavemesh/ConcaveMeshScene.cpp
index fcbd095d..8decca49 100644
--- a/testbed/scenes/concavemesh/ConcaveMeshScene.cpp
+++ b/testbed/scenes/concavemesh/ConcaveMeshScene.cpp
@@ -55,7 +55,6 @@ ConcaveMeshScene::ConcaveMeshScene(const std::string& name)
     // ---------- Create the cube ----------- //
 
     // Position
-    rp3d::decimal radius = 2.0;
     openglframework::Vector3 spherePos(15, 10, 0);
 
     // Create a sphere and a corresponding rigid in the dynamics world
diff --git a/testbed/scenes/joints/JointsScene.cpp b/testbed/scenes/joints/JointsScene.cpp
index dd3255d4..122ac753 100644
--- a/testbed/scenes/joints/JointsScene.cpp
+++ b/testbed/scenes/joints/JointsScene.cpp
@@ -44,9 +44,6 @@ JointsScene::JointsScene(const std::string& name)
     // Gravity vector in the dynamics world
     rp3d::Vector3 gravity(0, rp3d::decimal(-9.81), 0);
 
-    // Time step for the physics simulation
-    rp3d::decimal timeStep = 1.0f / 60.0f;
-
     // Create the dynamics world for the physics simulation
     mDynamicsWorld = new rp3d::DynamicsWorld(gravity);
 
diff --git a/testbed/src/Gui.cpp b/testbed/src/Gui.cpp
index ce187796..b62f649f 100644
--- a/testbed/src/Gui.cpp
+++ b/testbed/src/Gui.cpp
@@ -124,7 +124,7 @@ void Gui::createSimulationPanel() {
     // Scenes
     std::vector<Scene*> scenes = mApp->getScenes();
     std::vector<std::string> scenesNames;
-    for (int i=0; i<scenes.size(); i++) {
+    for (uint i=0; i<scenes.size(); i++) {
         scenesNames.push_back(scenes[i]->getName().c_str());
     }
     Label* labelScenes = new Label(mSimulationPanel, "Scene","sans-bold");
diff --git a/testbed/src/TestbedApplication.cpp b/testbed/src/TestbedApplication.cpp
index 3db9b2ba..5baa3b82 100644
--- a/testbed/src/TestbedApplication.cpp
+++ b/testbed/src/TestbedApplication.cpp
@@ -50,8 +50,8 @@ const float TestbedApplication::SCROLL_SENSITIVITY = 0.02f;
 // Constructor
 TestbedApplication::TestbedApplication(bool isFullscreen)
                    : Screen(Vector2i(1280, 760), "Testbed ReactPhysics3D", true, isFullscreen),
-                     mIsInitialized(false), mFPS(0), mNbFrames(0), mPreviousTime(0),
-                     mLastTimeComputedFPS(0), mFrameTime(0), mPhysicsTime(0), mGui(this) {
+                     mIsInitialized(false), mGui(this), mFPS(0), mNbFrames(0), mPreviousTime(0),
+                     mLastTimeComputedFPS(0), mFrameTime(0), mPhysicsTime(0) {
 
     mCurrentScene = NULL;
     mIsMultisamplingActive = true;
@@ -128,7 +128,7 @@ void TestbedApplication::createScenes() {
 // Remove all the scenes
 void TestbedApplication::destroyScenes() {
 
-    for (int i=0; i<mScenes.size(); i++) {
+    for (uint i=0; i<mScenes.size(); i++) {
         delete mScenes[i];
     }