TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1369 from Areloch/FixPathShapeNudgeRayTest

Browse source 
Adjusts the test behavior for when the player class tries to ray-check against PathShapes
This commit is contained in:
Brian Roberts 2025-01-27 01:49:10 -06:00 committed by GitHub
parent f58781688d bf9f0ee6cd
commit b671b85d30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4762,14 +4762,16 @@ bool Player::step(Point3F *pos,F32 *maxStep,F32 time)
// PATHSHAPE
// This Function does a ray cast down to see if a pathshape object is below
// If so, it will attempt to attach to it.
void Player::updateAttachment(){
void Player::updateAttachment()
{
Point3F rot, pos;
RayInfo rInfo;
MatrixF mat = getTransform();
mat.getColumn(3, &pos);
disableCollision();
if (gServerContainer.castRay(Point3F(pos.x, pos.y, pos.z + 0.1f),
Point3F(pos.x, pos.y, pos.z - 1.0f ),
PathShapeObjectType, &rInfo))
sCollisionMoveMask, &rInfo))
{
if ((mJumpSurfaceLastContact < JumpSkipContactsMax) && !mSwimming)
setPosition(rInfo.point, getRotation());
@ -4793,12 +4795,13 @@ void Player::updateAttachment(){
}
else
{
if (getParent() !=NULL)
if (getParent() != NULL)
{
clearProcessAfter();
attachToParent(NULL);
}
}
enableCollision();
}
// PATHSHAPE END