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_mesh.cpp | |
| parent | 909e544ed322b28a6f59febf3213e05068e9e93c (diff) | |
| parent | da056982e50bdd9cb9f944691cc88ca98b053b77 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/Jin
Diffstat (limited to 'src/libjin/graphics/je_mesh.cpp')
| -rw-r--r-- | src/libjin/graphics/je_mesh.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libjin/graphics/je_mesh.cpp b/src/libjin/graphics/je_mesh.cpp index 2d453b0..e3bebe6 100644 --- a/src/libjin/graphics/je_mesh.cpp +++ b/src/libjin/graphics/je_mesh.cpp @@ -60,7 +60,7 @@ namespace JinEngine Math::Matrix modelViewMatrix = gl.getModelViewMatrix(x, y, sx, sy, r, ox, oy); Shader* shader = gl.getShader(); - shader->prepare() + shader->begin() .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix) .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()) .uploadVertices(2, GL_FLOAT, sizeof(Vertex), &(mVertices[0].xy)) @@ -70,6 +70,8 @@ namespace JinEngine gl.bindTexture(mGraphic->getGLTexture()); gl.drawArrays(GL_POLYGON, 0, mVertices.size()); gl.bindTexture(0); + + shader->end(); }; } // namespace Graphics |