mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-19 19:35:26 +00:00
added spawning
Tile test tool now spawns classes and data Test avoidance added to aicontroller and ainavigation
This commit is contained in:
parent
a5e969a8fd
commit
f730d0bf1c
8 changed files with 286 additions and 301 deletions
|
|
@ -168,8 +168,19 @@ bool AIController::getAIMove(Move* movePtr)
|
|||
{
|
||||
obj = getAIInfo()->mObj;
|
||||
}
|
||||
bool adjusted = false;
|
||||
if (getNav()->avoidObstacles())
|
||||
{
|
||||
adjusted = true;
|
||||
}
|
||||
else if (mRandI(0, 100) < mControllerData->mFlocking.mChance && getNav()->flock())
|
||||
{
|
||||
adjusted = true;
|
||||
}
|
||||
|
||||
// Only repath if not already adjusted and on risky ground
|
||||
RayInfo info;
|
||||
if (obj->getContainer()->castRay(obj->getPosition(), obj->getPosition() - Point3F(0, 0, mControllerData->mHeightTolerance), StaticShapeObjectType, &info))
|
||||
if (!adjusted && obj->getContainer()->castRay(obj->getPosition(), obj->getPosition() - Point3F(0, 0, mControllerData->mHeightTolerance), StaticShapeObjectType, &info))
|
||||
{
|
||||
getNav()->repath();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -343,6 +343,10 @@ void AINavigation::repath()
|
|||
{
|
||||
mPathData.path->mTo = mMoveDestination;
|
||||
}
|
||||
else if (avoidObstacles())
|
||||
{
|
||||
mPathData.path->mTo = mMoveDestination;
|
||||
}
|
||||
else
|
||||
{
|
||||
// If we're following, get their position.
|
||||
|
|
@ -380,6 +384,60 @@ void AINavigation::clearPath()
|
|||
mPathData = PathData();
|
||||
}
|
||||
|
||||
bool AINavigation::avoidObstacles()
|
||||
{
|
||||
SimObjectPtr<SceneObject> obj = getCtrl()->getAIInfo()->mObj;
|
||||
obj->disableCollision();
|
||||
|
||||
Point3F pos = obj->getBoxCenter();
|
||||
VectorF forward = obj->getTransform().getForwardVector();
|
||||
forward.normalizeSafe();
|
||||
|
||||
// Generate forward-left and forward-right by rotating forward vector
|
||||
VectorF right = mCross(forward, Point3F(0, 0, 1));
|
||||
VectorF leftDir = forward + right * -0.5f; // front-left
|
||||
VectorF rightDir = forward + right * 0.5f; // front-right
|
||||
|
||||
leftDir.normalizeSafe();
|
||||
rightDir.normalizeSafe();
|
||||
|
||||
F32 rayLength = getCtrl()->mMovement.getMoveSpeed();
|
||||
Point3F directions[3] = {
|
||||
forward,
|
||||
leftDir,
|
||||
rightDir
|
||||
};
|
||||
|
||||
bool hit[3] = { false, false, false };
|
||||
RayInfo info;
|
||||
for (int i = 0; i < 3; ++i)
|
||||
{
|
||||
Point3F end = pos + directions[i] * rayLength;
|
||||
if (obj->getContainer()->castRay(pos, end, sAILoSMask, &info))
|
||||
{
|
||||
hit[i] = true;
|
||||
}
|
||||
}
|
||||
|
||||
Point3F avoidance = Point3F::Zero;
|
||||
if (hit[0]) avoidance += right * 1.0f;
|
||||
if (hit[1]) avoidance += right * 1.5f;
|
||||
if (hit[2]) avoidance -= right * 1.5f;
|
||||
|
||||
if (!avoidance.isZero())
|
||||
{
|
||||
avoidance.normalizeSafe();
|
||||
F32 clearance = getCtrl()->getAIInfo()->mRadius * 1.5f;
|
||||
Point3F newDest = info.point + avoidance * rayLength;
|
||||
mMoveDestination = newDest;
|
||||
obj->enableCollision();
|
||||
return true;
|
||||
}
|
||||
|
||||
obj->enableCollision();
|
||||
return false;
|
||||
}
|
||||
|
||||
bool AINavigation::flock()
|
||||
{
|
||||
AIControllerData::Flocking flockingData = getCtrl()->mControllerData->mFlocking;
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ struct AINavigation
|
|||
|
||||
/// Move to the specified node in the current path.
|
||||
void moveToNode(S32 node);
|
||||
bool avoidObstacles();
|
||||
bool flock();
|
||||
#endif
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue