diff options
| author | chai <chaifix@163.com> | 2019-01-07 09:54:08 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-01-07 09:54:08 +0800 |
| commit | 2af7f2f5e3da8f6c236e7996781950e1bc6c1f9c (patch) | |
| tree | f6a8a9618e146c93e4d4d964a6e13cd16f528693 /src/libjin/graphics/je_graphic.cpp | |
| parent | 909e544ed322b28a6f59febf3213e05068e9e93c (diff) | |
| parent | da056982e50bdd9cb9f944691cc88ca98b053b77 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/Jin
Diffstat (limited to 'src/libjin/graphics/je_graphic.cpp')
| -rw-r--r-- | src/libjin/graphics/je_graphic.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp index 18dbf42..e2c22d1 100644 --- a/src/libjin/graphics/je_graphic.cpp +++ b/src/libjin/graphics/je_graphic.cpp @@ -71,7 +71,7 @@ namespace JinEngine textureCoords[6] = 1; textureCoords[7] = 0; // Set shader. Shader* shader = gl.getShader(); - shader->prepare() + shader->begin() .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix) .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()) .uploadVertices(2, GL_FLOAT, 0, vertexCoords) @@ -80,6 +80,8 @@ namespace JinEngine gl.bindTexture(getGLTexture()); gl.drawArrays(GL_QUADS, 0, 4); gl.bindTexture(0); + + shader->end(); } void Graphic::render(const Math::Quad& slice, float x, float y, float sx, float sy, float r, float ax, float ay) const @@ -105,7 +107,7 @@ namespace JinEngine Math::Matrix modelViewMatrix = gl.getModelViewMatrix(x, y, sx, sy, r, ax, ay); Shader* shader = gl.getShader(); - shader->prepare() + shader->begin() .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix) .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()) .uploadVertices(2, GL_FLOAT, 0, vertexCoords) @@ -114,6 +116,8 @@ namespace JinEngine gl.bindTexture(getGLTexture()); gl.drawArrays(GL_QUADS, 0, 4); gl.bindTexture(0); + + shader->end(); } void Graphic::render(const Math::Transform& transform) const |