From 9431ecfe009f4dec1ab89afd70ec77a65df93ef4 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sat, 17 Jun 2023 20:26:26 -0700 Subject: [PATCH] Removed old font parts --- {src/dawn/display/font => archive}/BitmapFont.cpp | 0 {src/dawn/display/font => archive}/BitmapFont.hpp | 0 {src/dawn/display/font => archive}/ExampleFont.cpp | 0 {src/dawn/display/font => archive}/ExampleFont.hpp | 0 {src/dawn/display/font => archive}/Font.hpp | 0 {src/dawn/display/font => archive}/FontMeasure.cpp | 0 {src/dawn/display/font => archive}/FontMeasure.hpp | 0 {src/dawn/display/font => archive}/TrueTypeFont.cpp | 0 {src/dawn/display/font => archive}/TrueTypeFont.hpp | 0 src/dawn/display/font/CMakeLists.txt | 9 --------- src/dawnopengl/display/RenderManager.cpp | 2 -- src/dawnopengl/display/RenderManager.hpp | 2 -- 12 files changed, 13 deletions(-) rename {src/dawn/display/font => archive}/BitmapFont.cpp (100%) rename {src/dawn/display/font => archive}/BitmapFont.hpp (100%) rename {src/dawn/display/font => archive}/ExampleFont.cpp (100%) rename {src/dawn/display/font => archive}/ExampleFont.hpp (100%) rename {src/dawn/display/font => archive}/Font.hpp (100%) rename {src/dawn/display/font => archive}/FontMeasure.cpp (100%) rename {src/dawn/display/font => archive}/FontMeasure.hpp (100%) rename {src/dawn/display/font => archive}/TrueTypeFont.cpp (100%) rename {src/dawn/display/font => archive}/TrueTypeFont.hpp (100%) diff --git a/src/dawn/display/font/BitmapFont.cpp b/archive/BitmapFont.cpp similarity index 100% rename from src/dawn/display/font/BitmapFont.cpp rename to archive/BitmapFont.cpp diff --git a/src/dawn/display/font/BitmapFont.hpp b/archive/BitmapFont.hpp similarity index 100% rename from src/dawn/display/font/BitmapFont.hpp rename to archive/BitmapFont.hpp diff --git a/src/dawn/display/font/ExampleFont.cpp b/archive/ExampleFont.cpp similarity index 100% rename from src/dawn/display/font/ExampleFont.cpp rename to archive/ExampleFont.cpp diff --git a/src/dawn/display/font/ExampleFont.hpp b/archive/ExampleFont.hpp similarity index 100% rename from src/dawn/display/font/ExampleFont.hpp rename to archive/ExampleFont.hpp diff --git a/src/dawn/display/font/Font.hpp b/archive/Font.hpp similarity index 100% rename from src/dawn/display/font/Font.hpp rename to archive/Font.hpp diff --git a/src/dawn/display/font/FontMeasure.cpp b/archive/FontMeasure.cpp similarity index 100% rename from src/dawn/display/font/FontMeasure.cpp rename to archive/FontMeasure.cpp diff --git a/src/dawn/display/font/FontMeasure.hpp b/archive/FontMeasure.hpp similarity index 100% rename from src/dawn/display/font/FontMeasure.hpp rename to archive/FontMeasure.hpp diff --git a/src/dawn/display/font/TrueTypeFont.cpp b/archive/TrueTypeFont.cpp similarity index 100% rename from src/dawn/display/font/TrueTypeFont.cpp rename to archive/TrueTypeFont.cpp diff --git a/src/dawn/display/font/TrueTypeFont.hpp b/archive/TrueTypeFont.hpp similarity index 100% rename from src/dawn/display/font/TrueTypeFont.hpp rename to archive/TrueTypeFont.hpp diff --git a/src/dawn/display/font/CMakeLists.txt b/src/dawn/display/font/CMakeLists.txt index 240a823a..369f9984 100644 --- a/src/dawn/display/font/CMakeLists.txt +++ b/src/dawn/display/font/CMakeLists.txt @@ -3,13 +3,4 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -# Sources -target_sources(${DAWN_TARGET_NAME} - PRIVATE - BitmapFont.cpp - ExampleFont.cpp - TrueTypeFont.cpp - FontMeasure.cpp -) - add_subdirectory(truetype) \ No newline at end of file diff --git a/src/dawnopengl/display/RenderManager.cpp b/src/dawnopengl/display/RenderManager.cpp index 7828ba2d..b2f5e30e 100644 --- a/src/dawnopengl/display/RenderManager.cpp +++ b/src/dawnopengl/display/RenderManager.cpp @@ -35,8 +35,6 @@ void RenderManager::init() { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glDepthMask(GL_TRUE); glDepthFunc(GL_LESS); - - this->defaultFont.init(); } RenderTarget * RenderManager::getBackBuffer() { diff --git a/src/dawnopengl/display/RenderManager.hpp b/src/dawnopengl/display/RenderManager.hpp index f6a3b26b..436919fa 100644 --- a/src/dawnopengl/display/RenderManager.hpp +++ b/src/dawnopengl/display/RenderManager.hpp @@ -10,7 +10,6 @@ #include "display/shader/shaders/FontShader.hpp" #include "display/shader/shaders/UIShader.hpp" #include "display/RenderPipeline.hpp" -#include "display/font/ExampleFont.hpp" namespace Dawn { class RenderManager : public IRenderManager { @@ -26,7 +25,6 @@ namespace Dawn { SimpleTexturedShader *simpleTexturedShader = nullptr; UIShader *uiShader = nullptr; FontShader *fontShader = nullptr; - ExampleFont defaultFont; /** * Construct a new RenderManager for a game instance.