TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

elevated mAicontroller to shapebase

Browse source 
aiwheeleedveiclecontrollerdata resolvespeed now only touches throttle
objects assigned aicontrollers now reflect that by thier objecttype
basic flocking
This commit is contained in:
AzaezelX 2025-04-19 04:25:36 -05:00
parent d36cf31707
commit 3210325f3f
15 changed files with 352 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Engine/source/T3D/shapeBase.cpp
View file

@ -69,6 +69,7 @@
#include "core/stream/fileStream.h"
#include "T3D/accumulationVolume.h"
#include "console/persistenceManager.h"
#include "AI/AIController.h"
IMPLEMENT_CO_DATABLOCK_V1(ShapeBaseData);
@ -195,7 +196,8 @@ ShapeBaseData::ShapeBaseData()
useEyePoint( false ),
isInvincible( false ),
renderWhenDestroyed( true ),
inheritEnergyFromMount( false )
inheritEnergyFromMount( false ),
mAIControllData(NULL)
{
INIT_ASSET(Shape);
INIT_ASSET(DebrisShape);
@ -544,6 +546,10 @@ void ShapeBaseData::initPersistFields()
addField("silentBBoxValidation", TypeBool, Offset(silent_bbox_check, ShapeBaseData));
INITPERSISTFIELD_SHAPEASSET(DebrisShape, ShapeBaseData, "The shape asset to use for auto-generated breakups via blowup(). @note may not be functional.");
endGroup( "Shapes" );
addGroup("Movement");
addField("aiControllerData", TYPEID< AIControllerData >(), Offset(mAIControllData, ShapeBaseData),
"@brief ai controller used by these types of objects.\n\n");
endGroup("Movement");
addGroup("Particle Effects");
addField( "explosion", TYPEID< ExplosionData >(), Offset(explosion, ShapeBaseData),
@ -981,7 +987,8 @@ ShapeBase::ShapeBase()
mCameraFov( 90.0f ),
mIsControlled( false ),
mLastRenderFrame( 0 ),
mLastRenderDistance( 0.0f )
mLastRenderDistance( 0.0f ),
mAIController(NULL)
{
mTypeMask |= ShapeBaseObjectType | LightObjectType;
@ -1032,6 +1039,7 @@ ShapeBase::~ShapeBase()
cur->next = sFreeTimeoutList;
sFreeTimeoutList = cur;
}
if (mAIController) mAIController->deleteObject();
}
void ShapeBase::initPersistFields()
@ -5449,3 +5457,43 @@ DefineEngineMethod(ShapeBase, getNodePoint, Point3F, (const char* nodeName), ,
return pos;
}
bool ShapeBase::setAIController(SimObjectId controller)
{
if (Sim::findObject(controller, mAIController) && mAIController->mControllerData)
{
mAIController->setAIInfo(this);
mTypeMask |= AIObjectType;
return true;
}
Con::errorf("unable to find AIController : %i", controller);
mAIController = NULL;
mTypeMask |= ~AIObjectType;
return false;
}
bool ShapeBase::getAIMove(Move* move)
{
if (!isServerObject()) return false;
if (!(mTypeMask & VehicleObjectType || mTypeMask & PlayerObjectType)) return false; //only support players and vehicles for now
if (mAIController)
{
mAIController->getAIMove(move); //actual result
mTypeMask |= AIObjectType;
return true;
}
mAIController = NULL;
mTypeMask &= ~AIObjectType;
return false;
}
DefineEngineMethod(ShapeBase, setAIController, bool, (S32 controller), , "")
{
return object->setAIController(controller);
}
DefineEngineMethod(ShapeBase, getAIController, AIController*, (), , "")
{
return object->getAIController();
}