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

Fix merge mess

Browse Source
This commit is contained in:
Colin 2015-08-26 04:23:44 -06:00
parent 87b88fc953
commit 494f866357
6 changed files with 133 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -25,3 +25,7 @@ Thumbs.db
# vim swap files # vim swap files
##################### #####################
*.*sw* *.*sw*
# CMake build directory
#######################
build/*

5
src/body/RigidBody.cpp
View File

@ -400,13 +400,8 @@ void RigidBody::updateBroadPhaseState() const {
PROFILE("RigidBody::updateBroadPhaseState()"); PROFILE("RigidBody::updateBroadPhaseState()");
<<<<<<< HEAD
DynamicsWorld& world = static_cast<DynamicsWorld&>(mWorld); DynamicsWorld& world = static_cast<DynamicsWorld&>(mWorld);
const Vector3 displacement = world.mTimer.getTimeStep() * mLinearVelocity; const Vector3 displacement = world.mTimer.getTimeStep() * mLinearVelocity;
=======
DynamicsWorld& world = dynamic_cast<DynamicsWorld&>(mWorld);
const Vector3 displacement = world.mTimeStep* mLinearVelocity;
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882
// For all the proxy collision shapes of the body // For all the proxy collision shapes of the body
for (ProxyShape* shape = mProxyCollisionShapes; shape != NULL; shape = shape->mNext) { for (ProxyShape* shape = mProxyCollisionShapes; shape != NULL; shape = shape->mNext) {

52
testbed/common/Box.h
View File

@ -1,27 +1,27 @@
/******************************************************************************** /********************************************************************************
* ReactPhysics3D physics library, http://www.reactphysics3d.com * * ReactPhysics3D physics library, http://www.reactphysics3d.com *
* Copyright (c) 2010-2015 Daniel Chappuis * * Copyright (c) 2010-2015 Daniel Chappuis *
********************************************************************************* *********************************************************************************
* * * *
* This software is provided 'as-is', without any express or implied warranty. * * This software is provided 'as-is', without any express or implied warranty. *
* In no event will the authors be held liable for any damages arising from the * * In no event will the authors be held liable for any damages arising from the *
* use of this software. * * use of this software. *
* * * *
* Permission is granted to anyone to use this software for any purpose, * * Permission is granted to anyone to use this software for any purpose, *
* including commercial applications, and to alter it and redistribute it * * including commercial applications, and to alter it and redistribute it *
* freely, subject to the following restrictions: * * freely, subject to the following restrictions: *
* * * *
* 1. The origin of this software must not be misrepresented; you must not claim * * 1. The origin of this software must not be misrepresented; you must not claim *
* that you wrote the original software. If you use this software in a * * that you wrote the original software. If you use this software in a *
* product, an acknowledgment in the product documentation would be * * product, an acknowledgment in the product documentation would be *
* appreciated but is not required. * * appreciated but is not required. *
* * * *
* 2. Altered source versions must be plainly marked as such, and must not be * * 2. Altered source versions must be plainly marked as such, and must not be *
* misrepresented as being the original software. * * misrepresented as being the original software. *
* * * *
* 3. This notice may not be removed or altered from any source distribution. * * 3. This notice may not be removed or altered from any source distribution. *
* * * *
********************************************************************************/ ********************************************************************************/
#ifndef BOX_H #ifndef BOX_H
#define BOX_H #define BOX_H
@ -92,15 +92,9 @@ class Box : public openglframework::Object3D, public PhysicsObject {
virtual void updateTransform(float interpolationFactor); virtual void updateTransform(float interpolationFactor);
}; };
<<<<<<< HEAD:examples/common/Box.h
// Return a pointer to the rigid body of the box
inline rp3d::RigidBody* Box::getRigidBody() {
return static_cast<rp3d::RigidBody*>(mRigidBody);
=======
// Update the transform matrix of the object // Update the transform matrix of the object
inline void Box::updateTransform(float interpolationFactor) { inline void Box::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix); mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Box.h
} }

52
testbed/common/Capsule.h
View File

@ -1,27 +1,27 @@
/******************************************************************************** /********************************************************************************
* ReactPhysics3D physics library, http://www.reactphysics3d.com * * ReactPhysics3D physics library, http://www.reactphysics3d.com *
* Copyright (c) 2010-2015 Daniel Chappuis * * Copyright (c) 2010-2015 Daniel Chappuis *
********************************************************************************* *********************************************************************************
* * * *
* This software is provided 'as-is', without any express or implied warranty. * * This software is provided 'as-is', without any express or implied warranty. *
* In no event will the authors be held liable for any damages arising from the * * In no event will the authors be held liable for any damages arising from the *
* use of this software. * * use of this software. *
* * * *
* Permission is granted to anyone to use this software for any purpose, * * Permission is granted to anyone to use this software for any purpose, *
* including commercial applications, and to alter it and redistribute it * * including commercial applications, and to alter it and redistribute it *
* freely, subject to the following restrictions: * * freely, subject to the following restrictions: *
* * * *
* 1. The origin of this software must not be misrepresented; you must not claim * * 1. The origin of this software must not be misrepresented; you must not claim *
* that you wrote the original software. If you use this software in a * * that you wrote the original software. If you use this software in a *
* product, an acknowledgment in the product documentation would be * * product, an acknowledgment in the product documentation would be *
* appreciated but is not required. * * appreciated but is not required. *
* * * *
* 2. Altered source versions must be plainly marked as such, and must not be * * 2. Altered source versions must be plainly marked as such, and must not be *
* misrepresented as being the original software. * * misrepresented as being the original software. *
* * * *
* 3. This notice may not be removed or altered from any source distribution. * * 3. This notice may not be removed or altered from any source distribution. *
* * * *
********************************************************************************/ ********************************************************************************/
#ifndef CAPSULE_H #ifndef CAPSULE_H
#define CAPSULE_H #define CAPSULE_H
@ -100,15 +100,9 @@ class Capsule : public openglframework::Mesh, public PhysicsObject {
virtual void updateTransform(float interpolationFactor); virtual void updateTransform(float interpolationFactor);
}; };
<<<<<<< HEAD:examples/common/Capsule.h
// Return a pointer to the rigid body of the box
inline rp3d::RigidBody* Capsule::getRigidBody() {
return static_cast<rp3d::RigidBody*>(mRigidBody);
=======
// Update the transform matrix of the object // Update the transform matrix of the object
inline void Capsule::updateTransform(float interpolationFactor) { inline void Capsule::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix); mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Capsule.h
} }
#endif #endif

7
testbed/common/Cone.h
View File

@ -99,15 +99,8 @@ class Cone : public openglframework::Mesh, public PhysicsObject {
virtual void updateTransform(float interpolationFactor); virtual void updateTransform(float interpolationFactor);
}; };
<<<<<<< HEAD:examples/common/Cone.h
// Return a pointer to the rigid body of the box
inline rp3d::RigidBody* Cone::getRigidBody() {
return static_cast<rp3d::RigidBody*>(mRigidBody);
=======
// Update the transform matrix of the object
inline void Cone::updateTransform(float interpolationFactor) { inline void Cone::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix); mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Cone.h
} }
#endif #endif

6
testbed/common/Sphere.h
View File

@ -96,15 +96,9 @@ class Sphere : public openglframework::Mesh, public PhysicsObject {
virtual void updateTransform(float interpolationFactor); virtual void updateTransform(float interpolationFactor);
}; };
<<<<<<< HEAD:examples/common/Sphere.h
// Return a pointer to the rigid body of the box
inline rp3d::RigidBody* Sphere::getRigidBody() {
return static_cast<rp3d::RigidBody*>(mRigidBody);
=======
// Update the transform matrix of the object // Update the transform matrix of the object
inline void Sphere::updateTransform(float interpolationFactor) { inline void Sphere::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix); mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Sphere.h
} }
#endif #endif