summaryrefslogtreecommitdiff
path: root/source/Asura.Editor/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'source/Asura.Editor/graphics')
-rw-r--r--source/Asura.Editor/graphics/brush.cpp0
-rw-r--r--source/Asura.Editor/graphics/brush.h20
-rw-r--r--source/Asura.Editor/graphics/pen.cpp0
-rw-r--r--source/Asura.Editor/graphics/pen.h20
-rw-r--r--source/Asura.Editor/graphics/shaders/image.shader.h2
5 files changed, 41 insertions, 1 deletions
diff --git a/source/Asura.Editor/graphics/brush.cpp b/source/Asura.Editor/graphics/brush.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/Asura.Editor/graphics/brush.cpp
diff --git a/source/Asura.Editor/graphics/brush.h b/source/Asura.Editor/graphics/brush.h
new file mode 100644
index 0000000..5ffdba4
--- /dev/null
+++ b/source/Asura.Editor/graphics/brush.h
@@ -0,0 +1,20 @@
+#ifndef __ASURA_EDITOR_BRUSH_H__
+#define __ASURA_EDITOR_BRUSH_H__
+
+namespace AsuraEditor
+{
+ namespace Graphics
+ {
+
+ ///
+ /// ˢָģʽ
+ ///
+ class Brush
+ {
+
+ };
+
+ }
+}
+
+#endif \ No newline at end of file
diff --git a/source/Asura.Editor/graphics/pen.cpp b/source/Asura.Editor/graphics/pen.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/Asura.Editor/graphics/pen.cpp
diff --git a/source/Asura.Editor/graphics/pen.h b/source/Asura.Editor/graphics/pen.h
new file mode 100644
index 0000000..87a031c
--- /dev/null
+++ b/source/Asura.Editor/graphics/pen.h
@@ -0,0 +1,20 @@
+#ifndef __ASURA_EDITOR_PEN_H__
+#define __ASURA_EDITOR_PEN_H__
+
+namespace AsuraEditor
+{
+ namespace Graphics
+ {
+
+ ///
+ /// ʣָƵʽ
+ ///
+ class Pen
+ {
+
+ };
+
+ }
+}
+
+#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
index 6274f56..ee6be43 100644
--- a/source/Asura.Editor/graphics/shaders/image.shader.h
+++ b/source/Asura.Editor/graphics/shaders/image.shader.h
@@ -24,7 +24,7 @@ void main()
R"(
in vec2 uv;
-uniform sampler2D img;
+uniform sampler2D asura_maintex;
void main()
{