From 9e9a76e459844d4de8781e473695bd214d0c570c Mon Sep 17 00:00:00 2001
From: ohyzha <oleksii.hyzha.ext@madvoxel.com>
Date: Tue, 6 Aug 2024 10:41:39 +0300
Subject: [PATCH] changes after rebase

---
 CMakeLists.txt                          | 1 +
 examples/ExampleAppList.hpp             | 4 +++-
 examples/ExampleApps/TextExampleApp.cpp | 3 +--
 examples/main.cpp                       | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0ef361..f23e88c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,5 +136,6 @@ SetGlmDefines(openVulkanoCpp)
 LinkAssimp(openVulkanoCpp)
 LinkLibArchive(openVulkanoCpp)
 LinkLibJpegTurbo(openVulkanoCpp)
+LinkMsdf(openVulkanoCpp)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT openVulkanoCpp)
diff --git a/examples/ExampleAppList.hpp b/examples/ExampleAppList.hpp
index 3308eb3..d49362e 100644
--- a/examples/ExampleAppList.hpp
+++ b/examples/ExampleAppList.hpp
@@ -10,6 +10,7 @@
 #include "ExampleApps/MovingCubeApp.hpp"
 #include "ExampleApps/TexturedCubeExampleApp.hpp"
 #include "ExampleApps/BillboardExampleApp.hpp"
+#include "ExampleApps/TextExampleApp.hpp"
 #include <vector>
 
 namespace OpenVulkano
@@ -18,6 +19,7 @@ namespace OpenVulkano
 		{ "Cubes Example App", &CubesExampleApp::Create },
 		{ "Moving Cube Example App", &MovingCubeApp::Create },
 		{ "Textured Cube Example App", &TexturedCubeExampleApp::Create },
-		{ "Billboard Example App", &BillboardExampleApp::Create }
+		{ "Billboard Example App", &BillboardExampleApp::Create },
+		{ "Text Example App", &TextExampleApp::Create }
 	};
 }
diff --git a/examples/ExampleApps/TextExampleApp.cpp b/examples/ExampleApps/TextExampleApp.cpp
index a295540..abc6b96 100644
--- a/examples/ExampleApps/TextExampleApp.cpp
+++ b/examples/ExampleApps/TextExampleApp.cpp
@@ -66,14 +66,13 @@ namespace OpenVulkano
 			m_nodesPool.resize(N);
 			m_drawablesPool.resize(N);
 		
+#ifdef MSDFGEN_AVAILABLE
 			Charset charset = Charset::ASCII;
 			for (unicode_t c = 0x0410; c <= 0x041F; c++)
 			{
 				// some unicode values
 				charset.add(c);
 			}
-
-#ifdef MSDFGEN_AVAILABLE
 			m_atlasGenerator.GenerateAtlas(fontPath, charset, "roboto-regular-atlas.png");
 #endif
 
diff --git a/examples/main.cpp b/examples/main.cpp
index 224716a..002e431 100644
--- a/examples/main.cpp
+++ b/examples/main.cpp
@@ -6,7 +6,6 @@
 
 #include "Host/GraphicsAppManager.hpp"
 #include "ExampleAppList.hpp"
-#include "ExampleApps/TextExampleApp.hpp"
 
 #include <ftxui/component/captured_mouse.hpp>
 #include <ftxui/component/component.hpp>