Bug fix while importing scene

sdslabs · Sep 21, 2022 · 102652b · 102652b
1 parent 1b14649
commit 102652b
Show file tree

Hide file tree

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

diff --git a/rootex/framework/scene.cpp b/rootex/framework/scene.cpp
@@ -51,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
@@ -69,8 +76,6 @@ Ptr<Scene> Scene::Create(const JSON::json& sceneData, const bool assignNewIDs)
 	}
 	else
 	{
-		SceneID SceneIDOffset = 4;
-		NextSceneID = std::max(std::max(BaseID, NextSceneID), SceneIDOffset);
 		thisSceneID = NextSceneID;
 	}
 	NextSceneID++;

diff --git a/rootex/framework/scene.h b/rootex/framework/scene.h
@@ -58,7 +58,7 @@ class Scene
 
 public:
 	static void ResetNextID();
-	static void SetBaseID(const SceneID& inputBaseID) { BaseID = inputBaseID; }
+	static void SetBaseID(const SceneID& inputBaseID);
 
 	static Ptr<Scene> Create(const JSON::json& sceneData, const bool assignNewIDs);
 	static Ptr<Scene> CreateFromFile(const String& sceneFile);