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

Merge pull request #1653 from Azaezel/navtoolMinorFixes
Some checks are pending
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Waiting to run
Details
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Waiting to run
Details
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Waiting to run
Details

Browse source 
navmesh minor tooling fixes
This commit is contained in:
Brian Roberts 2026-01-16 08:02:43 -06:00 • committed by GitHub
commit c811140d3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/T3D/item.cpp
View file

@ -312,6 +312,7 @@ IMPLEMENT_CALLBACK( Item, onLeaveLiquid, void, ( const char* objID, const char*
Item::Item() Item::Item()
{ {
mTypeMask |= ItemObjectType | DynamicShapeObjectType; mTypeMask |= ItemObjectType | DynamicShapeObjectType;
mPathfindingIgnore = true;
mDataBlock = 0; mDataBlock = 0;
mStatic = false; mStatic = false;
mRotate = false; mRotate = false;

2
Engine/source/T3D/player.cpp
View file

@ -1552,7 +1552,7 @@ ConsoleDocClass( Player,
Player::Player() Player::Player()
{ {
mTypeMask |= PlayerObjectType | DynamicShapeObjectType; mTypeMask |= PlayerObjectType | DynamicShapeObjectType;
mPathfindingIgnore = true;
mDelta.pos = mAnchorPoint = Point3F(0,0,100); mDelta.pos = mAnchorPoint = Point3F(0,0,100);
mDelta.rot = mDelta.head = Point3F(0,0,0); mDelta.rot = mDelta.head = Point3F(0,0,0);
mDelta.rotOffset.set(0.0f,0.0f,0.0f); mDelta.rotOffset.set(0.0f,0.0f,0.0f);

2
Engine/source/T3D/vehicles/vehicle.cpp
View file

@ -376,7 +376,7 @@ Vehicle::Vehicle()
{ {
mDataBlock = 0; mDataBlock = 0;
mTypeMask |= VehicleObjectType | DynamicShapeObjectType; mTypeMask |= VehicleObjectType | DynamicShapeObjectType;
mPathfindingIgnore = true;
mDelta.pos = Point3F(0,0,0); mDelta.pos = Point3F(0,0,0);
mDelta.posVec = Point3F(0,0,0); mDelta.posVec = Point3F(0,0,0);
mDelta.warpTicks = mDelta.warpCount = 0; mDelta.warpTicks = mDelta.warpCount = 0;

6
Engine/source/navigation/navMesh.cpp
View file

@ -454,8 +454,8 @@ S32 NavMesh::getLink(const Point3F &pos)
{ {
if(mDeleteLinks[i]) if(mDeleteLinks[i])
continue; continue;
SphereF start(getLinkStart(i), mLinkRads[i]); SphereF start(getLinkStart(i), mMax(mLinkRads[i],0.25f));
SphereF end(getLinkEnd(i), mLinkRads[i]); SphereF end(getLinkEnd(i), mMax(mLinkRads[i], 0.25f));
if(start.isContained(pos) || end.isContained(pos)) if(start.isContained(pos) || end.isContained(pos))
return i; return i;
} }
@ -653,7 +653,7 @@ DefineEngineMethod(NavMesh, deleteLinks, void, (),,
static void buildCallback(SceneObject* object, void* key) static void buildCallback(SceneObject* object, void* key)
{ {
SceneContainer::CallbackInfo* info = reinterpret_cast<SceneContainer::CallbackInfo*>(key); SceneContainer::CallbackInfo* info = reinterpret_cast<SceneContainer::CallbackInfo*>(key);
if (!object->mPathfindingIgnore) if (!object->mPathfindingIgnore && (object->getTypeMask() & MarkerObjectType) == 0)
object->buildPolyList(info->context, info->polyList, info->boundingBox, info->boundingSphere); object->buildPolyList(info->context, info->polyList, info->boundingBox, info->boundingSphere);
} }