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

Merge pull request #1671 from Azaezel/alpha41/forgetMeNot

Browse source 
don't spool up new helper proxies if the goals are unchanged
This commit is contained in:
Brian Roberts 2026-02-23 20:06:06 -06:00 • committed by GitHub
commit 26638a95c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 63 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/AI/AIAimTarget.cpp
View file

@ -194,7 +194,9 @@ DefineEngineMethod(AIController, getAimObject, S32, (), ,
"@see setAimObject()\n") "@see setAimObject()\n")
{ {
SceneObject* obj = dynamic_cast<GameBase*>(object->getAim()->mObj.getPointer()); SceneObject* obj = NULL;
if (object->getAim())
obj = dynamic_cast<GameBase*>(object->getAim()->mObj.getPointer());
return obj ? obj->getId() : -1; return obj ? obj->getId() : -1;
} }

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

@ -70,7 +70,12 @@ bool AIController::setControllerDataProperty(void* obj, const char* index, const
void AIController::setGoal(AIInfo* targ) void AIController::setGoal(AIInfo* targ)
{ {
if (mGoal) { delete(mGoal); mGoal = NULL; } if (mGoal)
{
if (mGoal->mObj.isValid() && targ->mObj.isValid() && mGoal->mObj == targ->mObj)
return;
delete(mGoal); mGoal = NULL;
}
if (targ->mObj.isValid()) if (targ->mObj.isValid())
{ {
@ -86,26 +91,58 @@ void AIController::setGoal(AIInfo* targ)
void AIController::setGoal(Point3F loc, F32 rad) void AIController::setGoal(Point3F loc, F32 rad)
{ {
if (mGoal) delete(mGoal); if (mGoal)
{
if (mGoal->mPosSet && mGoal->getPosition() == loc)
{
mGoal->mRadius = rad;
return;
}
delete(mGoal);
}
mGoal = new AIGoal(this, loc, rad); mGoal = new AIGoal(this, loc, rad);
} }
void AIController::setGoal(SimObjectPtr<SceneObject> objIn, F32 rad) void AIController::setGoal(SimObjectPtr<SceneObject> objIn, F32 rad)
{ {
if (mGoal) delete(mGoal); if (mGoal)
{
if (mGoal->mObj.isValid() && objIn.isValid() && mGoal->mObj == objIn)
{
mGoal->mRadius = rad;
return;
}
delete(mGoal);
}
mGoal = new AIGoal(this, objIn, rad); mGoal = new AIGoal(this, objIn, rad);
} }
void AIController::setAim(Point3F loc, F32 rad, Point3F offset) void AIController::setAim(Point3F loc, F32 rad, Point3F offset)
{ {
if (mAimTarget) delete(mAimTarget); if (mAimTarget)
{
if (mAimTarget->mPosSet && mAimTarget->getPosition() == loc)
{
mAimTarget->mAimOffset = offset;
return;
}
delete(mAimTarget);
}
mAimTarget = new AIAimTarget(this, loc, rad); mAimTarget = new AIAimTarget(this, loc, rad);
mAimTarget->mAimOffset = offset; mAimTarget->mAimOffset = offset;
} }
void AIController::setAim(SimObjectPtr<SceneObject> objIn, F32 rad, Point3F offset) void AIController::setAim(SimObjectPtr<SceneObject> objIn, F32 rad, Point3F offset)
{ {
if (mAimTarget) delete(mAimTarget); if (mAimTarget)
{
if (mAimTarget->mObj.isValid() && objIn.isValid() && mAimTarget->mObj == objIn)
{
mAimTarget->mAimOffset = offset;
return;
}
delete(mAimTarget);
}
mAimTarget = new AIAimTarget(this, objIn, rad); mAimTarget = new AIAimTarget(this, objIn, rad);
mAimTarget->mAimOffset = offset; mAimTarget->mAimOffset = offset;
} }

20
Engine/source/T3D/AI/AIController.h
View file

@ -70,8 +70,24 @@ public:
private: private:
AICover* mCover; AICover* mCover;
public: public:
void setCover(Point3F loc, F32 rad = 0.0f) { delete(mCover); mCover = new AICover(this, loc, rad); } void setCover(Point3F loc, F32 rad = 0.0f)
void setCover(SimObjectPtr<SceneObject> objIn, F32 rad = 0.0f) { delete(mCover); mCover = new AICover(this, objIn, rad); } {
if (mCover && mCover->mPosSet && mCover->getPosition() == loc)
{
mCover->mRadius == rad;
return;
}
delete(mCover); mCover = new AICover(this, loc, rad);
}
void setCover(SimObjectPtr<SceneObject> objIn, F32 rad = 0.0f)
{
if (mCover && mCover->mObj == objIn)
{
mCover->mRadius == rad;
return;
}
delete(mCover); mCover = new AICover(this, objIn, rad);
}
AICover* getCover() { return mCover; } AICover* getCover() { return mCover; }
bool findCover(const Point3F& from, F32 radius); bool findCover(const Point3F& from, F32 radius);
void clearCover(); void clearCover();