Merge pull request #579 from sdslabs/reservedEntityNames

Added Reserved Entity Names

Author: Bashar-Ahmed

editor/editor_system.cpp

@@ -319,7 +319,7 @@ void EditorSystem::drawDefaultUI(float deltaMilliseconds)
 				if (ImGui::BeginMenu("Create Scene"))
 				{
 					ImGui::InputText("Scene Name", &newSceneName, ImGuiInputTextFlags_AlwaysInsertMode);
-					if (!newSceneName.empty() && ImGui::Button("Create"))
+					if (!newSceneName.empty() && ImGui::Button("Create") && !Scene::isReservedName(newSceneName))
 					{
 						if (SceneLoader::GetSingleton()->getCurrentScene())
 						{
@@ -449,7 +449,7 @@ void EditorSystem::drawDefaultUI(float deltaMilliseconds)
 			}
 			if (ImGui::BeginMenu("Scene"))
 			{
-				ImGui::Checkbox("Autosave", &m_Autosave);
+				ImGui::Checkbox("Autosave", &m_Autosave);
 
 				if (SceneLoader::GetSingleton()->getCurrentScene())
 				{
@@ -871,8 +871,8 @@ Variant EditorSystem::autoSave(const Event* event)
 		PRINT("Auto-saving current scene...");
 		saveAll(nullptr);
 		return true;
-	}
-
+	}
+
 	return false;
 }
 

editor/gui/inspector_dock.cpp

@@ -193,7 +193,10 @@ void InspectorDock::draw(float deltaMilliseconds)
 				{
 					if (ImGui::InputText("Scene Name", &m_OpenedSceneName, ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll))
 					{
-						m_OpenedScene->setName(m_OpenedSceneName);
+						if (!Scene::isReservedName(m_OpenedSceneName))
+						{
+							m_OpenedScene->setName(m_OpenedSceneName);
+						}
 						m_IsNameBeingEdited = false;
 					}
 					if (!ImGui::IsItemHovered() && ImGui::IsMouseClicked(ImGuiMouseButton_Left))

game/game_application.cpp

@@ -22,10 +22,13 @@ Ref<Application> CreateRootexApplication()
 Optional<String> GameApplication::getSceneNameFromCommandLine(const char* s)
 {
 	String cmdLine = s;
-	size_t found = cmdLine.find("game/assets/");
-	if (found != String::npos)
+	if (!Scene::isReservedName(cmdLine))
 	{
-		return cmdLine.substr(found, cmdLine.size() - 1);
+		size_t found = cmdLine.find("game/assets/");
+		if (found != String::npos)
+		{
+			return cmdLine.substr(found, cmdLine.size() - 1);
+		}
 	}
 	return {};
 }
@@ -47,7 +50,11 @@ GameApplication::GameApplication()
 	}
 	else
 	{
-		SceneLoader::GetSingleton()->loadScene(m_ApplicationSettings->getJSON()["startScene"], {});
+		String sceneName = m_ApplicationSettings->getJSON()["startScene"];
+		if (Scene::isReservedName(sceneName))
+		{
+			SceneLoader::GetSingleton()->loadScene(sceneName, {});
+		}
 	}
 
 	GameRenderSystem::GetSingleton()->initialize({});

rootex/framework/scene.cpp

@@ -309,6 +309,20 @@ bool Scene::removeChild(Scene* toRemove)
 	return false;
 }
 
+bool Scene::isReservedName(const String& sceneName)
+{
+	static Vector<String> reservedNames { "pause", "pauseUI" };
+	for (auto& reservedName : reservedNames)
+	{
+		if (reservedName == sceneName)
+		{
+			WARN("Cannot use reserved scene names");
+			return true;
+		}
+	}
+	return false;
+}
+
 void Scene::setName(const String& name)
 {
 	m_Name = name;

rootex/framework/scene.h

@@ -63,6 +63,7 @@ class Scene
 	static Ptr<Scene> CreateEmpty();
 	static Ptr<Scene> CreateEmptyAtPath(const String& sceneFile);
 	static Ptr<Scene> CreateRootScene();
+	static bool isReservedName(const String& sceneName);
 
 	static Vector<Scene*> FindScenesByName(const String& name);
 	static Scene* FindSceneByID(const SceneID& id);