mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests and fix compilation warnings

Browse Source
This commit is contained in:
Daniel Chappuis 2018-04-16 18:52:02 +02:00
parent 96c581ae9b
commit 491702c05c
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/ContactSolver.cpp
View File

@ -42,7 +42,7 @@ const decimal ContactSolver::SLOP = decimal(0.01);
ContactSolver::ContactSolver(MemoryManager& memoryManager, const WorldSettings& worldSettings) ContactSolver::ContactSolver(MemoryManager& memoryManager, const WorldSettings& worldSettings)
:mMemoryManager(memoryManager), mSplitLinearVelocities(nullptr), :mMemoryManager(memoryManager), mSplitLinearVelocities(nullptr),
mSplitAngularVelocities(nullptr), mContactConstraints(nullptr), mSplitAngularVelocities(nullptr), mContactConstraints(nullptr),
mLinearVelocities(nullptr), mAngularVelocities(nullptr), mContactPoints(nullptr), mLinearVelocities(nullptr), mAngularVelocities(nullptr),
mIsSplitImpulseActive(true), mWorldSettings(worldSettings) { mIsSplitImpulseActive(true), mWorldSettings(worldSettings) {
#ifdef IS_PROFILING_ACTIVE #ifdef IS_PROFILING_ACTIVE

1
src/engine/ContactSolver.h
View File

@ -273,7 +273,6 @@ class ContactSolver {
/// Memory manager /// Memory manager
MemoryManager& mMemoryManager; MemoryManager& mMemoryManager;
/// Split linear velocities for the position contact solver (split impulse) /// Split linear velocities for the position contact solver (split impulse)
Vector3* mSplitLinearVelocities; Vector3* mSplitLinearVelocities;

2
src/engine/Timer.cpp
View File

@ -30,7 +30,7 @@
using namespace reactphysics3d; using namespace reactphysics3d;
// Constructor // Constructor
Timer::Timer(double timeStep) : mTimeStep(timeStep), mLastUpdateTime(0), mIsRunning(false) { Timer::Timer(double timeStep) : mTimeStep(timeStep), mLastUpdateTime(0), mDeltaTime(0), mIsRunning(false) {
assert(timeStep > 0.0); assert(timeStep > 0.0);
} }

2
test/tests/collision/TestTriangleVertexArray.h
View File

@ -47,7 +47,7 @@ class TestTriangleVertexArray : public Test {
double mVertices2[4*3]; double mVertices2[4*3];
float mNormals2[4*3]; float mNormals2[4*3];
uint mIndices1[6]; uint mIndices1[6];
uint mIndices2[6]; short mIndices2[6];
TriangleVertexArray* mTriangleVertexArray1; TriangleVertexArray* mTriangleVertexArray1;
TriangleVertexArray* mTriangleVertexArray2; TriangleVertexArray* mTriangleVertexArray2;

5
testbed/src/Gui.cpp
View File

@ -39,7 +39,10 @@ double Gui::mCachedUpdateTime = 0;
double Gui::mCachedPhysicsUpdateTime = 0; double Gui::mCachedPhysicsUpdateTime = 0;
// Constructor // Constructor
Gui::Gui(TestbedApplication* app) : mApp(app), mSimulationPanel(nullptr) { Gui::Gui(TestbedApplication* app)
: mApp(app), mSimulationPanel(nullptr), mSettingsPanel(nullptr), mPhysicsPanel(nullptr),
mRenderingPanel(nullptr), mFPSLabel(nullptr), mFrameTimeLabel(nullptr), mPhysicsTimeLabel(nullptr)
{
} }

2
testbed/src/Timer.cpp
View File

@ -28,7 +28,7 @@
// Constructor // Constructor
Timer::Timer() : mIsRunning(false) { Timer::Timer() : mLastUpdateTime(0), mDeltaTime(0), mAccumulator(0), mIsRunning(false) {
} }