3 files changed, 11 insertions, 71 deletions

diff --git a/source/Asura.Editor/graphics/shaders/image.shader.h b/source/Asura.Editor/graphics/shaders/image.shader.h
index fbca5b5..ee6be43 100644
--- a/source/Asura.Editor/graphics/shaders/image.shader.h
+++ b/source/Asura.Editor/graphics/shaders/image.shader.h
@@ -2,17 +2,20 @@
 #include "../shader.h"
 #endif
 
+// ����
 static AsuraEditor::Graphics::ShaderProgram image_shader =
 {
 R"(
 in vec2 asura_position; 
 in vec2 asura_texcoord0; 
 
-uniform asura_mvp_matrix;
+uniform mat4 asura_model_matrix; 
+uniform mat4 asura_view_matrix; 
+uniform mat4 asura_projection_matrix; 
 
 void main() 
 {
-	gl_Position = asura_mvp_matrix * vec4(asura_position, 0, 1);
+	gl_Position = asura_projection_matrix * asura_view_matrix * asura_model_matrix * vec4(asura_position, 0, 1);
 	uv = asura_texcoord0;
 }
 
@@ -25,8 +28,8 @@ uniform sampler2D asura_maintex;
 
 void main() 
 {
-		gl_FragColor = texture2D(asura_maintex, uv);
+		
 }
 
 )"
-};
+};
\ No newline at end of file
diff --git a/source/Asura.Editor/graphics/shaders/image_slice.shader.h b/source/Asura.Editor/graphics/shaders/image_slice.shader.h
deleted file mode 100644
index 58be2b1..0000000
--- a/source/Asura.Editor/graphics/shaders/image_slice.shader.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __ASURA_EDITOR_SHADER_H__
-#include "../shader.h"
-#endif
-
-// �Ź���ָ��ͼƬ
-static AsuraEditor::Graphics::ShaderProgram image_slice_shader =
-{
-R"(
-in vec2 _position; 
-
-uniform _mvp_matrix;
-
-out vec2 offset; // top-left
-
-void main() 
-{
-	gl_Position = _mvp_matrix * vec4(_position, 0, 1);
-	offset = _position - vec2(0.5, 0.5);
-}
-
-)",
-
-R"(
-in vec2 offset;
-
-uniform vec4 _sliceline; // l, r, t, b
-uniform vec2 _texsize; // w0, h0 in pixel
-uniform sampler2D _maintex;
-uniform vec2 _area; // w, h
-// �����(a, b]��Χ�ڣ�����1�����򷵻�0
-int factor(float v, float a, float b)
-{
-	return clamp(sign(v-a), 0, 1) * step(-b, -v);
-}
-
-void main() 
-{
-	float x = offset.x; 
-	float y = offset.y;
-	float l = _sliceline.x; 
-	float r = _sliceline.y; 
-	float t = _sliceline.z; 
-	float b = _sliceline.w; 
-	float w0 = _texsize.x;
-	float h0 = _texsize.y;
-	float w = _area.x;
-	float h = _area.y;
-
-	vec2 uv = vec2(0, 0);
-
-	//uv.x *= 0; // x = 0
-	uv.x *= factor(x, 0, l) * x / w0; // 0<x<=l
-	uv.x *= factor(x, l, w-r) * (l/w0 + (x-l)/(w-l-r) * (w0-l-r) / w0); // l<x<=w-r
-	uv.x *= factor(x, w-r, w) * (1 - (w-x)/w0); // w-r<x<=w
-	
-	//uv.y *= 0; // y = 0
-		
-
-	gl_FragColor = texture2D(_maintex, uv);
-	
-}
-
-)"
-};
diff --git a/source/Asura.Editor/graphics/shaders/polygon.shader.h b/source/Asura.Editor/graphics/shaders/polygon.shader.h
index ee80f32..eed4f5a 100644
--- a/source/Asura.Editor/graphics/shaders/polygon.shader.h
+++ b/source/Asura.Editor/graphics/shaders/polygon.shader.h
@@ -2,16 +2,17 @@
 #include "../shader.h"
 #endif
 
+// ����
 static AsuraEditor::Graphics::ShaderProgram polygon_shader =
 {
 	R"(
 in vec2 position; 
 
-uniform mat4 asura_mvp_matrix; 
+uniform mat4 mvp_matrix; 
 
 void main() 
 {
-	gl_Position = asura_mvp_matrix * vec4(position, 0, 1);
+	gl_Position = mvp_matrix * vec4(position, 0, 1);
 }
 
 )",
@@ -25,4 +26,4 @@ void main()
 }
 
 )"
-};
+};
\ No newline at end of file