diff options
| author | chai <chaifix@163.com> | 2018-10-09 07:53:47 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-09 07:53:47 +0800 |
| commit | 4620c40753ad540042a53a35f8d3725dbd6af5c6 (patch) | |
| tree | c9d7e5faf9cbd2002ff63f980be5bc7107ae874c /src/libjin/Graphics/Shapes.cpp | |
| parent | 96719112134c5afc41f5fe6aeceb71183afcad43 (diff) | |
*修改base shader
Diffstat (limited to 'src/libjin/Graphics/Shapes.cpp')
| -rw-r--r-- | src/libjin/Graphics/Shapes.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libjin/Graphics/Shapes.cpp b/src/libjin/Graphics/Shapes.cpp index 1befd11..f5aedd4 100644 --- a/src/libjin/Graphics/Shapes.cpp +++ b/src/libjin/Graphics/Shapes.cpp @@ -21,8 +21,8 @@ namespace graphics Shader* shader = Shader::getCurrentShader(); shader->bindVertexPointer(2, GL_FLOAT, 0, verts); gl.ModelMatrix.setIdentity(); - 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); glDrawArrays(GL_POINTS, 0, 1); } @@ -32,8 +32,8 @@ namespace graphics Shader* shader = Shader::getCurrentShader(); shader->bindVertexPointer(2, GL_SHORT, 0, p); gl.ModelMatrix.setIdentity(); - 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); glDrawArrays(GL_POINTS, 0, n); } @@ -48,8 +48,8 @@ namespace graphics Shader* shader = Shader::getCurrentShader(); shader->bindVertexPointer(2, GL_FLOAT, 0, verts); gl.ModelMatrix.setIdentity(); - 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); glDrawArrays(GL_LINES, 0, 2); } @@ -95,8 +95,8 @@ namespace graphics { Shader* shader = Shader::getCurrentShader(); gl.ModelMatrix.setIdentity(); - 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, p); glDrawArrays(GL_LINE_LOOP, 0, count); @@ -112,8 +112,8 @@ namespace graphics { Shader* shader = Shader::getCurrentShader(); gl.ModelMatrix.setIdentity(); - 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, p); glDrawArrays(GL_POLYGON, 0, count); |