*修改base shader内建变量

2 files changed, 4 insertions, 4 deletions

diff --git a/src/libjin/Graphics/Drawable.cpp b/src/libjin/Graphics/Drawable.cpp
index abe2dc8..77c3750 100644
--- a/src/libjin/Graphics/Drawable.cpp
+++ b/src/libjin/Graphics/Drawable.cpp
@@ -43,8 +43,8 @@ namespace graphics
         gl.ModelMatrix.setTransformation(x, y, r, sx, sy, anchor.x, anchor.y);
 
 		Shader* shader = Shader::getCurrentShader();
-		shader->sendMatrix4(Shader::SHADER_MODEL_MATRIX, &gl.ModelMatrix);
-		shader->sendMatrix4(Shader::SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
+		shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+		shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
 		shader->bindVertexPointer(2, GL_FLOAT, 0, vertex_coords);
 		shader->bindUVPointer(2, GL_FLOAT, 0, texture_coords);
 
diff --git a/src/libjin/Graphics/Font.cpp b/src/libjin/Graphics/Font.cpp
index 3e18359..9060961 100644
--- a/src/libjin/Graphics/Font.cpp
+++ b/src/libjin/Graphics/Font.cpp
@@ -199,8 +199,8 @@ namespace graphics
         const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
         const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
 		gl.ModelMatrix.setTransformation(x, y, 0, 1, 1, 0, 0);
-		shader->sendMatrix4(Shader::SHADER_MODEL_MATRIX, &gl.ModelMatrix);
-		shader->sendMatrix4(Shader::SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
+		shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+		shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
         for (int i = 0; i < glyphinfolist.size(); ++i)
         {
             const GlyphArrayDrawInfo& info = glyphinfolist[i];