Changed Fonts to be assets

Andthehand · Andthehand · commit 2efe35543a8b · 2026-01-25T23:52:41.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,10 +55,10 @@ set(SOURCE_FILES
     src/RealEngine/Core/Logger.cpp
     src/RealEngine/Core/Assert.h
     src/RealEngine/Core/Profiler.h
-    src/RealEngine/Core/Layer.h
-    src/RealEngine/Core/Layer.cpp
-    src/RealEngine/Core/LayerStack.h
-    src/RealEngine/Core/LayerStack.cpp
+    "src/RealEngine/Types/Layer.h"
+    "src/RealEngine/Types/Layer.cpp"
+    "src/RealEngine/Types/LayerStack.h"
+    "src/RealEngine/Types/LayerStack.cpp"
     src/RealEngine/Core/Window.h
     src/RealEngine/Core/Window.cpp
     src/RealEngine/Core/KeyCodes.h
@@ -125,7 +125,7 @@ set(SOURCE_FILES
     vendor/ankerl/unordered_dense.h
     vendor/filewatch/FileWatch.h
 
- "src/RealEngine/Types/RingBuffer.h"  "src/RealEngine/Core/ImGuiLogSink.h" "src/RealEngine/Asset/AssetManager.h" "src/RealEngine/Asset/Asset.h" "src/RealEngine/Asset/AssetManager.cpp"  "src/RealEngine/Asset/AssetMetadata.h" "src/RealEngine/Asset/AssetImporter.h" "src/RealEngine/Asset/AssetImporter.cpp" "src/RealEngine/Asset/TextureImporter.h" "src/RealEngine/Asset/TextureImporter.cpp" "src/RealEngine/Scripting/ScriptEngine.h" "src/RealEngine/Scripting/ScriptEngine.cpp" "src/RealEngine/Scripting/ScriptGlue.h" "src/RealEngine/Scripting/ScriptGlue.cpp" "src/RealEngine/Formatter/CoreFormatter.h" "src/RealEngine/Events/ProjectEvents.h" "src/RealEngine/Core/ProjectSerializer.h" "src/RealEngine/Core/ProjectSerializer.cpp" "src/RealEngine/Types/HashMap.h" "src/RealEngine/Scripting/ScriptInstance.h" "src/RealEngine/Scripting/ScriptInstance.cpp" "src/RealEngine/Types/Font.h" "src/RealEngine/Types/Font.cpp")
+ "src/RealEngine/Types/RingBuffer.h"  "src/RealEngine/Core/ImGuiLogSink.h" "src/RealEngine/Asset/AssetManager.h" "src/RealEngine/Asset/Asset.h" "src/RealEngine/Asset/AssetManager.cpp"  "src/RealEngine/Asset/AssetMetadata.h" "src/RealEngine/Asset/AssetImporter.h" "src/RealEngine/Asset/AssetImporter.cpp" "src/RealEngine/Asset/TextureImporter.h" "src/RealEngine/Asset/TextureImporter.cpp" "src/RealEngine/Scripting/ScriptEngine.h" "src/RealEngine/Scripting/ScriptEngine.cpp" "src/RealEngine/Scripting/ScriptGlue.h" "src/RealEngine/Scripting/ScriptGlue.cpp" "src/RealEngine/Formatter/CoreFormatter.h" "src/RealEngine/Events/ProjectEvents.h" "src/RealEngine/Core/ProjectSerializer.h" "src/RealEngine/Core/ProjectSerializer.cpp" "src/RealEngine/Types/HashMap.h" "src/RealEngine/Scripting/ScriptInstance.h" "src/RealEngine/Scripting/ScriptInstance.cpp" "src/RealEngine/Types/Font.h" "src/RealEngine/Types/Font.cpp"  "src/RealEngine/Asset/FontImporter.h" "src/RealEngine/Asset/FontImporter.cpp")
 
 # Platform-specific files
 if(WIN32)
diff --git a/src/RealEngine.h b/src/RealEngine.h
@@ -11,7 +11,6 @@
 #include "RealEngine/Core/Dialogs.h"
 #include "RealEngine/Core/Input.h"
 #include "RealEngine/Core/KeyCodes.h"
-#include "RealEngine/Core/Layer.h"
 #include "RealEngine/Core/Logger.h"
 #include "RealEngine/Core/MouseCodes.h"
 #include "RealEngine/Core/Project.h"
@@ -59,6 +58,7 @@
 // ==============================
 // Types
 // ==============================
+#include "RealEngine/Types/Layer.h"
 #include "RealEngine/Types/RingBuffer.h"
 #include "RealEngine/Types/StringHash.h"
 #include "RealEngine/Types/UUID.h"
diff --git a/src/RealEngine/Asset/Asset.h b/src/RealEngine/Asset/Asset.h
@@ -2,15 +2,28 @@
 
 #include "RealEngine/Types/StringHash.h"
 
-namespace RealEngine {
+namespace RealEngine {	
 	using AssetHandle = StringHash;
 
 	enum class AssetType : uint16_t {
 		None = 0,
 		Texture2D,
-		Shader
+		Shader,
+		Font
 	};
 
+	namespace Utils {
+		static const char* GetAssetTypeString(AssetType type) {
+			switch (type) {
+			case AssetType::None: return "None";
+			case AssetType::Texture2D: return "Texture2D";
+			case AssetType::Shader: return "Shader";
+			case AssetType::Font: return "Font";
+			default: return "Unknown";
+			}
+		};
+	}
+
 	class Asset {
 	public:
 		Asset() = default;
diff --git a/src/RealEngine/Asset/AssetImporter.cpp b/src/RealEngine/Asset/AssetImporter.cpp
@@ -1,9 +1,11 @@
 #include "AssetImporter.h"
 
+
 namespace RealEngine {
 	using AssetImportFunction = std::function<Ref<Asset>(const AssetMetadata&)>;
 	static HashMap<AssetType, AssetImportFunction> s_AssetImportFunctions = {
 		{ AssetType::Texture2D, TextureImporter::ImportTexture2D },
+		{ AssetType::Font, FontImporter::ImportFont },
 	};
 
 	Ref<Asset> AssetImporter::ImportAsset(const AssetMetadata& metadata) {
diff --git a/src/RealEngine/Asset/AssetImporter.h b/src/RealEngine/Asset/AssetImporter.h
@@ -3,6 +3,7 @@
 #include "AssetMetadata.h"
 
 #include "TextureImporter.h"
+#include "FontImporter.h"
 
 namespace RealEngine {
 	class AssetImporter {
diff --git a/src/RealEngine/Asset/AssetManager.cpp b/src/RealEngine/Asset/AssetManager.cpp
@@ -10,7 +10,8 @@ namespace RealEngine {
 			{ ".png", AssetType::Texture2D },
 			{ ".jpg", AssetType::Texture2D },
 			{ ".jpeg", AssetType::Texture2D },
-			{ ".shader", AssetType::Shader }
+			{ ".shader", AssetType::Shader },
+			{ ".ttf", AssetType::Font }
 		};
 
 		static AssetType GetAssetTypeFromFileExtension(const std::filesystem::path& extension) {
@@ -26,6 +27,8 @@ namespace RealEngine {
 			switch (type) {
 				case AssetType::Texture2D:
 					return Texture2DMetadata{};
+				case AssetType::Font:
+					return {}; // No custom metadata for fonts yet
 				default:
 					RE_CORE_ASSERT(false, "AssetType {} is not supported for CustomMetadata", (uint16_t)type);
 					return {};
@@ -181,7 +184,9 @@ namespace RealEngine {
 			if (it->second.use_count() == 1) {
 				AssetHandle handle = it->first;
 				std::filesystem::path& path = m_AssetRegistry[handle].FilePath;
-				RE_CORE_INFO("Unloading unused asset with filename: {}", path.filename());
+
+				AssetType type = m_AssetRegistry[handle].Type;
+				RE_CORE_INFO("Unloading unused {} asset with filename: {}", Utils::GetAssetTypeString(type), path.filename());
 
 				it = m_LoadedAssets.erase(it);
 			}
diff --git a/src/RealEngine/Asset/AssetManager.h b/src/RealEngine/Asset/AssetManager.h
@@ -62,9 +62,10 @@ namespace RealEngine {
 		Ref<T> LoadAsset(AssetHandle handle) {
 			RE_PROFILE_FUNCTION();
 			RE_CORE_ASSERT(IsAssetValid(handle), "Achivment unlocked how did we get here?");
-			RE_CORE_INFO("Loading asset with handle: {}", (uint64_t)handle);
 
-			auto& assetMetaData = m_AssetRegistry.at(handle);
+			AssetMetadata& assetMetaData = m_AssetRegistry.at(handle);
+			RE_CORE_INFO("Loading {} asset with handle: {}", Utils::GetAssetTypeString(assetMetaData.Type), (uint64_t)handle);
+
 			Ref<Asset> asset = AssetImporter::ImportAsset(assetMetaData);
 			asset->m_Handle = handle;
 			m_LoadedAssets.emplace(handle, asset);
diff --git a/src/RealEngine/Asset/FontImporter.cpp b/src/RealEngine/Asset/FontImporter.cpp
@@ -0,0 +1,9 @@
+#include "FontImporter.h"
+
+namespace RealEngine {
+	Ref<Font> FontImporter::ImportFont(const AssetMetadata& metadata) {
+		return CreateRef<Font>(metadata.FilePath);
+	}
+}
+
+
diff --git a/src/RealEngine/Asset/FontImporter.h b/src/RealEngine/Asset/FontImporter.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "Asset.h"
+
+#include "RealEngine/Types/Font.h"
+
+namespace RealEngine {
+	class FontImporter {
+	public:
+		static Ref<Font> ImportFont(const AssetMetadata& metadata);
+	};
+}
diff --git a/src/RealEngine/Core/Application.h b/src/RealEngine/Core/Application.h
@@ -2,9 +2,10 @@
 #pragma warning( disable : 4100 )
 
 #include "RealEngine/Core/Assert.h"
-#include "RealEngine/Core/LayerStack.h"
 #include "RealEngine/Core/Window.h"
 
+#include "RealEngine/Types/LayerStack.h"
+
 #include "RealEngine/Events/Event.h"
 #include "RealEngine/Events/WindowEvents.h"
 
diff --git a/src/RealEngine/ImGui/ImGuiLayer.h b/src/RealEngine/ImGui/ImGuiLayer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "RealEngine/Core/Layer.h"
+#include "RealEngine/Types/Layer.h"
 
 namespace RealEngine {
 	/**
diff --git a/src/RealEngine/Render/SceneRenderer.cpp b/src/RealEngine/Render/SceneRenderer.cpp
@@ -95,7 +95,6 @@ namespace RealEngine {
 			m_TextData.SSBO = ShaderStorageBuffer::Create(ssboCreateInfo, 1);
 
 			m_TextData.TextShader = Shader::Create("assets/shaders/text.shader");
-			m_TextData.Font = CreateRef<Font>((void*)Utils::OpenSans_Regular, (uint32_t)sizeof(Utils::OpenSans_Regular));
 		}
 	}
 
@@ -123,11 +122,15 @@ namespace RealEngine {
 			for (const auto entity : entities) {
 				auto [transform, text] = entities.get<TransformComponent, TextRendererComponent>(entity);
 
+				if (!text.Font) {
+					return;	// Can't render without Font duh!
+				}
+
 				m_TextData.RenderData.Transform = transform.GetTransform();
 				m_TextData.RenderData.Color = text.Color;
 
-				Ref<Texture2D> fontAtlas = m_TextData.Font->GetFontAtlas();
-				const auto& fontGeometry = m_TextData.Font->GetFontGeometry();
+				Ref<Texture2D> fontAtlas = text.Font->GetFontAtlas();
+				const auto& fontGeometry = text.Font->GetFontGeometry();
 				const auto& metrics = fontGeometry.getMetrics();
 
 				double x = 0.0;
@@ -154,7 +157,7 @@ namespace RealEngine {
 					}
 
 					if (m_TextData.RenderDataHead - m_TextData.RenderData.Glyphs >= TextData::MaxBatchLetters) {
-						FlushText();
+						FlushText(text.Font);
 					}
 
 					auto glyph = fontGeometry.getGlyph(character);
@@ -209,12 +212,12 @@ namespace RealEngine {
 
 						double advance;
 
-						m_TextData.Font->GetAdvance(&advance, character, nextCharacter);
+						text.Font->GetAdvance(&advance, character, nextCharacter);
 						x += fsScale * advance;
 					}
 				}
 				// Flush text after each entity
-				FlushText();
+				FlushText(text.Font);
 			}
 		}
 	}
@@ -281,7 +284,7 @@ namespace RealEngine {
 		m_Render2DData.TextureSlotIndex = 1; // Reset to only white texture
 	}
 
-	void SceneRenderer::FlushText() {
+	void SceneRenderer::FlushText(Ref<Font> font) {
 		RE_PROFILE_FUNCTION();
 
 		// Check if there is somethings to draw
@@ -293,7 +296,7 @@ namespace RealEngine {
 		m_TextData.SSBO->SetData(&m_TextData.RenderData, dataSize + textRenderDataSize);
 		m_TextData.SSBO->SetBinding(1);
 
-		m_TextData.Font->Bind();
+		font->Bind();
 		m_TextData.TextShader->Bind();
 
 		RenderCommands::DrawArraysInstanced(m_TextData.VAO, 4, (uint32_t)(dataSize / sizeof(GlyphData)));
diff --git a/src/RealEngine/Render/SceneRenderer.h b/src/RealEngine/Render/SceneRenderer.h
@@ -22,7 +22,7 @@ namespace RealEngine {
 		void AddSprite(TransformComponent& transform, const SpriteRendererComponent& sprite);
 
 		void Flush2D();
-		void FlushText();
+		void FlushText(Ref<Font> font);
 	private:
 		Scene* m_Scene;
 
@@ -39,7 +39,6 @@ namespace RealEngine {
 			Ref<ShaderStorageBuffer> SSBO;
 
 			Ref<Shader> TextShader;
-			Ref<Font> Font;
 
 			static constexpr uint32_t MaxBatchLetters = 2000;
 
diff --git a/src/RealEngine/Scene/ComponentSerializer.h b/src/RealEngine/Scene/ComponentSerializer.h
@@ -109,6 +109,9 @@ namespace RealEngine {
         *node |= ryml::MAP;
         (*node)["Text"] << comp.Text;
         (*node)["Color"] << comp.Color;
+
+        if (comp.Font)
+            (*node)["Font"] << comp.Font->GetHandle();
         return true;
     }
 
@@ -125,6 +128,18 @@ namespace RealEngine {
         }
         node["Color"] >> out->Color;
 
+        if (node.has_child("Font")) {
+            AssetHandle handle;
+            node["Font"] >> handle;
+            Ref<Asset> asset = RealEngine::Project::GetAssetManager().GetAsset<Font>(handle);
+            if (asset) {
+                out->Font = std::dynamic_pointer_cast<Font>(asset);
+            }
+            else {
+                RE_CORE_WARN("Failed to load Font asset with handle: {}", (uint64_t)handle);
+            }
+        }
+
         return true;
 	}
 
diff --git a/src/RealEngine/Scene/Components.h b/src/RealEngine/Scene/Components.h
@@ -6,6 +6,7 @@
 #include <Coral/ManagedObject.hpp>
 
 #include "RealEngine/Types/UUID.h"
+#include "RealEngine/Types/Font.h"
 #include "RealEngine/Render/Texture.h"
 #include "RealEngine/Scripting/ScriptInstance.h"
 
@@ -173,6 +174,7 @@ namespace RealEngine {
     struct TextRendererComponent {
         std::string Text;
         glm::vec4 Color = { 1.0f, 1.0f, 1.0f, 1.0f };
+		Ref<Font> Font; // Keep as Ref not handle to manage lifetime
         TextRendererComponent() = default;
         TextRendererComponent(const std::string& text, const glm::vec4& color)
             : Text(text), Color(color) { }
diff --git a/src/RealEngine/Types/Font.cpp b/src/RealEngine/Types/Font.cpp
@@ -7,12 +7,17 @@ namespace RealEngine {
 		msdfgen::FreetypeHandle* ft = msdfgen::initializeFreetype();
 		msdfgen::FontHandle* font = msdfgen::loadFontData(ft, (msdfgen::byte*)fontData, size);
 
-		LoadCharset(font);
-		Font::AtlasDimensions atlasDimensions = CreateAtlasPacker();
-		ApplyEdgeColoring(); // Makes the glyphs into MSDFs
+		InitFont(font);
 
-		ComputeAdvanceCache();
-		CreateTextureAtlas(atlasDimensions);
+		msdfgen::destroyFont(font);
+		msdfgen::deinitializeFreetype(ft);
+	}
+
+	Font::Font(const std::filesystem::path& fontPath) {
+		msdfgen::FreetypeHandle* ft = msdfgen::initializeFreetype();
+		msdfgen::FontHandle* font = msdfgen::loadFont(ft, fontPath.string().c_str());
+
+		InitFont(font);
 
 		msdfgen::destroyFont(font);
 		msdfgen::deinitializeFreetype(ft);
@@ -22,6 +27,15 @@ namespace RealEngine {
 		m_FontAtlas->Bind(slot);
 	}
 
+	void Font::InitFont(msdfgen::FontHandle* font) {
+		LoadCharset(font);
+		Font::AtlasDimensions atlasDimensions = CreateAtlasPacker();
+		ApplyEdgeColoring(); // Makes the glyphs into MSDFs
+
+		ComputeAdvanceCache();
+		CreateTextureAtlas(atlasDimensions);
+	}
+
 	Font::AtlasDimensions Font::CreateAtlasPacker() {
 		msdf_atlas::TightAtlasPacker atlasPacker;
 		atlasPacker.setPixelRange(2.0);		// default
diff --git a/src/RealEngine/Types/Font.h b/src/RealEngine/Types/Font.h
@@ -1,13 +1,15 @@
 #pragma once
-
 #include "RealEngine/Render/Texture.h"
 
 #include <msdf-atlas-gen/msdf-atlas-gen.h>
 
+#include <filesystem>
+
 namespace RealEngine {
-	class Font {
+	class Font : public Asset {
 	public:
 		Font(void* fontData, uint32_t size);
+		Font(const std::filesystem::path& fontPath);
 
 		void Bind(uint32_t slot = 0);
 
@@ -17,12 +19,17 @@ namespace RealEngine {
 
 		Ref<Texture2D> GetFontAtlas() const { return m_FontAtlas; }
 		const msdf_atlas::FontGeometry& GetFontGeometry() const { return m_FontGeometry; }
+
+		static AssetType GetStaticType() { return AssetType::Font; }
+		virtual AssetType GetType() const override { return GetStaticType(); }
 	private:
 		struct AtlasDimensions {
 			int Width;
 			int Height;
 		};
 
+		void InitFont(msdfgen::FontHandle* font);
+
 		AtlasDimensions CreateAtlasPacker();
 		void LoadCharset(msdfgen::FontHandle* font);
 		void ApplyEdgeColoring();
diff --git a/src/RealEngine/Types/Layer.cpp b/src/RealEngine/Types/Layer.cpp
diff --git a/src/RealEngine/Types/Layer.h b/src/RealEngine/Types/Layer.h
diff --git a/src/RealEngine/Types/LayerStack.cpp b/src/RealEngine/Types/LayerStack.cpp
diff --git a/src/RealEngine/Types/LayerStack.h b/src/RealEngine/Types/LayerStack.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "RealEngine/Core/Layer.h"
+#include "RealEngine/Types/Layer.h"
 
 namespace RealEngine {
 	/**
