Relintai/sfw
1
0
Fork 0
mirror of https://github.com/Relintai/sfw.git synced 2025-02-19 23:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed text_renderer to font.

Browse Source
This commit is contained in:
Relintai 2024-01-04 11:00:48 +01:00
parent 2a71ea18b3
commit 026c4859c0
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile_linux.sh
View File

@ -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 \

4
game_scene.cpp
View File

@ -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<InputEvent> &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");
}

4
sfw/render_core/application.cpp
View File

@ -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<InputEvent> &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() {

2
sfw/render_core/text_renderer.cpp → sfw/render_core/font.cpp
View File

@ -28,7 +28,7 @@
// http://bitmapmania.m78.com
// cooz@m78.com
#include "text_renderer.h"
#include "font.h"
#include "window.h"

0
sfw/render_core/text_renderer.h → sfw/render_core/font.h
View File