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

postmerge compile error fix

This commit is contained in:
Dander7BD 2013-12-20 12:13:12 +01:00
parent ca90b3ae3b
commit 4d3032dc81
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/DLL/GamePhysics_x86D.pdb
View File

Binary file not shown.

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

@ -243,10 +243,10 @@ Float3 & SimpleRigidBody::GetGravityNormal( Float3 &targetMem ) const
// return targetMem = this->rigid.GetView(); // return targetMem = this->rigid.GetView();
//} //}
Float3 SimpleRigidBody::GetRigidLinearVelocity() const //Float3 SimpleRigidBody::GetRigidLinearVelocity() const
{ //{
return this->rigid.GetLinearVelocity(); // return this->rigid.GetLinearVelocity();
} //}
UpdateState SimpleRigidBody::Update( Float timeStepLength ) UpdateState SimpleRigidBody::Update( Float timeStepLength )

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

@ -19,7 +19,7 @@ namespace Oyster { namespace Physics
State GetState() const; State GetState() const;
State & GetState( State &targetMem ) const; State & GetState( State &targetMem ) const;
void SetState( const State &state ); void SetState( const State &state );
::Oyster::Math::Float3 GetRigidLinearVelocity() const; //::Oyster::Math::Float3 GetRigidLinearVelocity() const;
SubscriptMessage CallSubscription( const ICustomBody *proto, const ICustomBody *deuter ); SubscriptMessage CallSubscription( const ICustomBody *proto, const ICustomBody *deuter );
bool IsAffectedByGravity() const; bool IsAffectedByGravity() const;

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

@ -173,10 +173,10 @@ Float3 & SphericalRigidBody::GetGravityNormal( Float3 &targetMem ) const
// return targetMem = this->rigid.GetView(); // return targetMem = this->rigid.GetView();
//} //}
Float3 SphericalRigidBody::GetRigidLinearVelocity() const //Float3 SphericalRigidBody::GetRigidLinearVelocity() const
{ //{
return this->rigid.GetLinearVelocity(); // return this->rigid.GetLinearVelocity();
} //}
UpdateState SphericalRigidBody::Update( Float timeStepLength ) UpdateState SphericalRigidBody::Update( Float timeStepLength )
{ {

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

@ -20,7 +20,7 @@ namespace Oyster { namespace Physics
State GetState() const; State GetState() const;
State & GetState( State &targetMem = State() ) const; State & GetState( State &targetMem = State() ) const;
void SetState( const State &state ); void SetState( const State &state );
::Oyster::Math::Float3 GetRigidLinearVelocity() const; //::Oyster::Math::Float3 GetRigidLinearVelocity() const;
SubscriptMessage CallSubscription( const ICustomBody *proto, const ICustomBody *deuter ); SubscriptMessage CallSubscription( const ICustomBody *proto, const ICustomBody *deuter );
bool IsAffectedByGravity() const; bool IsAffectedByGravity() const;

2
Code/GamePhysics/PhysicsAPI.h
View File

@ -251,7 +251,7 @@ namespace Oyster
/******************************************************** /********************************************************
* @return the linear velocity of the rigid body in a vector. * @return the linear velocity of the rigid body in a vector.
********************************************************/ ********************************************************/
virtual Math::Float3 GetRigidLinearVelocity() const = 0; //virtual Math::Float3 GetRigidLinearVelocity() const = 0;
/******************************************************** /********************************************************
* @todo TODO: need doc * @todo TODO: need doc