Fixed release build crash + more

- Hazelnut will now prompt to open project on startup if no command line args are set - Fixed crash when editing already set script module class name - Added UI::ScopedStyleColor utility class
DawsonCohen · Dec 5, 2022 · bba1220 · bba1220
1 parent 8b80550
commit bba1220
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 17 deletions.
diff --git a/Hazel/src/Hazel/Scripting/ScriptEngine.cpp b/Hazel/src/Hazel/Scripting/ScriptEngine.cpp
@@ -133,8 +133,11 @@ namespace Hazel {
 		Scope<filewatch::FileWatch<std::string>> AppAssemblyFileWatcher;
 		bool AssemblyReloadPending = false;
 
+#ifdef HZ_DEBUG
 		bool EnableDebugging = true;
-
+#else
+		bool EnableDebugging = false;
+#endif
 		// Runtime
 
 		Scene* SceneContext = nullptr;

diff --git a/Hazel/src/Hazel/UI/UI.h b/Hazel/src/Hazel/UI/UI.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <imgui/imgui.h>
+
+namespace Hazel::UI {
+
+	struct ScopedStyleColor
+	{
+		ScopedStyleColor() = default;
+
+		ScopedStyleColor(ImGuiCol idx, ImVec4 color, bool predicate = true)
+			: m_Set(predicate)
+		{
+			if (predicate)
+				ImGui::PushStyleColor(idx, color);
+		}
+
+		ScopedStyleColor(ImGuiCol idx, ImU32 color, bool predicate = true)
+			: m_Set(predicate)
+		{
+			if (predicate)
+				ImGui::PushStyleColor(idx, color);
+		}
+
+		~ScopedStyleColor()
+		{
+			if (m_Set)
+				ImGui::PopStyleColor();
+		}
+	private:
+		bool m_Set = false;
+	};
+
+
+}
diff --git a/Hazelnut/src/EditorLayer.cpp b/Hazelnut/src/EditorLayer.cpp
@@ -47,7 +47,13 @@ namespace Hazel {
 		else
 		{
 			// TODO(Yan): prompt the user to select a directory
-			NewProject();
+			// NewProject();
+
+			// If no project is opened, close Hazelnut
+			// NOTE: this is while we don't have a new project path
+			if (!OpenProject())
+				Application::Get().Close();
+
 		}
 
 		m_EditorCamera = EditorCamera(30.0f, 1.778f, 0.1f, 1000.0f);
@@ -187,21 +193,22 @@ namespace Hazel {
 		{
 			if (ImGui::BeginMenu("File"))
 			{
-				// Disabling fullscreen would allow the window to be moved to the front of other windows, 
-				// which we can't undo at the moment without finer window depth/z control.
-				//ImGui::MenuItem("Fullscreen", NULL, &opt_fullscreen_persistant);1
-				if (ImGui::MenuItem("New", "Ctrl+N"))
-					NewScene();
+				if (ImGui::MenuItem("Open Project...", "Ctrl+O"))
+					OpenProject();
 
-				if (ImGui::MenuItem("Open...", "Ctrl+O"))
-					OpenScene();
+				ImGui::Separator();
 
-				if (ImGui::MenuItem("Save", "Ctrl+S"))
+				if (ImGui::MenuItem("New Scene", "Ctrl+N"))
+					NewScene();
+
+				if (ImGui::MenuItem("Save Scene", "Ctrl+S"))
 					SaveScene();
 
-				if (ImGui::MenuItem("Save As...", "Ctrl+Shift+S"))
+				if (ImGui::MenuItem("Save Scene As...", "Ctrl+Shift+S"))
 					SaveSceneAs();
 
+				ImGui::Separator();
+
 				if (ImGui::MenuItem("Exit"))
 					Application::Get().Close();
 
@@ -446,7 +453,7 @@ namespace Hazel {
 			case Key::O:
 			{
 				if (control)
-					OpenScene();
+					OpenProject();
 
 				break;
 			}
@@ -597,6 +604,16 @@ namespace Hazel {
 		}
 	}
 
+	bool EditorLayer::OpenProject()
+	{
+		std::string filepath = FileDialogs::OpenFile("Hazel Project (*.hproj)\0*.hproj\0");
+		if (filepath.empty())
+			return false;
+
+		OpenProject(filepath);
+		return true;
+	}
+
 	void EditorLayer::SaveProject()
 	{
 		// Project::SaveActive();

diff --git a/Hazelnut/src/EditorLayer.h b/Hazelnut/src/EditorLayer.h
@@ -27,6 +27,7 @@ namespace Hazel {
 		void OnOverlayRender();
 
 		void NewProject();
+		bool OpenProject();
 		void OpenProject(const std::filesystem::path& path);
 		void SaveProject();
 

diff --git a/Hazelnut/src/Panels/SceneHierarchyPanel.cpp b/Hazelnut/src/Panels/SceneHierarchyPanel.cpp
@@ -2,6 +2,7 @@
 #include "Hazel/Scene/Components.h"
 
 #include "Hazel/Scripting/ScriptEngine.h"
+#include "Hazel/UI/UI.h"
 
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>
@@ -327,11 +328,13 @@ namespace Hazel {
 			static char buffer[64];
 			strcpy_s(buffer, sizeof(buffer), component.ClassName.c_str());
 
-			if (!scriptClassExists)
-				ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.9f, 0.2f, 0.3f, 1.0f));
+			UI::ScopedStyleColor textColor(ImGuiCol_Text, ImVec4(0.9f, 0.2f, 0.3f, 1.0f), !scriptClassExists);
 
 			if (ImGui::InputText("Class", buffer, sizeof(buffer)))
+			{
 				component.ClassName = buffer;
+				return;
+			}
 
 			// Fields
 			bool sceneRunning = scene->IsRunning();
@@ -394,9 +397,6 @@ namespace Hazel {
 					}
 				}
 			}
-
-			if (!scriptClassExists)
-				ImGui::PopStyleColor();
 		});
 
 		DrawComponent<SpriteRendererComponent>("Sprite Renderer", entity, [](auto& component)