From ee4c658919503811168086b62feb945562016d23 Mon Sep 17 00:00:00 2001 From: light7734 Date: Sun, 6 Jul 2025 14:03:04 +0330 Subject: [PATCH] fix: hardcoded paths --- data/assets/shaders/quads/{Quad_PS.glsl => ps.glsl} | 0 data/assets/shaders/quads/{Quad_VS.glsl => vs.glsl} | 0 .../shaders/texture/{Texture_PS.glsl => ps.glsl} | 0 .../shaders/texture/{Texture_VS.glsl => vs.glsl} | 0 .../{TintedTexture_PS.glsl => ps.glsl} | 0 .../{TintedTexture_VS.glsl => vs.glsl} | 0 .../icons/{Asset_Directory.png => asset/dir.png} | Bin .../engine/icons/{Asset_Image.png => asset/img.png} | Bin .../icons/{Asset_Scene.png => asset/scene.png} | Bin data/engine/icons/{Asset_Text.png => asset/txt.png} | Bin .../engine/src/graphics/renderer_programs/quad.cpp | 4 ++-- .../src/graphics/renderer_programs/texture.cpp | 4 ++-- .../graphics/renderer_programs/tinted_texture.cpp | 4 ++-- .../engine/src/user_interface/user_interface.cpp | 4 ++-- modules/mirror/src/panel/asset_browser.cpp | 8 ++++---- 15 files changed, 12 insertions(+), 12 deletions(-) rename data/assets/shaders/quads/{Quad_PS.glsl => ps.glsl} (100%) rename data/assets/shaders/quads/{Quad_VS.glsl => vs.glsl} (100%) rename data/assets/shaders/texture/{Texture_PS.glsl => ps.glsl} (100%) rename data/assets/shaders/texture/{Texture_VS.glsl => vs.glsl} (100%) rename data/assets/shaders/tinted_texture/{TintedTexture_PS.glsl => ps.glsl} (100%) rename data/assets/shaders/tinted_texture/{TintedTexture_VS.glsl => vs.glsl} (100%) rename data/engine/icons/{Asset_Directory.png => asset/dir.png} (100%) rename data/engine/icons/{Asset_Image.png => asset/img.png} (100%) rename data/engine/icons/{Asset_Scene.png => asset/scene.png} (100%) rename data/engine/icons/{Asset_Text.png => asset/txt.png} (100%) diff --git a/data/assets/shaders/quads/Quad_PS.glsl b/data/assets/shaders/quads/ps.glsl similarity index 100% rename from data/assets/shaders/quads/Quad_PS.glsl rename to data/assets/shaders/quads/ps.glsl diff --git a/data/assets/shaders/quads/Quad_VS.glsl b/data/assets/shaders/quads/vs.glsl similarity index 100% rename from data/assets/shaders/quads/Quad_VS.glsl rename to data/assets/shaders/quads/vs.glsl diff --git a/data/assets/shaders/texture/Texture_PS.glsl b/data/assets/shaders/texture/ps.glsl similarity index 100% rename from data/assets/shaders/texture/Texture_PS.glsl rename to data/assets/shaders/texture/ps.glsl diff --git a/data/assets/shaders/texture/Texture_VS.glsl b/data/assets/shaders/texture/vs.glsl similarity index 100% rename from data/assets/shaders/texture/Texture_VS.glsl rename to data/assets/shaders/texture/vs.glsl diff --git a/data/assets/shaders/tinted_texture/TintedTexture_PS.glsl b/data/assets/shaders/tinted_texture/ps.glsl similarity index 100% rename from data/assets/shaders/tinted_texture/TintedTexture_PS.glsl rename to data/assets/shaders/tinted_texture/ps.glsl diff --git a/data/assets/shaders/tinted_texture/TintedTexture_VS.glsl b/data/assets/shaders/tinted_texture/vs.glsl similarity index 100% rename from data/assets/shaders/tinted_texture/TintedTexture_VS.glsl rename to data/assets/shaders/tinted_texture/vs.glsl diff --git a/data/engine/icons/Asset_Directory.png b/data/engine/icons/asset/dir.png similarity index 100% rename from data/engine/icons/Asset_Directory.png rename to data/engine/icons/asset/dir.png diff --git a/data/engine/icons/Asset_Image.png b/data/engine/icons/asset/img.png similarity index 100% rename from data/engine/icons/Asset_Image.png rename to data/engine/icons/asset/img.png diff --git a/data/engine/icons/Asset_Scene.png b/data/engine/icons/asset/scene.png similarity index 100% rename from data/engine/icons/Asset_Scene.png rename to data/engine/icons/asset/scene.png diff --git a/data/engine/icons/Asset_Text.png b/data/engine/icons/asset/txt.png similarity index 100% rename from data/engine/icons/Asset_Text.png rename to data/engine/icons/asset/txt.png diff --git a/modules/engine/src/graphics/renderer_programs/quad.cpp b/modules/engine/src/graphics/renderer_programs/quad.cpp index 1952cdb..41c0cb2 100644 --- a/modules/engine/src/graphics/renderer_programs/quad.cpp +++ b/modules/engine/src/graphics/renderer_programs/quad.cpp @@ -19,8 +19,8 @@ QuadRendererProgram::QuadRendererProgram(unsigned int maxVertices, Ref sharedCont io.KeyMap[ImGuiKey_Y] = Key::Y; io.KeyMap[ImGuiKey_Z] = Key::Z; - io.Fonts->AddFontFromFileTTF("Assets//Fonts/OpenSans/OpenSans-Bold.ttf", 18.0f); + io.Fonts->AddFontFromFileTTF("data/assets/fonts/open_sans/OpenSans-Bold.ttf", 18.0f); io.FontDefault = io.Fonts->AddFontFromFileTTF( - "Assets/Fonts/OpenSans/OpenSans-Regular.ttf", + "data/assets/fonts/open_sans/OpenSans-Regular.ttf", 18.0f ); diff --git a/modules/mirror/src/panel/asset_browser.cpp b/modules/mirror/src/panel/asset_browser.cpp index 79e9d04..0f082f9 100644 --- a/modules/mirror/src/panel/asset_browser.cpp +++ b/modules/mirror/src/panel/asset_browser.cpp @@ -10,10 +10,10 @@ AssetBrowserPanel::AssetBrowserPanel(Ref activeScene) , m_assets_path("Assets") , m_active_scene(activeScene) { - ResourceManager::load_texture("_Assets_Directory", "EngineResources/Icons/Asset_Directory.png"); - ResourceManager::load_texture("_Assets_Scene", "EngineResources/Icons/Asset_Scene.png"); - ResourceManager::load_texture("_Assets_Image", "EngineResources/Icons/Asset_Image.png"); - ResourceManager::load_texture("_Assets_Text", "EngineResources/Icons/Asset_Text.png"); + ResourceManager::load_texture("_Assets_Directory", "data/engine/icons/asset/dir.png"); + ResourceManager::load_texture("_Assets_Scene", "data/engine/icons/asset/scene.png"); + ResourceManager::load_texture("_Assets_Image", "data/engine/icons/asset/img.png"); + ResourceManager::load_texture("_Assets_Text", "data/engine/icons/asset/txt.png"); m_directory_texture = ResourceManager::get_texture("_Assets_Directory"); m_scene_texture = ResourceManager::get_texture("_Assets_Scene");