TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix pack/unpack data for AIControllerData's (though we still send nothing, we do need to mark it clientside as false)

Browse source 
more pitchwork for flying vehicle drivers
when flocking is irrelevant just path to next node
This commit is contained in:
AzaezelX 2025-04-25 18:50:16 -05:00
parent 6efb3843f6
commit 675bdfe6b3
4 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/T3D/AI/AINavigation.cpp
View file

@ -126,9 +126,8 @@ void AINavigation::repath()
if (mPathData.path.isNull() || !mPathData.owned)
return;
if (mRandI(0, 100) < getCtrl()->mControllerData->mFlocking.mChance)
if (mRandI(0, 100) < getCtrl()->mControllerData->mFlocking.mChance && flock())
{
flock();
mPathData.path->mTo = mMoveDestination;
}
else
@ -296,7 +295,7 @@ void AINavigation::clearPath()
mPathData = PathData();
}
void AINavigation::flock()
bool AINavigation::flock()
{
AIControllerData::Flocking flockingData = getCtrl()->mControllerData->mFlocking;
SimObjectPtr<SceneObject> obj = getCtrl()->getAIInfo()->mObj;
@ -306,7 +305,7 @@ void AINavigation::flock()
Point3F searchArea = Point3F(flockingData.mMin / 2, flockingData.mMax / 2, getCtrl()->getAIInfo()->mObj->getObjBox().maxExtents.z / 2);
F32 maxFlocksq = flockingData.mMax * flockingData.mMax;
bool flocking = false;
if (getCtrl()->getGoal())
{
Point3F dest = mMoveDestination;
@ -403,17 +402,22 @@ void AINavigation::flock()
//if we're not jumping...
if (mJump == None)
{
dest.z -= obj->getObjBox().len_z()*0.5;
dest.z = obj->getPosition().z;
//make sure we don't run off a cliff
Point3F zlen(0, 0, getCtrl()->getAIInfo()->mRadius);
Point3F zlen(0, 0, getCtrl()->mControllerData->mHeightTolerance);
if (obj->getContainer()->castRay(dest + zlen, dest - zlen, TerrainObjectType | StaticShapeObjectType | StaticObjectType, &info))
{
mMoveDestination = dest;
if ((mMoveDestination - dest).len() > getCtrl()->mControllerData->mMoveTolerance)
{
mMoveDestination = dest;
flocking = true;
}
}
}
}
}
obj->enableCollision();
return flocking;
}
DefineEngineMethod(AIController, setMoveDestination, void, (Point3F goal, bool slowDown), (true),