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

break wether we *should* be trying to move out of the resolver

Browse source
This commit is contained in:
AzaezelX 2025-04-17 10:50:58 -05:00
parent eaa6a62b0c
commit 25b3a7c070
1 changed files with 64 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

127
Engine/source/T3D/AI/AIController.cpp
View file

@ -122,8 +122,22 @@ bool AIController::getAIMove(Move* movePtr)
mControllerData->resolveYaw(this, location, movePtr); mControllerData->resolveYaw(this, location, movePtr);
mControllerData->resolvePitch(this, location, movePtr); mControllerData->resolvePitch(this, location, movePtr);
mControllerData->resolveRoll(this, location, movePtr); mControllerData->resolveRoll(this, location, movePtr);
mControllerData->resolveSpeed(this, location, movePtr);
mControllerData->resolveStuck(this); if (mMovement.mMoveState != AIController::ModeStop)
{
F32 xDiff = getNav()->mMoveDestination.x - location.x;
F32 yDiff = getNav()->mMoveDestination.y - location.y;
if (mFabs(xDiff) < mControllerData->mMoveTolerance && mFabs(yDiff) < mControllerData->mMoveTolerance)
{
mMovement.mMoveState = AIController::ModeStop;
getNav()->onReachDestination();
}
else
{
mControllerData->resolveSpeed(this, location, movePtr);
mControllerData->resolveStuck(this);
}
}
} }
// Test for target location in sight if it's an object. The LOS is // Test for target location in sight if it's an object. The LOS is
@ -323,72 +337,59 @@ void AIControllerData::resolveRoll(AIController* obj, Point3F location, Move* mo
void AIControllerData::resolveSpeed(AIController* obj, Point3F location, Move* movePtr) void AIControllerData::resolveSpeed(AIController* obj, Point3F location, Move* movePtr)
{ {
// Move towards the destination F32 xDiff = obj->getNav()->mMoveDestination.x - location.x;
if (obj->mMovement.mMoveState != AIController::ModeStop) F32 yDiff = obj->getNav()->mMoveDestination.y - location.y;
{ Point3F rotation = obj->getAIInfo()->mObj->getTransform().toEuler();
F32 xDiff = obj->getNav()->mMoveDestination.x - location.x;
F32 yDiff = obj->getNav()->mMoveDestination.y - location.y;
Point3F rotation = obj->getAIInfo()->mObj->getTransform().toEuler();
// Check if we should mMove, or if we are 'close enough' // Build move direction in world space
if (mFabs(xDiff) < mMoveTolerance && mFabs(yDiff) < mMoveTolerance) if (mIsZero(xDiff))
{ movePtr->y = (location.y > obj->getNav()->mMoveDestination.y) ? -1.0f : 1.0f;
obj->mMovement.mMoveState = AIController::ModeStop; else
obj->getNav()->onReachDestination(); if (mIsZero(yDiff))
} movePtr->x = (location.x > obj->getNav()->mMoveDestination.x) ? -1.0f : 1.0f;
else else
{ if (mFabs(xDiff) > mFabs(yDiff))
// Build move direction in world space {
if (mIsZero(xDiff)) F32 value = mFabs(yDiff / xDiff);
movePtr->y = (location.y > obj->getNav()->mMoveDestination.y) ? -value : value;
movePtr->x = (location.x > obj->getNav()->mMoveDestination.x) ? -1.0f : 1.0f;
}
else
{
F32 value = mFabs(xDiff / yDiff);
movePtr->x = (location.x > obj->getNav()->mMoveDestination.x) ? -value : value;
movePtr->y = (location.y > obj->getNav()->mMoveDestination.y) ? -1.0f : 1.0f; movePtr->y = (location.y > obj->getNav()->mMoveDestination.y) ? -1.0f : 1.0f;
else
if (mIsZero(yDiff))
movePtr->x = (location.x > obj->getNav()->mMoveDestination.x) ? -1.0f : 1.0f;
else
if (mFabs(xDiff) > mFabs(yDiff))
{
F32 value = mFabs(yDiff / xDiff);
movePtr->y = (location.y > obj->getNav()->mMoveDestination.y) ? -value : value;
movePtr->x = (location.x > obj->getNav()->mMoveDestination.x) ? -1.0f : 1.0f;
}
else
{
F32 value = mFabs(xDiff / yDiff);
movePtr->x = (location.x > obj->getNav()->mMoveDestination.x) ? -value : value;
movePtr->y = (location.y > obj->getNav()->mMoveDestination.y) ? -1.0f : 1.0f;
}
// Rotate the move into object space (this really only needs
// a 2D matrix)
Point3F newMove;
MatrixF moveMatrix;
moveMatrix.set(EulerF(0.0f, 0.0f, -(rotation.z + movePtr->yaw)));
moveMatrix.mulV(Point3F(movePtr->x, movePtr->y, 0.0f), &newMove);
movePtr->x = newMove.x;
movePtr->y = newMove.y;
// Set movement speed. We'll slow down once we get close
// to try and stop on the spot...
if (obj->mMovement.mMoveSlowdown)
{
F32 speed = obj->mMovement.mMoveSpeed;
F32 dist = mSqrt(xDiff * xDiff + yDiff * yDiff);
F32 maxDist = mMoveTolerance * 2;
if (dist < maxDist)
speed *= dist / maxDist;
movePtr->x *= speed;
movePtr->y *= speed;
obj->mMovement.mMoveState = AIController::ModeSlowing;
} }
else
{
movePtr->x *= obj->mMovement.mMoveSpeed;
movePtr->y *= obj->mMovement.mMoveSpeed;
obj->mMovement.mMoveState = AIController::ModeMove; // Rotate the move into object space (this really only needs
} // a 2D matrix)
} Point3F newMove;
MatrixF moveMatrix;
moveMatrix.set(EulerF(0.0f, 0.0f, -(rotation.z + movePtr->yaw)));
moveMatrix.mulV(Point3F(movePtr->x, movePtr->y, 0.0f), &newMove);
movePtr->x = newMove.x;
movePtr->y = newMove.y;
// Set movement speed. We'll slow down once we get close
// to try and stop on the spot...
if (obj->mMovement.mMoveSlowdown)
{
F32 speed = obj->mMovement.mMoveSpeed;
F32 dist = mSqrt(xDiff * xDiff + yDiff * yDiff);
F32 maxDist = mMoveTolerance * 2;
if (dist < maxDist)
speed *= dist / maxDist;
movePtr->x *= speed;
movePtr->y *= speed;
obj->mMovement.mMoveState = AIController::ModeSlowing;
}
else
{
movePtr->x *= obj->mMovement.mMoveSpeed;
movePtr->y *= obj->mMovement.mMoveSpeed;
obj->mMovement.mMoveState = AIController::ModeMove;
} }
} }