diff options
Diffstat (limited to 'src/libjin/graphics/shaders')
-rw-r--r-- | src/libjin/graphics/shaders/built-in/default.shader.h (renamed from src/libjin/graphics/shaders/built-in/je_default.shader.h) | 0 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/built-in/font.shader.h (renamed from src/libjin/graphics/shaders/built-in/je_font.shader.h) | 0 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/built-in/texture.shader.h (renamed from src/libjin/graphics/shaders/built-in/je_texture.shader.h) | 0 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/jsl_compiler.cpp (renamed from src/libjin/graphics/shaders/je_jsl_compiler.cpp) | 8 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/jsl_compiler.h (renamed from src/libjin/graphics/shaders/je_jsl_compiler.h) | 6 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/shader.cpp (renamed from src/libjin/graphics/shaders/je_shader.cpp) | 20 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/shader.h (renamed from src/libjin/graphics/shaders/je_shader.h) | 12 |
7 files changed, 23 insertions, 23 deletions
diff --git a/src/libjin/graphics/shaders/built-in/je_default.shader.h b/src/libjin/graphics/shaders/built-in/default.shader.h index 3f57c44..3f57c44 100644 --- a/src/libjin/graphics/shaders/built-in/je_default.shader.h +++ b/src/libjin/graphics/shaders/built-in/default.shader.h diff --git a/src/libjin/graphics/shaders/built-in/je_font.shader.h b/src/libjin/graphics/shaders/built-in/font.shader.h index e04c225..e04c225 100644 --- a/src/libjin/graphics/shaders/built-in/je_font.shader.h +++ b/src/libjin/graphics/shaders/built-in/font.shader.h diff --git a/src/libjin/graphics/shaders/built-in/je_texture.shader.h b/src/libjin/graphics/shaders/built-in/texture.shader.h index d1fc86f..d1fc86f 100644 --- a/src/libjin/graphics/shaders/built-in/je_texture.shader.h +++ b/src/libjin/graphics/shaders/built-in/texture.shader.h diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/jsl_compiler.cpp index 4b48a85..44908e8 100644 --- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp +++ b/src/libjin/graphics/shaders/jsl_compiler.cpp @@ -1,10 +1,10 @@ -#include "../../core/je_configuration.h" +#include "../../core/configuration.h" #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader) -#include "../../common/je_string.h" -#include "../../Filesystem/je_buffer.h" +#include "../../common/string.h" +#include "../../Filesystem/buffer.h" -#include "je_jsl_compiler.h" +#include "jsl_compiler.h" using namespace std; using namespace JinEngine::Filesystem; diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.h b/src/libjin/graphics/shaders/jsl_compiler.h index c61e152..ad3bdbb 100644 --- a/src/libjin/graphics/shaders/je_jsl_compiler.h +++ b/src/libjin/graphics/shaders/jsl_compiler.h @@ -1,13 +1,13 @@ #ifndef __JE_JSL_COMPILER_H__ #define __JE_JSL_COMPILER_H__ -#include "../../core/je_configuration.h" +#include "../../core/configuration.h" #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader) #include <string> -#include "../../common/je_string.h" -#include "../../common/je_singleton.hpp" +#include "../../common/string.h" +#include "../../common/singleton.hpp" namespace JinEngine { diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/shader.cpp index 65ad8c7..c7f6f11 100644 --- a/src/libjin/graphics/shaders/je_shader.cpp +++ b/src/libjin/graphics/shaders/shader.cpp @@ -1,18 +1,18 @@ -#include "../../core/je_configuration.h" +#include "../../core/configuration.h" #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader) #include <iostream> -#include "../../time/je_timer.h" -#include "../../filesystem/je_buffer.h" -#include "../../utils/je_log.h" -#include "../../utils/je_macros.h" +#include "../../time/timer.h" +#include "../../filesystem/buffer.h" +#include "../../utils/log.h" +#include "../../utils/macros.h" -#include "../je_gl.h" -#include "../je_window.h" +#include "../gl.h" +#include "../window.h" -#include "je_jsl_compiler.h" -#include "je_shader.h" +#include "jsl_compiler.h" +#include "shader.h" using namespace std; using namespace JinEngine::Filesystem; @@ -31,7 +31,7 @@ namespace JinEngine // SHADER_FORMAT_SIZE // formatShader // - #include "built-in/je_default.shader.h" + #include "built-in/default.shader.h" // // https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/shader.h index 240f24f..e8756ac 100644 --- a/src/libjin/graphics/shaders/je_shader.h +++ b/src/libjin/graphics/shaders/shader.h @@ -1,19 +1,19 @@ #ifndef __JE_SHADER_H__ #define __JE_SHADER_H__ -#include "../../core/je_configuration.h" +#include "../../core/configuration.h" #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader) #include <string> #include <map> -#include "../../common/je_string.h" +#include "../../common/string.h" -#include "../je_color.h" -#include "../je_texture.h" -#include "../je_canvas.h" +#include "../color.h" +#include "../texture.h" +#include "../canvas.h" -#include "je_jsl_compiler.h" +#include "jsl_compiler.h" namespace JinEngine { |