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

Basic fix for zone removal issue

Browse source
This commit is contained in:
James Urquhart 2024-03-11 23:02:15 +00:00
parent 9f5c74c79a
commit 42f4ccfbb5
2 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Engine/source/scene/zones/sceneZoneSpaceManager.cpp
View file

@ -714,9 +714,10 @@ void SceneZoneSpaceManager::_zoneRemove( SceneObject* obj, bool freeList )
PROFILE_SCOPE( SceneZoneSpaceManager_zoneRemove ); PROFILE_SCOPE( SceneZoneSpaceManager_zoneRemove );
// Remove the object from the zone lists. // Remove the object from the zone lists.
U32 numZones = 0; U32 numZones = 0;
U32* zones = NULL; U32* zones = NULL;
bool zonesDirty = obj->mZoneRefDirty;
zones = mObjectZoneLists.getValues(obj->mZoneListHandle, numZones); zones = mObjectZoneLists.getValues(obj->mZoneListHandle, numZones);
for (U32 i=0; i<numZones; i++) for (U32 i=0; i<numZones; i++)
@ -724,7 +725,26 @@ void SceneZoneSpaceManager::_zoneRemove( SceneObject* obj, bool freeList )
// Let the zone owner know we are removing an object // Let the zone owner know we are removing an object
// from its zones. // from its zones.
getZoneOwner( zones[i] )->_onZoneRemoveObject(obj); SceneZoneSpace* space = getZoneOwner(zones[i]);
if (space == NULL)
{
AssertFatal(zonesDirty, "Object still has reference to removed zone");
continue;
}
space->_onZoneRemoveObject(obj);
// Remove the object from the zones object list
Vector<SceneObject*>* objectList = getZoneObjects(zones[i]);
if (objectList)
{
Vector<SceneObject*>::iterator itr = T3D::find(objectList->begin(), objectList->end(), obj);
if (itr != objectList->end())
{
objectList->erase(itr);
}
}
} }
// Clear the object's zoning state. // Clear the object's zoning state.
@ -779,6 +799,12 @@ void SceneZoneSpaceManager::_setObjectZoneList( SceneObject* object, U32 numZone
mObjectZoneLists.reallocList(object->mZoneListHandle, numZones, zoneList); mObjectZoneLists.reallocList(object->mZoneListHandle, numZones, zoneList);
} }
// Make sure each zone has the object in its list
for (U32 i = 0; i < numZones; i++)
{
mZoneLists[zoneList[i]]->mObjects.push_back(object);
}
object->mNumCurrZones = numZones; object->mNumCurrZones = numZones;
} }
@ -801,17 +827,16 @@ void SceneZoneSpaceManager::_clearZoneList( U32 zoneId )
object->mNumCurrZones --; object->mNumCurrZones --;
// If this is the only zone the object was in, mark // Keep things simple here and flag the objects zone list for re-calculation
// its zoning state as dirty so it will get assigned object->mZoneRefDirty = true;
// to the outdoor zone on the next update.
if( object->mNumCurrZones == 0 )
object->mZoneRefDirty = true;
// Let the zone know we have removed the object. // Let the zone know we have removed the object.
zoneSpace->_onZoneRemoveObject( object ); zoneSpace->_onZoneRemoveObject( object );
} }
// Reset all objects for zone
list->mObjects.clear();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
Engine/source/scene/zones/sceneZoneSpaceManager.h
View file

@ -94,7 +94,7 @@ class SceneZoneSpaceManager
ZoneObjectList(SceneObject* manager) : mManager(manager) { ; } ZoneObjectList(SceneObject* manager) : mManager(manager) { ; }
inline SceneObject* getManager() const { return mManager; } inline SceneObject* getManager() const { return mManager; }
inline Vector<SceneObject*> getObjects() const { return mObjects; } inline Vector<SceneObject*>& getObjects() { return mObjects; }
}; };
protected: protected:
@ -260,6 +260,13 @@ class SceneZoneSpaceManager
return ( SceneZoneSpace* )(list ? list->getManager() : NULL); return ( SceneZoneSpace* )(list ? list->getManager() : NULL);
} }
Vector<SceneObject*>* getZoneObjects(const U32 zoneId) const
{
AssertFatal(isValidZoneId(zoneId), "SceneManager::getZoneOwner - Invalid zone ID!");
ZoneObjectList* list = mZoneLists[zoneId];
return (list ? &list->getObjects() : NULL);
}
/// Return the total number of zones in the scene. /// Return the total number of zones in the scene.
U32 getNumZones() const { return mNumTotalAllocatedZones; } U32 getNumZones() const { return mNumTotalAllocatedZones; }