aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-17 23:57:35 +0800
committerchai <chaifix@163.com>2018-12-17 23:57:35 +0800
commitb6d045629e9b9c06b3377133031b8a24949d46ed (patch)
tree1b1595b25f84309c3e1a8aa4eeb4a62c670d4162 /src
parentd3709f3d48fd1e97354c2f0b419519a198e43473 (diff)
*shader
Diffstat (limited to 'src')
-rw-r--r--src/libjin/graphics/shaders/je_jsl_compiler.cpp33
1 files changed, 16 insertions, 17 deletions
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/je_jsl_compiler.cpp
index 3cd8299..516751e 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp
+++ b/src/libjin/graphics/shaders/je_jsl_compiler.cpp
@@ -22,23 +22,22 @@ namespace JinEngine
JinEngine::String SHADER_VERTEX_COORDS = "jin_VertexCoords";
JinEngine::String SHADER_TEXTURE_COORDS = "jin_TextureCoords";
JinEngine::String SHADER_VERSION = "#version 130 core \n";
- JinEngine::String SHADER_COMMON = R"(
- #define Number float
- #define Texture sampler2D
- #define Canvas sampler2D
- #define Color vec4
- #define Vec2 vec2
- #define Vec3 vec3
- #define Vec4 vec4
-
- #define texel texture2D
-
- struct Vertex
- {
- vec2 xy;
- vec2 uv;
- };
- )";
+ JinEngine::String SHADER_COMMON =
+ "#define Number float \n"
+ "#define Texture sampler2D \n"
+ "#define Canvas sampler2D \n"
+ "#define Color vec4 \n"
+ "#define Vec2 vec2 \n"
+ "#define Vec3 vec3 \n"
+ "#define Vec4 vec4 \n"
+ " \n"
+ "#define texel texture2D \n"
+ " \n"
+ "struct Vertex \n"
+ "{ \n"
+ " vec2 xy; \n"
+ " vec2 uv; \n"
+ "}; \n";
JinEngine::String JSLCompiler::formatVertexShader(const JinEngine::String& vert)
{