From d4c2cef26b702eb1c0544b0ae579444a76db9ef7 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 20 Dec 2018 16:54:36 +0800 Subject: *shader --- src/libjin/graphics/je_shapes.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libjin/graphics/je_shapes.cpp') diff --git a/src/libjin/graphics/je_shapes.cpp b/src/libjin/graphics/je_shapes.cpp index 02c007d..96a4f76 100644 --- a/src/libjin/graphics/je_shapes.cpp +++ b/src/libjin/graphics/je_shapes.cpp @@ -23,7 +23,7 @@ namespace JinEngine float verts[] = { x + 0.5f , y + 0.5f }; Shader* shader = gl.getShader(); - shader->setVertexPointer(2, GL_FLOAT, 0, verts); + shader->uploadVertices(2, GL_FLOAT, 0, verts); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); @@ -34,7 +34,7 @@ namespace JinEngine void points(int n, GLshort* p) { Shader* shader = gl.getShader(); - shader->setVertexPointer(2, GL_SHORT, 0, p); + shader->uploadVertices(2, GL_SHORT, 0, p); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); @@ -50,7 +50,7 @@ namespace JinEngine }; Shader* shader = gl.getShader(); - shader->setVertexPointer(2, GL_FLOAT, 0, verts); + shader->uploadVertices(2, GL_FLOAT, 0, verts); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); @@ -101,7 +101,7 @@ namespace JinEngine Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); - shader->setVertexPointer(2, GL_FLOAT, 0, p); + shader->uploadVertices(2, GL_FLOAT, 0, p); glDrawArrays(GL_LINE_LOOP, 0, count); } @@ -118,7 +118,7 @@ namespace JinEngine Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); - shader->setVertexPointer(2, GL_FLOAT, 0, p); + shader->uploadVertices(2, GL_FLOAT, 0, p); glDrawArrays(GL_POLYGON, 0, count); } -- cgit v1.1-26-g67d0