diff options
Diffstat (limited to 'src/libjin/graphics/je_graphic.cpp')
| -rw-r--r-- | src/libjin/graphics/je_graphic.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp index e2c22d1..ed9d458 100644 --- a/src/libjin/graphics/je_graphic.cpp +++ b/src/libjin/graphics/je_graphic.cpp @@ -33,11 +33,11 @@ namespace JinEngine const Color* pixels = bitmap->getPixels(); mTexture = gl.genTexture(); - gl.bindTexture(mTexture); + gl.bindTexture2D(mTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl.texImage(GL_RGBA8, mSize.w(), mSize.h(), GL_RGBA, GL_UNSIGNED_BYTE, pixels); - gl.bindTexture(0); + gl.bindTexture2D(0); } Graphic::~Graphic() @@ -47,10 +47,10 @@ namespace JinEngine void Graphic::setFilter(GLint min_filter, GLint max_filter) { - gl.bindTexture(mTexture); + gl.bindTexture2D(mTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, max_filter); - gl.bindTexture(0); + gl.bindTexture2D(0); } void Graphic::render(float x, float y, float sx, float sy, float r, float ox, float oy) const @@ -77,9 +77,9 @@ namespace JinEngine .uploadVertices(2, GL_FLOAT, 0, vertexCoords) .uploadUV(2, GL_FLOAT, 0, textureCoords); - gl.bindTexture(getGLTexture()); + gl.bindTexture2D(getGLTexture()); gl.drawArrays(GL_QUADS, 0, 4); - gl.bindTexture(0); + gl.bindTexture2D(0); shader->end(); } @@ -113,9 +113,9 @@ namespace JinEngine .uploadVertices(2, GL_FLOAT, 0, vertexCoords) .uploadUV(2, GL_FLOAT, 0, textureCoords); - gl.bindTexture(getGLTexture()); + gl.bindTexture2D(getGLTexture()); gl.drawArrays(GL_QUADS, 0, 4); - gl.bindTexture(0); + gl.bindTexture2D(0); shader->end(); } |