diff options
author | chai <chaifix@163.com> | 2018-12-14 14:55:42 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-12-14 14:55:42 +0800 |
commit | 870fcdae66edc680cac55defb149e1434e865f37 (patch) | |
tree | bb0b45627b98ec4c782466b3bb57daf63c44e460 /src/libjin/graphics/shaders | |
parent | eb8ca083c9be574acd27cf0de41d1f69146cad7a (diff) |
*格式化代码
Diffstat (limited to 'src/libjin/graphics/shaders')
-rw-r--r-- | src/libjin/graphics/shaders/je_base.shader.h | 19 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/je_shader.cpp | 10 | ||||
-rw-r--r-- | src/libjin/graphics/shaders/je_shader.h | 6 |
3 files changed, 17 insertions, 18 deletions
diff --git a/src/libjin/graphics/shaders/je_base.shader.h b/src/libjin/graphics/shaders/je_base.shader.h index 34996bc..1cecddf 100644 --- a/src/libjin/graphics/shaders/je_base.shader.h +++ b/src/libjin/graphics/shaders/je_base.shader.h @@ -2,13 +2,13 @@ #define __JE_BASE_SHADER_H__ static const char* base_shared = R"( -#define Number float +#define Number float #define Texture sampler2D #define Canvas sampler2D #define Color vec4 -#define Vec2 vec2 -#define Vec3 vec3 -#define Vec4 vec4 +#define Vec2 vec2 +#define Vec3 vec3 +#define Vec4 vec4 #define texel texture2D @@ -26,9 +26,8 @@ static const char* base_vertex = R"( #version 130 core %s -// Projection matrix + uniform mat4 jin_ProjectionMatrix; -// Model view matrix uniform mat4 jin_ModelViewMatrix; in vec2 jin_VertexCoords; @@ -42,10 +41,10 @@ out vec2 jin_UV; void main() { - vec4 v = jin_ModelViewMatrix * vec4(jin_VertexCoords, 0, 1.0); + vec4 v = jin_ModelViewMatrix * vec4(jin_VertexCoords, 0, 1.0); Vertex _v = vert(Vertex(v.xy, jin_TextureCoords)); - gl_Position = jin_ProjectionMatrix * vec4(_v.xy, 0, 1.0f); - jin_Color = gl_Color; + gl_Position = jin_ProjectionMatrix * vec4(_v.xy, 0, 1.0f); + jin_Color = gl_Color; jin_XY = _v.xy; jin_UV = _v.uv; } @@ -86,4 +85,4 @@ static const char* SHADER_MAIN_TEXTURE = "jin_MainTexture"; static const char* SHADER_VERTEX_COORDS = "jin_VertexCoords"; static const char* SHADER_TEXTURE_COORDS = "jin_TextureCoords"; -#endif // __JE_BASE_SHADER_H__ +#endif // __JE_BASE_SHADER_H__
\ No newline at end of file diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp index 017231a..b7a4bba 100644 --- a/src/libjin/graphics/shaders/je_shader.cpp +++ b/src/libjin/graphics/shaders/je_shader.cpp @@ -16,8 +16,8 @@ using namespace JinEngine::Filesystem; namespace JinEngine { - namespace Graphics - { + namespace Graphics + { namespace Shaders { @@ -145,8 +145,8 @@ if (success == GL_FALSE) \ } #define checkJSL() \ - if (gl.getShader() != this) \ - return + if (gl.getShader() != this) \ + return void Shader::sendInt(const char* name, int value) { @@ -267,7 +267,7 @@ if (success == GL_FALSE) \ } } // namespace Shaders - } // namespace Graphics + } // namespace Graphics } // namespace JinEngine #endif // (jin_graphics) && (jin_graphics & jin_graphics_shader)
\ No newline at end of file diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h index d8be118..2ccc537 100644 --- a/src/libjin/graphics/shaders/je_shader.h +++ b/src/libjin/graphics/shaders/je_shader.h @@ -17,8 +17,8 @@ namespace JinEngine { - namespace Graphics - { + namespace Graphics + { namespace Shaders { @@ -175,7 +175,7 @@ namespace JinEngine }; } // namespace Shaders - } // namespace Graphics + } // namespace Graphics } // namespace JinEngine #endif // (jin_graphics) && (jin_graphics & jin_graphics_shader) |