TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-19 22:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review:

Browse source 
1) got rid of evey class having it's own gravity
2) rigidshape inheritance simplifications
3) gravitymod from physicszones taking buoyancy into account natively (we still track raw bouyancy to cancel it out for player)
4) disableMove used throughout
5) items can now also be influenced by the appliedforce from physicszones
This commit is contained in:
AzaezelX 2020-10-02 13:53:46 -05:00
parent 76c5e30869
commit afb39d398f
13 changed files with 191 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/T3D/player.cpp
View file

@ -1581,8 +1581,6 @@ ConsoleDocClass( Player,
"@ingroup gameObjects\n"
);
F32 Player::mGravity = -20;
//----------------------------------------------------------------------------
Player::Player()
@ -2890,7 +2888,7 @@ void Player::updateMove(const Move* move)
speed_bias = speed_bias + (speed_bias_goal - speed_bias)*0.1f;
moveSpeed *= speed_bias;
// Acceleration due to gravity
VectorF acc(0.0f, 0.0f, mGravity * mGravityMod * TickSec);
VectorF acc(0.0f, 0.0f, mNetGravity/(1.0 - mBuoyancy) * TickSec);
// Determine ground contact normal. Only look for contacts if
// we can move and aren't mounted.
@ -3254,30 +3252,6 @@ void Player::updateMove(const Move* move)
mVelocity.z -= mDataBlock->upResistFactor * TickSec * (mVelocity.z - mDataBlock->upResistSpeed);
}
// Container buoyancy & drag
/* Commented out until the buoyancy calculation can be reworked so that a container and
** player with the same density will result in neutral buoyancy.
if (mBuoyancy != 0)
{
// Applying buoyancy when standing still causing some jitters-
if (mBuoyancy > 1.0 || !mVelocity.isZero() || !runSurface)
{
// A little hackery to prevent oscillation
// based on http://reinot.blogspot.com/2005/11/oh-yes-they-float-georgie-they-all.html
F32 buoyancyForce = mBuoyancy * mGravity * mGravityMod * TickSec;
F32 currHeight = getPosition().z;
const F32 C = 2.0f;
const F32 M = 0.1f;
if ( currHeight + mVelocity.z * TickSec * C > mLiquidHeight )
buoyancyForce *= M;
mVelocity.z -= buoyancyForce;
}
}
*/
// Apply drag
if ( mSwimming )
mVelocity -= mVelocity * mDrag * TickSec * ( mVelocity.len() / mDataBlock->maxUnderwaterForwardSpeed );