NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict fixed

This commit is contained in:
Dander7BD 2013-11-21 17:27:28 +01:00
parent eba7995374
commit 91af42c0bd
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/OysterPhysics3D/RigidBody.cpp
View File

@ -70,11 +70,7 @@ void RigidBody::Update_LeapFrog( Float deltaTime )
this->box.center += deltaPos; this->box.center += deltaPos;
} }
<<<<<<< HEAD
// update movements and clear impulseForceSum and impulseTorqueSum
=======
// update momentums and clear impulseForceSum and impulseTorqueSum // update momentums and clear impulseForceSum and impulseTorqueSum
>>>>>>> origin/RigidBody
this->linearMomentum += linearImpulse; this->linearMomentum += linearImpulse;
this->impulseForceSum = Float3::null; this->impulseForceSum = Float3::null;
this->angularMomentum += angularImpulse; this->angularMomentum += angularImpulse;