From 96c581ae9bccb64903882e778ad22c51b1b3a9ed Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Mon, 16 Apr 2018 07:54:46 +0200 Subject: [PATCH] Fix compilation warnings --- src/body/Body.cpp | 4 +++ src/body/CollisionBody.cpp | 4 +++ src/collision/ProxyShape.cpp | 2 +- .../narrowphase/SAT/SATAlgorithm.cpp | 4 +++ src/collision/shapes/CollisionShape.cpp | 6 ++++- src/containers/List.h | 2 +- src/engine/ContactSolver.cpp | 4 +++ src/engine/Timer.cpp | 2 +- src/memory/SingleFrameAllocator.cpp | 2 +- test/tests/collision/TestCollisionWorld.h | 5 +--- .../tests/collision/TestTriangleVertexArray.h | 2 +- testbed/common/PhysicsObject.cpp | 1 + testbed/src/Gui.cpp | 2 +- testbed/src/Scene.cpp | 2 +- testbed/src/SceneDemo.cpp | 3 ++- testbed/src/TestbedApplication.cpp | 25 +++++++------------ 16 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/body/Body.cpp b/src/body/Body.cpp index 0f02a55b..0ce9d0be 100644 --- a/src/body/Body.cpp +++ b/src/body/Body.cpp @@ -38,4 +38,8 @@ Body::Body(bodyindex id) : mID(id), mIsAlreadyInIsland(false), mIsAllowedToSleep(true), mIsActive(true), mIsSleeping(false), mSleepTime(0), mUserData(nullptr) { +#ifdef IS_LOGGING_ACTIVE + mLogger = nullptr; +#endif + } diff --git a/src/body/CollisionBody.cpp b/src/body/CollisionBody.cpp index 62c035ff..307b953a 100644 --- a/src/body/CollisionBody.cpp +++ b/src/body/CollisionBody.cpp @@ -41,6 +41,10 @@ CollisionBody::CollisionBody(const Transform& transform, CollisionWorld& world, : Body(id), mType(BodyType::DYNAMIC), mTransform(transform), mProxyCollisionShapes(nullptr), mNbCollisionShapes(0), mContactManifoldsList(nullptr), mWorld(world) { +#ifdef IS_PROFILING_ACTIVE + mProfiler = nullptr; +#endif + } // Destructor diff --git a/src/collision/ProxyShape.cpp b/src/collision/ProxyShape.cpp index e20ae485..c9d38fbe 100644 --- a/src/collision/ProxyShape.cpp +++ b/src/collision/ProxyShape.cpp @@ -37,7 +37,7 @@ using namespace reactphysics3d; */ ProxyShape::ProxyShape(CollisionBody* body, CollisionShape* shape, const Transform& transform, decimal mass, MemoryManager& memoryManager) :mMemoryManager(memoryManager), mBody(body), mCollisionShape(shape), mLocalToBodyTransform(transform), mMass(mass), - mNext(nullptr), mBroadPhaseID(-1), mCollisionCategoryBits(0x0001), mCollideWithMaskBits(0xFFFF) { + mNext(nullptr), mBroadPhaseID(-1), mUserData(nullptr), mCollisionCategoryBits(0x0001), mCollideWithMaskBits(0xFFFF) { } diff --git a/src/collision/narrowphase/SAT/SATAlgorithm.cpp b/src/collision/narrowphase/SAT/SATAlgorithm.cpp index bf613849..c4b0fbbe 100644 --- a/src/collision/narrowphase/SAT/SATAlgorithm.cpp +++ b/src/collision/narrowphase/SAT/SATAlgorithm.cpp @@ -47,6 +47,10 @@ const decimal SATAlgorithm::SAME_SEPARATING_AXIS_BIAS = decimal(0.001); // Constructor SATAlgorithm::SATAlgorithm(MemoryAllocator& memoryAllocator) : mMemoryAllocator(memoryAllocator) { +#ifdef IS_PROFILING_ACTIVE + mProfiler = nullptr; +#endif + } // Test collision between a sphere and a convex mesh diff --git a/src/collision/shapes/CollisionShape.cpp b/src/collision/shapes/CollisionShape.cpp index 4e6e4b9b..5d892962 100644 --- a/src/collision/shapes/CollisionShape.cpp +++ b/src/collision/shapes/CollisionShape.cpp @@ -34,7 +34,11 @@ using namespace reactphysics3d; // Constructor CollisionShape::CollisionShape(CollisionShapeName name, CollisionShapeType type) : mType(type), mName(name), mId(0) { - + +#ifdef IS_PROFILING_ACTIVE + mProfiler = nullptr; +#endif + } // Compute the world-space AABB of the collision shape given a transform from shape diff --git a/src/containers/List.h b/src/containers/List.h index a601e7c3..99aaa854 100755 --- a/src/containers/List.h +++ b/src/containers/List.h @@ -348,7 +348,7 @@ class List { if (mSize != list.mSize) return false; T* items = static_cast(mBuffer); - for (int i=0; i < mSize; i++) { + for (size_t i=0; i < mSize; i++) { if (items[i] != list[i]) { return false; } diff --git a/src/engine/ContactSolver.cpp b/src/engine/ContactSolver.cpp index d7539ca9..4beafb05 100644 --- a/src/engine/ContactSolver.cpp +++ b/src/engine/ContactSolver.cpp @@ -45,6 +45,10 @@ ContactSolver::ContactSolver(MemoryManager& memoryManager, const WorldSettings& mLinearVelocities(nullptr), mAngularVelocities(nullptr), mIsSplitImpulseActive(true), mWorldSettings(worldSettings) { +#ifdef IS_PROFILING_ACTIVE + mProfiler = nullptr; +#endif + } // Initialize the contact constraints diff --git a/src/engine/Timer.cpp b/src/engine/Timer.cpp index 7d50dd79..536d35d0 100644 --- a/src/engine/Timer.cpp +++ b/src/engine/Timer.cpp @@ -30,7 +30,7 @@ using namespace reactphysics3d; // Constructor -Timer::Timer(double timeStep) : mTimeStep(timeStep), mIsRunning(false) { +Timer::Timer(double timeStep) : mTimeStep(timeStep), mLastUpdateTime(0), mIsRunning(false) { assert(timeStep > 0.0); } diff --git a/src/memory/SingleFrameAllocator.cpp b/src/memory/SingleFrameAllocator.cpp index 13cf23fb..1ef6aeff 100644 --- a/src/memory/SingleFrameAllocator.cpp +++ b/src/memory/SingleFrameAllocator.cpp @@ -100,7 +100,7 @@ void SingleFrameAllocator::reset() { // Divide the total memory to allocate by two mTotalSizeBytes /= 2; - if (mTotalSizeBytes <= 0) mTotalSizeBytes = 1; + if (mTotalSizeBytes == 0) mTotalSizeBytes = 1; // Allocate a whole block of memory at the beginning mMemoryBufferStart = static_cast(MemoryManager::getBaseAllocator().allocate(mTotalSizeBytes)); diff --git a/test/tests/collision/TestCollisionWorld.h b/test/tests/collision/TestCollisionWorld.h index 1863cdee..b2e7e57f 100644 --- a/test/tests/collision/TestCollisionWorld.h +++ b/test/tests/collision/TestCollisionWorld.h @@ -2620,10 +2620,7 @@ class TestCollisionWorld : public Test { test(collisionData->getNbContactManifolds() == 1); test(collisionData->getTotalNbContactPoints() == 4); - // True if the bodies are swapped in the collision callback response - bool swappedBodiesCollisionData = collisionData->getBody1()->getId() != mConvexMeshBody1->getId(); - - for (int i=0; icontactManifolds[0].contactPoints.size(); i++) { + for (size_t i=0; icontactManifolds[0].contactPoints.size(); i++) { test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); } diff --git a/test/tests/collision/TestTriangleVertexArray.h b/test/tests/collision/TestTriangleVertexArray.h index 282b7d55..c4c3d53b 100644 --- a/test/tests/collision/TestTriangleVertexArray.h +++ b/test/tests/collision/TestTriangleVertexArray.h @@ -47,7 +47,7 @@ class TestTriangleVertexArray : public Test { double mVertices2[4*3]; float mNormals2[4*3]; uint mIndices1[6]; - short mIndices2[6]; + uint mIndices2[6]; TriangleVertexArray* mTriangleVertexArray1; TriangleVertexArray* mTriangleVertexArray2; diff --git a/testbed/common/PhysicsObject.cpp b/testbed/common/PhysicsObject.cpp index 9955725c..ca23caef 100644 --- a/testbed/common/PhysicsObject.cpp +++ b/testbed/common/PhysicsObject.cpp @@ -29,6 +29,7 @@ /// Constructor PhysicsObject::PhysicsObject() : openglframework::Mesh() { + mBody = nullptr; mColor = openglframework::Color(1, 1, 1, 1); mSleepingColor = openglframework::Color(1, 0, 0, 1); } diff --git a/testbed/src/Gui.cpp b/testbed/src/Gui.cpp index 14382a33..be6e5b57 100644 --- a/testbed/src/Gui.cpp +++ b/testbed/src/Gui.cpp @@ -39,7 +39,7 @@ double Gui::mCachedUpdateTime = 0; double Gui::mCachedPhysicsUpdateTime = 0; // Constructor -Gui::Gui(TestbedApplication* app) : mApp(app) { +Gui::Gui(TestbedApplication* app) : mApp(app), mSimulationPanel(nullptr) { } diff --git a/testbed/src/Scene.cpp b/testbed/src/Scene.cpp index b6668649..2c45b934 100644 --- a/testbed/src/Scene.cpp +++ b/testbed/src/Scene.cpp @@ -31,7 +31,7 @@ using namespace openglframework; // Constructor Scene::Scene(const std::string& name, EngineSettings& engineSettings, bool isShadowMappingEnabled) - : mName(name), mEngineSettings(engineSettings), mInterpolationFactor(0.0f), mViewportX(0), mViewportY(0), + : mName(name), mEngineSettings(engineSettings), mLastMouseX(0), mLastMouseY(0), mInterpolationFactor(0.0f), mViewportX(0), mViewportY(0), mViewportWidth(0), mViewportHeight(0), mIsShadowMappingEnabled(isShadowMappingEnabled), mIsContactPointsDisplayed(true), mIsAABBsDisplayed(false), mIsWireframeEnabled(false) { diff --git a/testbed/src/SceneDemo.cpp b/testbed/src/SceneDemo.cpp index e4f13d99..cb9d8eb0 100644 --- a/testbed/src/SceneDemo.cpp +++ b/testbed/src/SceneDemo.cpp @@ -48,7 +48,8 @@ SceneDemo::SceneDemo(const std::string& name, EngineSettings& settings, float sc mPhongShader("shaders/phong.vert", "shaders/phong.frag"), mColorShader("shaders/color.vert", "shaders/color.frag"), mQuadShader("shaders/quad.vert", "shaders/quad.frag"), - mVBOQuad(GL_ARRAY_BUFFER), mMeshFolderPath("meshes/") { + mVBOQuad(GL_ARRAY_BUFFER), mMeshFolderPath("meshes/"), + mPhysicsWorld(nullptr) { shadowMapTextureLevel++; diff --git a/testbed/src/TestbedApplication.cpp b/testbed/src/TestbedApplication.cpp index 7240ad7e..66686020 100644 --- a/testbed/src/TestbedApplication.cpp +++ b/testbed/src/TestbedApplication.cpp @@ -54,22 +54,15 @@ const float TestbedApplication::SCROLL_SENSITIVITY = 0.08f; // Constructor TestbedApplication::TestbedApplication(bool isFullscreen) : Screen(Vector2i(1280, 800), "Testbed ReactPhysics3D", true, isFullscreen), - mIsInitialized(false), mGui(this), mFPS(0), mNbFrames(0), mPreviousTime(0), - mLastTimeComputedFPS(0), mFrameTime(0), mPhysicsTime(0) { - - mCurrentScene = NULL; - mIsMultisamplingActive = true; - mWidth = 1280; - mHeight = 720; - mEngineSettings = EngineSettings::defaultSettings(); - mSinglePhysicsStepEnabled = false; - mSinglePhysicsStepDone = false; - mWindowToFramebufferRatio = Vector2(1, 1); - mIsShadowMappingEnabled = true; - mIsVSyncEnabled = true; - mIsContactPointsDisplayed = false; - mIsAABBsDisplayed = false; - mIsWireframeEnabled = false; + mIsInitialized(false), mGui(this), mCurrentScene(nullptr), + mEngineSettings(EngineSettings::defaultSettings()), + mFPS(0), mNbFrames(0), mPreviousTime(0), + mLastTimeComputedFPS(0), mFrameTime(0), mPhysicsTime(0), + mIsMultisamplingActive(true), mWidth(1280), mHeight(720), + mSinglePhysicsStepEnabled(false), mSinglePhysicsStepDone(false), + mWindowToFramebufferRatio(Vector2(1, 1)), mIsShadowMappingEnabled(true), + mIsContactPointsDisplayed(false), mIsAABBsDisplayed(false), mIsWireframeEnabled(false), + mIsVSyncEnabled(true) { init();