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

Update joltPlayer.cpp

Browse source 
player should output sensors in overlapobjects so triggers can fire
return jumping...
This commit is contained in:
marauder2k7 2026-06-07 02:39:25 +01:00
parent 51f5d507ed
commit 174e4d3329
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Engine/source/T3D/physics/jolt/joltPlayer.cpp
View file

@ -166,6 +166,7 @@ Point3F JoltPlayer::move(const VectorF& displacement, CollisionList& outCol)
JPH::Vec3 velocity = joltCast(displacement) / dt; JPH::Vec3 velocity = joltCast(displacement) / dt;
const auto& system = mWorld->getPhysicsSystem(); const auto& system = mWorld->getPhysicsSystem();
const JPH::Vec3 up = mCharacter->GetUp();
mCharacter->UpdateGroundVelocity(); mCharacter->UpdateGroundVelocity();
@ -177,7 +178,8 @@ Point3F JoltPlayer::move(const VectorF& displacement, CollisionList& outCol)
JPH::Vec3 horizontalVel(velocity.GetX(), velocity.GetY(), 0.0f); JPH::Vec3 horizontalVel(velocity.GetX(), velocity.GetY(), 0.0f);
mAllowSliding = horizontalVel.Length() > 0.01f; mAllowSliding = horizontalVel.Length() > 0.01f;
velocity.SetZ(0.0f); if (velocity.GetZ() < 0.05f)
velocity.SetZ(0.00f);
JPH::Vec3 groundVel = mCharacter->GetGroundVelocity(); JPH::Vec3 groundVel = mCharacter->GetGroundVelocity();
// Threshold raised to filter static-surface floating-point residuals. // Threshold raised to filter static-surface floating-point residuals.
@ -309,6 +311,27 @@ void JoltPlayer::findContact(SceneObject** contactObject, VectorF* contactNormal
for (const JPH::CharacterVirtual::Contact& c : mCharacter->GetActiveContacts()) for (const JPH::CharacterVirtual::Contact& c : mCharacter->GetActiveContacts())
{ {
if (c.mBodyB.IsInvalid())
continue;
if (c.mIsSensorB)
{
JPH::BodyLockRead lock(mWorld->getPhysicsSystem()->GetBodyLockInterface(), c.mBodyB);
if (!lock.Succeeded())
continue;
const JPH::Body& body = lock.GetBody();
PhysicsUserData* ud = (PhysicsUserData*)body.GetUserData();
if (!ud)
continue;
SceneObject* obj = ud->getObject();
if (obj && !outOverlapObjects->contains(obj))
outOverlapObjects->push_back(obj);
continue; // do not use for physical contact normal
}
if (c.mHadCollision) if (c.mHadCollision)
{ {
JPH::BodyLockRead lock(mWorld->getPhysicsSystem()->GetBodyLockInterface(), c.mBodyB); JPH::BodyLockRead lock(mWorld->getPhysicsSystem()->GetBodyLockInterface(), c.mBodyB);