From b817a29356a8711f2dfd5651e6ba38523776eabdeb0105cf136752146ac44b68 Mon Sep 17 00:00:00 2001 From: Mexpert_PRO Date: Sun, 3 May 2026 22:09:23 +0200 Subject: [PATCH] fixed ordering problem, but have a wier flicker in non editor mode --- .vscode/tasks.json | 4 ++-- CMakeLists.txt | 7 +++++++ TSE | 2 +- TSE-RTS/src/game.cpp | 1 + TSE-RTS/src/main.cpp | 15 +++++++++------ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 98ba99c..0a350eb 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -109,7 +109,7 @@ { "label": "build_debug_SDL3_linux", "dependsOn": [ - "build_release_SDL3_linux_cmake", + "build_debug_SDL3_linux_cmake", "make_linux" ], "dependsOrder": "sequence", @@ -135,7 +135,7 @@ { "label": "build_debug_GLFW_linux", "dependsOn": [ - "build_release_GLFW_linux_cmake", + "build_debug_GLFW_linux_cmake", "make_linux" ], "dependsOrder": "sequence", diff --git a/CMakeLists.txt b/CMakeLists.txt index 108c4d0..72b023d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,13 @@ file(GLOB CPP_SOURCE "${PROJECT_SOURCE_DIR}/TSE-RTS/src/*/*/*/*.c" ) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + message(STATUS "Debug build") + add_compile_options(-g) +else() + message(STATUS "Not a Debug build") +endif() + #project def add_executable(TSE-RTS ${CPP_SOURCE}) diff --git a/TSE b/TSE index 4fce05a..4002030 160000 --- a/TSE +++ b/TSE @@ -1 +1 @@ -Subproject commit 4fce05a9278eae1b7e78146e538a5de6caaf5a7e8ff6696472746dc64ee5df5f +Subproject commit 4002030de8db6b13137ad7fe914110cf5cb971a864edae3ac101a1e2cb0c7831 diff --git a/TSE-RTS/src/game.cpp b/TSE-RTS/src/game.cpp index 8bbbfef..5c31e23 100644 --- a/TSE-RTS/src/game.cpp +++ b/TSE-RTS/src/game.cpp @@ -149,6 +149,7 @@ void game::setup(TSE::Scene* s, TSE::IWindow* wnd) s->AddLayer(&characterLayer); Transformable* player = new Transformable("Player"); + player->position = Vector3(0,0,5); Transformable* lastPassCamera = new Transformable("lastPassCamera"); Camera* lpCam = new Camera(); diff --git a/TSE-RTS/src/main.cpp b/TSE-RTS/src/main.cpp index c01c293..ae70e52 100644 --- a/TSE-RTS/src/main.cpp +++ b/TSE-RTS/src/main.cpp @@ -39,23 +39,26 @@ DefaultRendererOpenGL* rend = nullptr; Scene* currentScene = nullptr; Layer* planeteryLayer = nullptr; EditorSubsystem* editor; +ConsolView* cv; void SetupWindow() { Color backColor(0.0f, 0.0f, 0.0f, 0.0f); #if defined(TSE_GLFW) #ifdef USE_EDITOR - wnd = new WindowGlfw(PROJECT_NAME, 800, 600, new OpenGLRenderingBackend(backColor, false, 8, true), WindowType::Maximized); - editor = new EditorSubsystem(); + cv = new ConsolView(); + wnd = new WindowGlfw(PROJECT_NAME, 800, 600, new OpenGLRenderingBackend(backColor, true, 8, true), WindowType::Maximized); + editor = new EditorSubsystem(cv); #else - wnd = new WindowGlfw(PROJECT_NAME, 1920, 1080, new OpenGLRenderingBackend(backColor, false, 8, false), WindowType::Fullscreen); + wnd = new WindowGlfw(PROJECT_NAME, 1920, 1080, new OpenGLRenderingBackend(backColor, true, 8, false), WindowType::Fullscreen); #endif #elif defined(TSE_SDL3) #ifdef USE_EDITOR - wnd = new WindowSdl3(PROJECT_NAME, 800, 600, new OpenGLRenderingBackend(backColor, false, 8, true), WindowType::Maximized); - editor = new EditorSubsystem(); + cv = new ConsolView(); + wnd = new WindowSdl3(PROJECT_NAME, 800, 600, new OpenGLRenderingBackend(backColor, true, 8, true), WindowType::Maximized); + editor = new EditorSubsystem(cv); #else - wnd = new WindowSdl3(PROJECT_NAME, 1920, 1080, new OpenGLRenderingBackend(backColor, false, 8, false), WindowType::Fullscreen); + wnd = new WindowSdl3(PROJECT_NAME, 1920, 1080, new OpenGLRenderingBackend(backColor, true, 8, false), WindowType::Fullscreen); #endif #endif