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

Removed scan-down of subscenes from Scene's getObjectsByClass call

Browse source 
Properly returned value for SubScene::save()
This commit is contained in:
Areloch 2024-09-01 17:14:08 -05:00
parent ae8eca48e1
commit d896a2b99a
3 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -369,7 +369,7 @@ void Scene::getUtilizedAssetsFromSceneObject(SimObject* object, Vector<StringTab
} }
// //
Vector<SceneObject*> Scene::getObjectsByClass(String className, bool checkSubscenes) Vector<SceneObject*> Scene::getObjectsByClass(String className)
{ {
return Vector<SceneObject*>(); return Vector<SceneObject*>();
} }

19
Engine/source/T3D/Scene.h
View file

@ -86,12 +86,12 @@ public:
void unpackUpdate(NetConnection *conn, BitStream *stream) override; void unpackUpdate(NetConnection *conn, BitStream *stream) override;
// //
Vector<SceneObject*> getObjectsByClass(String className, bool checkSubscenes); Vector<SceneObject*> getObjectsByClass(String className);
void getUtilizedAssetsFromSceneObject(SimObject* object, Vector<StringTableEntry>* usedAssetsList); void getUtilizedAssetsFromSceneObject(SimObject* object, Vector<StringTableEntry>* usedAssetsList);
template <class T> template <class T>
Vector<T*> getObjectsByClass(bool checkSubscenes); Vector<T*> getObjectsByClass();
static Scene *getRootScene() static Scene *getRootScene()
{ {
@ -108,7 +108,7 @@ public:
template <class T> template <class T>
Vector<T*> Scene::getObjectsByClass(bool checkSubscenes) Vector<T*> Scene::getObjectsByClass()
{ {
Vector<T*> foundObjects; Vector<T*> foundObjects;
@ -129,19 +129,6 @@ Vector<T*> Scene::getObjectsByClass(bool checkSubscenes)
foundObjects.push_back(curObject); foundObjects.push_back(curObject);
} }
if (checkSubscenes)
{
for (U32 i = 0; i < mSubScenes.size(); i++)
{
Vector<T*> appendList = mSubScenes[i]->getObjectsByClass<T>(true);
for (U32 a = 0; a < appendList.size(); a++)
{
foundObjects.push_back(appendList[a]);
}
}
}
return foundObjects; return foundObjects;
} }
#endif #endif

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

@ -338,6 +338,7 @@ bool SubScene::save()
//Finally, save //Finally, save
saveSuccess = mLevelAsset->saveAsset(); saveSuccess = mLevelAsset->saveAsset();
return saveSuccess;
} }
void SubScene::_onSelected() void SubScene::_onSelected()