From b5b43bac50ad58949e70bcd1a34b1e6c4765fd51 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 10 Apr 2019 09:03:57 +0800
Subject: *misc

---
 source/Asura.Editor/graphics/brush.cpp              |  0
 source/Asura.Editor/graphics/brush.h                | 20 ++++++++++++++++++++
 source/Asura.Editor/graphics/pen.cpp                |  0
 source/Asura.Editor/graphics/pen.h                  | 20 ++++++++++++++++++++
 source/Asura.Editor/graphics/shaders/image.shader.h |  2 +-
 5 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 source/Asura.Editor/graphics/brush.cpp
 create mode 100644 source/Asura.Editor/graphics/brush.h
 create mode 100644 source/Asura.Editor/graphics/pen.cpp
 create mode 100644 source/Asura.Editor/graphics/pen.h

(limited to 'source/Asura.Editor/graphics')

diff --git a/source/Asura.Editor/graphics/brush.cpp b/source/Asura.Editor/graphics/brush.cpp
new file mode 100644
index 0000000..e69de29
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
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() 
 {
-- 
cgit v1.1-26-g67d0