Fix merge mess

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

4
.gitignore vendored
View File

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

View File

@ -400,13 +400,8 @@ void RigidBody::updateBroadPhaseState() const {
PROFILE("RigidBody::updateBroadPhaseState()");
<<<<<<< HEAD
DynamicsWorld& world = static_cast<DynamicsWorld&>(mWorld);
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 (ProxyShape* shape = mProxyCollisionShapes; shape != NULL; shape = shape->mNext) {

View File

@ -92,15 +92,9 @@ class Box : public openglframework::Object3D, public PhysicsObject {
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
inline void Box::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Box.h
}

View File

@ -100,15 +100,9 @@ class Capsule : public openglframework::Mesh, public PhysicsObject {
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
inline void Capsule::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Capsule.h
}
#endif

View File

@ -99,15 +99,8 @@ class Cone : public openglframework::Mesh, public PhysicsObject {
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) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Cone.h
}
#endif

View File

@ -96,15 +96,9 @@ class Sphere : public openglframework::Mesh, public PhysicsObject {
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
inline void Sphere::updateTransform(float interpolationFactor) {
mTransformMatrix = computeTransform(interpolationFactor, mScalingMatrix);
>>>>>>> 1bde11f245806de07a12b1cf6c33cdb83046b882:testbed/common/Sphere.h
}
#endif