diff options
author | chai <chaifix@163.com> | 2019-08-16 08:54:08 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2019-08-16 08:54:08 +0800 |
commit | a077eb38b01292611f4f6031b75e3e2c1c20f06e (patch) | |
tree | 8f760483d7b0290952bbdb5bcd8f3943102aeb3a /source/Asura.Editor/graphics | |
parent | 6a065c913e9308cc72e1ad0723b6167048f439b6 (diff) |
Diffstat (limited to 'source/Asura.Editor/graphics')
-rw-r--r-- | source/Asura.Editor/graphics/pen.cpp | 0 | ||||
-rw-r--r-- | source/Asura.Editor/graphics/pen.h | 7 | ||||
-rw-r--r-- | source/Asura.Editor/graphics/shader.h | 13 | ||||
-rw-r--r-- | source/Asura.Editor/graphics/shaders/image.shader.h | 35 | ||||
-rw-r--r-- | source/Asura.Editor/graphics/shaders/polygon.shader.h | 29 | ||||
-rw-r--r-- | source/Asura.Editor/graphics/style.cpp | 0 | ||||
-rw-r--r-- | source/Asura.Editor/graphics/style.h | 15 |
7 files changed, 5 insertions, 94 deletions
diff --git a/source/Asura.Editor/graphics/pen.cpp b/source/Asura.Editor/graphics/pen.cpp deleted file mode 100644 index e69de29..0000000 --- a/source/Asura.Editor/graphics/pen.cpp +++ /dev/null diff --git a/source/Asura.Editor/graphics/pen.h b/source/Asura.Editor/graphics/pen.h deleted file mode 100644 index b949d14..0000000 --- a/source/Asura.Editor/graphics/pen.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _ASURA_EDITOR_PEN_H_ -#define _ASURA_EDITOR_PEN_H_ - - - - -#endif
\ No newline at end of file diff --git a/source/Asura.Editor/graphics/shader.h b/source/Asura.Editor/graphics/shader.h index a3abec1..af291a5 100644 --- a/source/Asura.Editor/graphics/shader.h +++ b/source/Asura.Editor/graphics/shader.h @@ -3,16 +3,13 @@ namespace AsuraEditor { - namespace Graphics - { - struct ShaderProgram - { - const char* vert; - const char* frag; - }; +struct ShaderProgram +{ + const char* vert; + const char* frag; +}; - } } #endif
\ No newline at end of file diff --git a/source/Asura.Editor/graphics/shaders/image.shader.h b/source/Asura.Editor/graphics/shaders/image.shader.h deleted file mode 100644 index cbdd542..0000000 --- a/source/Asura.Editor/graphics/shaders/image.shader.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _ASURA_EDITOR_SHADER_H_ -#include "../shader.h" -#endif - -// -static AsuraEditor::Graphics::ShaderProgram image_shader = -{ -R"( -in vec2 asura_position; -in vec2 asura_texcoord0; - -uniform mat4 asura_model_matrix; -uniform mat4 asura_view_matrix; -uniform mat4 asura_projection_matrix; - -void main() -{ - gl_Position = asura_projection_matrix * asura_view_matrix * asura_model_matrix * vec4(asura_position, 0, 1); - uv = asura_texcoord0; -} - -)", - -R"( -in vec2 uv; - -uniform sampler2D asura_maintex; - -void main() -{ - -} - -)" -};
\ No newline at end of file diff --git a/source/Asura.Editor/graphics/shaders/polygon.shader.h b/source/Asura.Editor/graphics/shaders/polygon.shader.h deleted file mode 100644 index a92e9a6..0000000 --- a/source/Asura.Editor/graphics/shaders/polygon.shader.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _ASURA_EDITOR_SHADER_H_ -#include "../shader.h" -#endif - -// -static AsuraEditor::Graphics::ShaderProgram polygon_shader = -{ - R"( -in vec2 position; - -uniform mat4 mvp_matrix; - -void main() -{ - gl_Position = mvp_matrix * vec4(position, 0, 1); -} - -)", - -R"( -uniform vec4 color; - -void main() -{ - gl_FragColor = color; -} - -)" -};
\ No newline at end of file diff --git a/source/Asura.Editor/graphics/style.cpp b/source/Asura.Editor/graphics/style.cpp deleted file mode 100644 index e69de29..0000000 --- a/source/Asura.Editor/graphics/style.cpp +++ /dev/null diff --git a/source/Asura.Editor/graphics/style.h b/source/Asura.Editor/graphics/style.h deleted file mode 100644 index 2676c68..0000000 --- a/source/Asura.Editor/graphics/style.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ASURA_EDITOR_GUI_STYLE_H_ -#define _ASURA_EDITOR_GUI_STYLE_H_ - -#include <asura-base/Classes.h> - -namespace_begin(AsuraEditor) - -class GUIStyle -{ - -}; - -namespace_end - -#endif
\ No newline at end of file |