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

flyingvehicle hovercode tweaks

Browse source 
makes the presence of a hoverHeight a bit more of a barrier to punchthrough
assumes #1166 inclusion
This commit is contained in:
AzaezelX 2023-12-30 22:30:05 -06:00
parent 93abe5a49c
commit 2a1ad5a5cc
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/source/T3D/vehicles/flyingVehicle.cpp
View file

@ -541,13 +541,20 @@ void FlyingVehicle::updateForces(F32 /*dt*/)
F32 vf = mRigid.mass * -mNetGravity; F32 vf = mRigid.mass * -mNetGravity;
F32 h = getHeight(); F32 h = getHeight();
if (h <= 1) { if (h <= 1) {
if (h > 0) { F32 seperationForce = vf * (1.0 - h);
vf -= vf * h * 0.1; if (h > 0.5) {
vf -= seperationForce * mDataBlock->drag;
} else { } else {
vf += mDataBlock->jetForce * -h; if (h < 0.0)
{
Point3F displacePos = getPosition();
displacePos.z += mDataBlock->hoverHeight * (-h * 2);
mRigid.linPosition = displacePos;
}
vf += seperationForce;
} }
} }
force += zv * vf; force.z += vf;
// Damping "surfaces" // Damping "surfaces"
force -= xv * mDot(xv,mRigid.linVelocity) * mDataBlock->horizontalSurfaceForce; force -= xv * mDot(xv,mRigid.linVelocity) * mDataBlock->horizontalSurfaceForce;
@ -599,8 +606,8 @@ F32 FlyingVehicle::getHeight()
{ {
Point3F sp,ep; Point3F sp,ep;
RayInfo collision; RayInfo collision;
F32 height = (createHeightOn) ? mDataBlock->createHoverHeight : mDataBlock->hoverHeight; F32 height = ((createHeightOn) ? mDataBlock->createHoverHeight : mDataBlock->hoverHeight) + mDataBlock->collisionTol*2;
F32 r = 10 + height; F32 r = 3 * height;
getTransform().getColumn(3, &sp); getTransform().getColumn(3, &sp);
ep.x = sp.x; ep.x = sp.x;
ep.y = sp.y; ep.y = sp.y;
@ -609,7 +616,7 @@ F32 FlyingVehicle::getHeight()
if( !mContainer->castRay(sp, ep, sClientCollisionMask, &collision) == true ) if( !mContainer->castRay(sp, ep, sClientCollisionMask, &collision) == true )
collision.t = 1; collision.t = 1;
enableCollision(); enableCollision();
return (r * collision.t - height) / 10; return (r * collision.t - height) / r;
} }