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

Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic

This commit is contained in:
lindaandersson 2014-01-31 16:33:32 +01:00
parent e327f64702 fabf471e76
commit 89a538e887
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/GamePhysics/Implementation/SimpleRigidBody.cpp
View File

@ -128,7 +128,7 @@ SimpleRigidBody::State & SimpleRigidBody::GetState( SimpleRigidBody::State &targ
void SimpleRigidBody::SetState( const SimpleRigidBody::State &state ) void SimpleRigidBody::SetState( const SimpleRigidBody::State &state )
{ {
this->rigid.centerPos = state.GetCenterPosition(); this->rigid.centerPos = state.GetCenterPosition();
//this->rigid.SetRotation( state.GetRotation() ); //! HACK: @todo Rotation temporary disabled this->rigid.axis = state.GetAngularAxis();
this->rigid.boundingReach = state.GetReach(); this->rigid.boundingReach = state.GetReach();
this->rigid.momentum_Linear = state.GetLinearMomentum(); this->rigid.momentum_Linear = state.GetLinearMomentum();
this->rigid.momentum_Angular = state.GetAngularMomentum(); this->rigid.momentum_Angular = state.GetAngularMomentum();

2
Code/GamePhysics/Implementation/SphericalRigidBody.cpp
View File

@ -94,7 +94,7 @@ SphericalRigidBody::State & SphericalRigidBody::GetState( SphericalRigidBody::St
void SphericalRigidBody::SetState( const SphericalRigidBody::State &state ) void SphericalRigidBody::SetState( const SphericalRigidBody::State &state )
{ {
this->rigid.centerPos = state.GetCenterPosition(); this->rigid.centerPos = state.GetCenterPosition();
//this->rigid.SetRotation( state.GetRotation() ); //! HACK: @todo Rotation temporary disabled this->rigid.axis = state.GetAngularAxis();
this->rigid.boundingReach = state.GetReach(); this->rigid.boundingReach = state.GetReach();
this->rigid.momentum_Linear = state.GetLinearMomentum(); this->rigid.momentum_Linear = state.GetLinearMomentum();
this->rigid.momentum_Angular = state.GetAngularMomentum(); this->rigid.momentum_Angular = state.GetAngularMomentum();