TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update player.cpp

Browse source
This commit is contained in:
Sir-Skurpsalot 2026-06-24 22:31:11 -06:00 • committed by GitHub
parent 8f99b9004e
commit 6e98dd6d03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -525,6 +525,7 @@ bool PlayerData::preload(bool server, String &errorStr)
Con::printf("PlayerData:: Jump delay exceeds range (0-%d)",jumpDelay); Con::printf("PlayerData:: Jump delay exceeds range (0-%d)",jumpDelay);
} }
Resource<TSShape> shape; Resource<TSShape> shape;
if (shapeAssetRef.notNull()) if (shapeAssetRef.notNull())
shape = shapeAssetRef.assetPtr->getShapeResource(); shape = shapeAssetRef.assetPtr->getShapeResource();
@ -2425,8 +2426,8 @@ void Player::setState(ActionState state, U32 recoverTicks)
} }
} }
} }
// Set delay; if nothing valid, mProneRecoverDelay = 0 (instant pass) // Set delay; if nothing valid, mRecoverDelay = 0 (instant pass)
mProneRecoverDelay = seqTime; mRecoverDelay = seqTime;
} }
default: default:
@ -2487,8 +2488,8 @@ void Player::updateState()
} }
break; break;
case ProneRecoverState: //Skurps case ProneRecoverState: //Skurps
mProneRecoverDelay -= TickSec; mRecoverDelay -= TickSec;
if(mProneRecoverDelay <= 0.0f) if(mRecoverDelay <= 0.0f)
setState(MoveState); setState(MoveState);
default: default:
break; break;
@ -3228,7 +3229,10 @@ void Player::updateMove(const Move* move)
// This more accurate swim vector calc comes from Matt Fairfax // This more accurate swim vector calc comes from Matt Fairfax
// Added a check to keep the player from pose-jittering at the surface -Skurps // Added a check to keep the player from pose-jittering at the surface -Skurps
F32 offset = getPosition().z + (0.66f * mDataBlock->swimBoxSize.z); F32 offset = getPosition().z + (0.66f * mDataBlock->swimBoxSize.z);
if(offset < mLiquidHeight || mHead.x > 0.0f){ //Skurps bool rising = (move->y > 0.0f && mHead.x < 0.0f) || (move->y < 0.0f && mHead.x > 0.0f);
bool skipPitch = (offset > mLiquidHeight) && rising; //Skip pitch contribution to velocity -Skurps
if(!skipPitch){ //Skurps
MatrixF xRot; MatrixF xRot;
xRot.set(EulerF(mHead.x, 0, 0)); xRot.set(EulerF(mHead.x, 0, 0));
zRot.set(EulerF(0, 0, mRot.z)); zRot.set(EulerF(0, 0, mRot.z));
@ -6550,7 +6554,7 @@ void Player::readPacketData(GameConnection *connection, BitStream *stream)
if (stream->readFlag()) if (stream->readFlag())
mJumpDelay = stream->readInt(PlayerData::JumpDelayBits); mJumpDelay = stream->readInt(PlayerData::JumpDelayBits);
else else
mJumpDelay = 0; mJumpDelay = 0.0f;
Point3F pos,rot; Point3F pos,rot;
if (stream->readFlag()) { if (stream->readFlag()) {