diff options
| author | chai <chaifix@163.com> | 2018-12-23 01:06:46 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-12-23 01:06:46 +0800 |
| commit | 5b8b5c95589e615afda3f0d67db612b64297c2a0 (patch) | |
| tree | 976de20f8a317c1dfb07ed1914ff8bebc4242005 /src/libjin/graphics/je_mesh.cpp | |
| parent | 6afaad9b9490d4b70a0bea4a8289cc637194abc7 (diff) | |
*shader and time
Diffstat (limited to 'src/libjin/graphics/je_mesh.cpp')
| -rw-r--r-- | src/libjin/graphics/je_mesh.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libjin/graphics/je_mesh.cpp b/src/libjin/graphics/je_mesh.cpp index 7a409b4..e8512ac 100644 --- a/src/libjin/graphics/je_mesh.cpp +++ b/src/libjin/graphics/je_mesh.cpp @@ -60,13 +60,12 @@ namespace JinEngine Math::Matrix modelViewMatrix = gl.getModelViewMatrix(x, y, sx, sy, r, ox, oy); Shader* shader = gl.getShader(); - shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix) + shader->prepare() + .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix) .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()) - .beginUploadAttributes() .uploadVertices(2, GL_FLOAT, sizeof(Vertex), &(mVertices[0].xy)) .uploadUV(2, GL_FLOAT, sizeof(Vertex), &(mVertices[0].uv)) - .uploadColor(4, GL_UNSIGNED_BYTE, sizeof(Vertex), &(mVertices[0].color), GL_TRUE) - .endUploadAttributes(); + .uploadColor(4, GL_UNSIGNED_BYTE, sizeof(Vertex), &(mVertices[0].color), GL_TRUE); gl.bindTexture(mGraphic->getGLTexture()); gl.drawArrays(GL_POLYGON, 0, mVertices.size()); |