Implement BaseID to avoid clashes

sdslabs · Sep 26, 2022 · 404fb85 · 404fb85
1 parent 0eabdfc
commit 404fb85
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/editor/editor_system.cpp b/editor/editor_system.cpp
@@ -318,7 +318,10 @@ void EditorSystem::drawDefaultUI(float deltaMilliseconds)
 				ImGui::Separator();
 				if (ImGui::BeginMenu("Create Scene"))
 				{
+					SceneID inputBaseID = 0;
 					ImGui::InputText("Scene Name", &newSceneName, ImGuiInputTextFlags_AlwaysInsertMode);
+					ImGui::InputScalar("Scene BaseID", ImGuiDataType_U32, &inputBaseID);
+					Scene::SetBaseID(inputBaseID);
 					if (!newSceneName.empty() && ImGui::Button("Create"))
 					{
 						if (SceneLoader::GetSingleton()->getCurrentScene())

diff --git a/rootex/framework/scene.cpp b/rootex/framework/scene.cpp
@@ -7,8 +7,9 @@
 #include "components/visual/camera_component.h"
 #include "components/audio/audio_listener_component.h"
 
-static SceneID NextSceneID = ROOT_SCENE_ID + 1;
 Vector<Scene*> Scene::s_Scenes;
+SceneID Scene::BaseID;
+static SceneID NextSceneID = ROOT_SCENE_ID + 1;
 
 void to_json(JSON::json& j, const SceneSettings& s)
 {
@@ -50,6 +51,13 @@ void Scene::ResetNextID()
 	NextSceneID = ROOT_SCENE_ID + 1;
 }
 
+void Scene::SetBaseID(const SceneID& inputBaseID)
+{
+	BaseID = inputBaseID;
+	SceneID SceneIDOffset = 4;
+	NextSceneID = std::max(std::max(BaseID, NextSceneID), SceneIDOffset);
+}
+
 Ptr<Scene> Scene::Create(const JSON::json& sceneData, const bool assignNewIDs)
 {
 	// Decide ID
@@ -321,6 +329,7 @@ JSON::json Scene::getJSON() const
 
 	j["ID"] = m_ID;
 	j["name"] = m_Name;
+	j["BaseID"] = m_BaseID;
 	j["importStyle"] = m_ImportStyle;
 	j["sceneFile"] = m_SceneFile;
 	j["entity"] = m_Entity.getJSON();
@@ -345,6 +354,7 @@ Scene::Scene(SceneID id, const String& name, const SceneSettings& settings, Impo
     , m_Entity(this)
 {
 	setName(m_Name);
+	setBaseID();
 	s_Scenes.push_back(this);
 }
 

diff --git a/rootex/framework/scene.h b/rootex/framework/scene.h
@@ -40,9 +40,10 @@ class Scene
 	bool m_IsScenePaused;
 
 	static Vector<Scene*> s_Scenes;
-
+	static SceneID BaseID;
 	SceneID m_ID;
 	String m_Name;
+	SceneID m_BaseID;
 	String m_FullName;
 	ImportStyle m_ImportStyle;
 	/// Contains the current file name if local, else contains the linked scene file
@@ -57,6 +58,7 @@ class Scene
 
 public:
 	static void ResetNextID();
+	static void SetBaseID(const SceneID& inputBaseID);
 
 	static Ptr<Scene> Create(const JSON::json& sceneData, const bool assignNewIDs);
 	static Ptr<Scene> CreateFromFile(const String& sceneFile);
@@ -80,6 +82,7 @@ class Scene
 	bool removeChild(Scene* toRemove);
 
 	void setName(const String& name);
+	void setBaseID() { m_BaseID = BaseID; }
 
 	JSON::json getJSON() const;
 	bool& getIsScenePaused() { return m_IsScenePaused; }