TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1514 from Azaezel/alpha41/stepLively

Browse source 
further filtering for updatePlayerAttachment
This commit is contained in:
Brian Roberts 2025-07-05 18:08:21 -05:00 • committed by GitHub
commit aa918b0e7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4754,6 +4754,8 @@ bool Player::step(Point3F *pos,F32 *maxStep,F32 time)
// If so, it will attempt to attach to it. // If so, it will attempt to attach to it.
void Player::updateAttachment() void Player::updateAttachment()
{ {
if (getDamageState() != Enabled && mVelocity.z > mDataBlock->fallingSpeedThreshold) return;
Point3F rot, pos; Point3F rot, pos;
RayInfo rInfo; RayInfo rInfo;
MatrixF mat = getTransform(); MatrixF mat = getTransform();
@ -4761,10 +4763,10 @@ void Player::updateAttachment()
disableCollision(); disableCollision();
if (gServerContainer.castRay(Point3F(pos.x, pos.y, pos.z + 0.1f), if (gServerContainer.castRay(Point3F(pos.x, pos.y, pos.z + 0.1f),
Point3F(pos.x, pos.y, pos.z - 1.0f ), Point3F(pos.x, pos.y, pos.z - 1.0f ),
sCollisionMoveMask, &rInfo)) PathShapeObjectType | StaticShapeObjectType | TerrainObjectType, &rInfo))
{ {
Point3F setPos = rInfo.point; Point3F setPos = rInfo.point;
setPos.z = mMax(setPos.z+sMinFaceDistance, pos.z); setPos.z = mMax(setPos.z + sMinFaceDistance, pos.z);
if ((mJumpSurfaceLastContact < JumpSkipContactsMax) && !mSwimming) if ((mJumpSurfaceLastContact < JumpSkipContactsMax) && !mSwimming)
setPosition(setPos, getRotation()); setPosition(setPos, getRotation());