From 026c4859c0b0b6672cfc70265c79ec9ac5cf176a Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 4 Jan 2024 11:00:48 +0100 Subject: [PATCH] Renamed text_renderer to font. --- compile_linux.sh | 4 ++-- game_scene.cpp | 4 ++-- sfw/render_core/application.cpp | 4 ---- sfw/render_core/{text_renderer.cpp => font.cpp} | 2 +- sfw/render_core/{text_renderer.h => font.h} | 0 5 files changed, 5 insertions(+), 9 deletions(-) rename sfw/render_core/{text_renderer.cpp => font.cpp} (99%) rename sfw/render_core/{text_renderer.h => font.h} (100%) diff --git a/compile_linux.sh b/compile_linux.sh index bef7390..507fc16 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -67,7 +67,7 @@ ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/input_event.cpp -o sfw ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/input_map.cpp -o sfw/render_core/input_map.o ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/input.cpp -o sfw/render_core/input.o ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/shortcut.cpp -o sfw/render_core/shortcut.o -ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/text_renderer.cpp -o sfw/render_core/text_renderer.o +ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_core/font.cpp -o sfw/render_core/font.o ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/camera_3d.cpp -o sfw/render_objects/camera_3d.o ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/render_objects/object_3d.cpp -o sfw/render_objects/object_3d.o @@ -101,7 +101,7 @@ ccache g++ -Wall -lm -ldl -lpthread -lX11 -D_REENTRANT -g sfw/core/aabb.o sfw/c sfw/render_core/mesh_utils.o sfw/render_core/texture.o \ sfw/render_core/input_event.o sfw/render_core/input_map.o \ sfw/render_core/input.o sfw/render_core/shortcut.o \ - sfw/render_core/keyboard.o sfw/render_core/text_renderer.o \ + sfw/render_core/keyboard.o sfw/render_core/font.o \ sfw/render_objects/camera_3d.o sfw/render_objects/object_3d.o sfw/render_objects/mesh_instance_3d.o \ sfw/render_objects/object_2d.o \ sfw/render_objects/sprite.o sfw/render_objects/tile_map.o \ diff --git a/game_scene.cpp b/game_scene.cpp index a16caa7..2751ace 100644 --- a/game_scene.cpp +++ b/game_scene.cpp @@ -6,7 +6,7 @@ #include "render_core/3rd_glad.h" #include "render_core/keyboard.h" #include "render_core/mesh_utils.h" -#include "render_core/text_renderer.h" +//#include "render_core/font.h" void GameScene::input_event(const Ref &event) { //ERR_PRINT(event->as_text()); @@ -96,7 +96,7 @@ void GameScene::render() { sprite->render(); tile_map->render(); - TextRenderer::get_singleton()->font_init(); + //TextRenderer::get_singleton()->font_init(); //TextRenderer::get_singleton()->font_print("test"); } diff --git a/sfw/render_core/application.cpp b/sfw/render_core/application.cpp index 3da79f4..0661262 100644 --- a/sfw/render_core/application.cpp +++ b/sfw/render_core/application.cpp @@ -11,8 +11,6 @@ #include "core/string_name.h" #include "object/core_string_names.h" -#include "render_core/text_renderer.h" - void Application::input_event(const Ref &event) { ERR_FAIL_COND(scene.is_null()); @@ -99,7 +97,6 @@ Application::Application() { memnew(InputMap()); memnew(Input()); Input::get_singleton()->set_main_loop(this); - memnew(TextRenderer()); _init_window(); } @@ -115,7 +112,6 @@ Application::~Application() { memdelete(AppWindow::get_singleton()); memdelete(Input::get_singleton()); memdelete(InputMap::get_singleton()); - memdelete(TextRenderer::get_singleton()); } Application *Application::get_singleton() { diff --git a/sfw/render_core/text_renderer.cpp b/sfw/render_core/font.cpp similarity index 99% rename from sfw/render_core/text_renderer.cpp rename to sfw/render_core/font.cpp index 85f3b9d..bf94492 100644 --- a/sfw/render_core/text_renderer.cpp +++ b/sfw/render_core/font.cpp @@ -28,7 +28,7 @@ // http://bitmapmania.m78.com // cooz@m78.com -#include "text_renderer.h" +#include "font.h" #include "window.h" diff --git a/sfw/render_core/text_renderer.h b/sfw/render_core/font.h similarity index 100% rename from sfw/render_core/text_renderer.h rename to sfw/render_core/font.h