From 42b5661a288324b8403aa8f2a303faea562569ba Mon Sep 17 00:00:00 2001 From: zhenyan121 <3367366583@qq.com> Date: Thu, 16 Apr 2026 13:06:49 +0800 Subject: [PATCH] fix: shader load fail --- {src => assets}/shaders/block_f_shader.glsl | 0 {src => assets}/shaders/block_v_shader.glsl | 0 {src => assets}/shaders/outline_f_shader.glsl | 0 {src => assets}/shaders/outline_v_shader.glsl | 0 {src => assets}/shaders/sky_f_shader.glsl | 0 {src => assets}/shaders/sky_v_shader.glsl | 0 {src => assets}/shaders/text_f_shader.glsl | 0 {src => assets}/shaders/text_v_shader.glsl | 0 {src => assets}/shaders/ui_f_shader.glsl | 0 {src => assets}/shaders/ui_v_shader.glsl | 0 src/tools/shader_tools.cpp | 5 +++-- 11 files changed, 3 insertions(+), 2 deletions(-) rename {src => assets}/shaders/block_f_shader.glsl (100%) rename {src => assets}/shaders/block_v_shader.glsl (100%) rename {src => assets}/shaders/outline_f_shader.glsl (100%) rename {src => assets}/shaders/outline_v_shader.glsl (100%) rename {src => assets}/shaders/sky_f_shader.glsl (100%) rename {src => assets}/shaders/sky_v_shader.glsl (100%) rename {src => assets}/shaders/text_f_shader.glsl (100%) rename {src => assets}/shaders/text_v_shader.glsl (100%) rename {src => assets}/shaders/ui_f_shader.glsl (100%) rename {src => assets}/shaders/ui_v_shader.glsl (100%) diff --git a/src/shaders/block_f_shader.glsl b/assets/shaders/block_f_shader.glsl similarity index 100% rename from src/shaders/block_f_shader.glsl rename to assets/shaders/block_f_shader.glsl diff --git a/src/shaders/block_v_shader.glsl b/assets/shaders/block_v_shader.glsl similarity index 100% rename from src/shaders/block_v_shader.glsl rename to assets/shaders/block_v_shader.glsl diff --git a/src/shaders/outline_f_shader.glsl b/assets/shaders/outline_f_shader.glsl similarity index 100% rename from src/shaders/outline_f_shader.glsl rename to assets/shaders/outline_f_shader.glsl diff --git a/src/shaders/outline_v_shader.glsl b/assets/shaders/outline_v_shader.glsl similarity index 100% rename from src/shaders/outline_v_shader.glsl rename to assets/shaders/outline_v_shader.glsl diff --git a/src/shaders/sky_f_shader.glsl b/assets/shaders/sky_f_shader.glsl similarity index 100% rename from src/shaders/sky_f_shader.glsl rename to assets/shaders/sky_f_shader.glsl diff --git a/src/shaders/sky_v_shader.glsl b/assets/shaders/sky_v_shader.glsl similarity index 100% rename from src/shaders/sky_v_shader.glsl rename to assets/shaders/sky_v_shader.glsl diff --git a/src/shaders/text_f_shader.glsl b/assets/shaders/text_f_shader.glsl similarity index 100% rename from src/shaders/text_f_shader.glsl rename to assets/shaders/text_f_shader.glsl diff --git a/src/shaders/text_v_shader.glsl b/assets/shaders/text_v_shader.glsl similarity index 100% rename from src/shaders/text_v_shader.glsl rename to assets/shaders/text_v_shader.glsl diff --git a/src/shaders/ui_f_shader.glsl b/assets/shaders/ui_f_shader.glsl similarity index 100% rename from src/shaders/ui_f_shader.glsl rename to assets/shaders/ui_f_shader.glsl diff --git a/src/shaders/ui_v_shader.glsl b/assets/shaders/ui_v_shader.glsl similarity index 100% rename from src/shaders/ui_v_shader.glsl rename to assets/shaders/ui_v_shader.glsl diff --git a/src/tools/shader_tools.cpp b/src/tools/shader_tools.cpp index cc5e7a7..27548c2 100644 --- a/src/tools/shader_tools.cpp +++ b/src/tools/shader_tools.cpp @@ -11,8 +11,9 @@ namespace fs = std::filesystem; namespace Tools { GLuint create_shader_program(const std::string& v_shader_path, const std::string& f_shader_path) { - std::string v_shader_str = Tools::read_shader_source(v_shader_path); - std::string f_shader_str = Tools::read_shader_source(f_shader_path); + + std::string v_shader_str = Tools::read_shader_source(ASSETS_PATH + v_shader_path); + std::string f_shader_str = Tools::read_shader_source(ASSETS_PATH + f_shader_path); const char *v_shader_source = v_shader_str.c_str(); const char *f_shader_source = f_shader_str.c_str();