Adds warning messages, fixes clang-format

Author: SK1PPR

editor/editor_system.cpp

@@ -172,17 +172,15 @@ bool EditorSystem::initialize(const JSON::json& systemData)
 		colors[ImGuiCol_ModalWindowDimBg] = ImVec4(1.00f, 0.98f, 0.95f, 0.73f);
 	}
 
-	// --- Load json theme data ---
+	// Load json theme data
 	for (const auto& entry : std::filesystem::directory_iterator("editor/themes"))
 	{
 		if (entry.path().extension() == ".json")
 		{
-			std::ifstream f(entry.path());
-			nlohmann::json data;
+			InputFileStream f(entry.path());
+			JSON::json data;
 			f >> data;
-			m_ThemeDefinitions.push_back({ data.value("name", entry.path().stem().string()),
-			    entry.path().string(),
-			    data });
+			m_ThemeDefinitions.push_back( { data.value("name", entry.path().stem().string()), entry.path().string(), data } );
 		}
 	}
 
@@ -1013,7 +1011,8 @@ int EditorSystem::exportScene(const String& sceneName, const String& sceneFilePa
 			{
 				return;
 			}
-			m_IsCopyFailed = !OS::RelativeCopyFile(filePair.first, m_CurrExportDir + filePair.second); }));
+			m_IsCopyFailed = !OS::RelativeCopyFile(filePair.first, m_CurrExportDir + filePair.second);
+		}));
 	}
 
 	/// TODO: Fix the need for this dummy task (blocks the main thread while tasks are running)

editor/editor_system.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "core/event_manager.h"
-#include "framework/system.h"
 #include "script/interpreter.h"
+#include "framework/system.h"
 #include "utility/imgui_helpers.h"
 
 #include "vendor/ImGUI/imgui.h"
@@ -72,8 +72,7 @@ class EditorSystem : public System
 	~EditorSystem();
 
 	void drawDefaultUI(float deltaMilliseconds);
-	void drawProgressBar(Atomic<int>& progress, float& currentProgress,
-	    int& totalProgress);
+	void drawProgressBar(Atomic<int>& progress, float& currentProgress, int& totalProgress);
 
 	void showDocumentation(const String& name, const sol::table& table);
 
@@ -82,8 +81,7 @@ class EditorSystem : public System
 	Variant saveBeforeQuit(const Event* event);
 	Variant createNewScene(const Event* event);
 	Variant createNewFile(const Event* event);
-	int exportScene(const String& sceneName, const String& sceneFilePath,
-	    Atomic<int>& progress);
+	int exportScene(const String& sceneName, const String& sceneFilePath, Atomic<int>& progress);
 	void postExport();
 
 	Vector<ThemeDefinition> m_ThemeDefinitions;
@@ -103,24 +101,9 @@ class EditorSystem : public System
 
 	void openScene(String sceneName);
 
-	ImColor getWarningColor() const
-	{
-		return ColorToImColor((Color)ColorPresets::LightYellow);
-	}
-	ImColor getFatalColor() const
-	{
-		return ColorToImColor((Color)ColorPresets::IndianRed);
-	}
-	ImColor getSuccessColor() const
-	{
-		return ColorToImColor((Color)ColorPresets::LimeGreen);
-	}
-	ImColor getNormalColor() const
-	{
-		return ColorToImColor((Color)ColorPresets::White);
-	}
-	ImColor getLinkColor() const
-	{
-		return ColorToImColor((Color)ColorPresets::SteelBlue);
-	}
+	ImColor getWarningColor() const { return ColorToImColor((Color)ColorPresets::LightYellow); }
+	ImColor getFatalColor() const { return ColorToImColor((Color)ColorPresets::IndianRed); }
+	ImColor getSuccessColor() const { return ColorToImColor((Color)ColorPresets::LimeGreen); }
+	ImColor getNormalColor() const { return ColorToImColor((Color)ColorPresets::White); }
+	ImColor getLinkColor() const { return ColorToImColor((Color)ColorPresets::SteelBlue); }
 };

editor/themes/theme.cpp

@@ -2,25 +2,40 @@
 
 void setVec2(const JSON::json& j, const char* key, ImVec2& ref)
 {
-	if (j.contains(key) && j[key].is_array() && j[key].size() == 2)
+	if (j.contains(key))
 	{
-		ref = ImVec2(j[key][0], j[key][1]);
+		if (j[key].is_array() && j[key].size() == 2)
+		{
+			ref = ImVec2(j[key][0], j[key][1]);
+			return;
+		}
+		WARN("Theme key: " + key + " is not a valid array of size 2");
 	}
 }
 
 void setFloat(const JSON::json& j, const char* key, float& ref)
 {
 	if (j.contains(key))
 	{
-		ref = j[key].get<float>();
+		if (j[key].is_number())
+		{
+			ref = j[key].get<float>();
+			return;
+		}
+		WARN("Theme key: " + key + " is not a valid number");
 	}
 }
 
 void setColor(const JSON::json& j, const char* key, ImVec4& ref)
 {
-	if (j.contains(key) && j[key].is_array() && j[key].size() == 4)
+	if (j.contains(key))
 	{
-		ref = ImVec4(j[key][0], j[key][1], j[key][2], j[key][3]);
+		if (j[key].is_array() && j[key].size() == 4)
+		{
+			ref = ImVec4(j[key][0], j[key][1], j[key][2], j[key][3]);
+			return;
+		}
+		WARN("Theme key: " + key + " is not a valid array of size 4");
 	}
 }
 
@@ -108,8 +123,7 @@ void ThemeDefinition::apply() const
 		setColor(c, "TextSelectedBg", colors[ImGuiCol_TextSelectedBg]);
 		setColor(c, "DragDropTarget", colors[ImGuiCol_DragDropTarget]);
 		setColor(c, "NavHighlight", colors[ImGuiCol_NavHighlight]);
-		setColor(c, "NavWindowingHighlight",
-		    colors[ImGuiCol_NavWindowingHighlight]);
+		setColor(c, "NavWindowingHighlight", colors[ImGuiCol_NavWindowingHighlight]);
 		setColor(c, "NavWindowingDimBg", colors[ImGuiCol_NavWindowingDimBg]);
 		setColor(c, "ModalWindowDimBg", colors[ImGuiCol_ModalWindowDimBg]);
 	}

editor/themes/theme.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/types.h"
+#include "common/common.h"
 
 struct ThemeDefinition
 {