From f97d0e767288b7f285029a2ef4e4d1c673298400 Mon Sep 17 00:00:00 2001 From: T1ti <40864460+T1ti@users.noreply.github.com> Date: Wed, 14 Aug 2024 04:29:09 +0200 Subject: [PATCH] https://github.com/wowdev/noggit3/commit/8d0443f4dddf40d9402655fc77cfa7e9fcbd33da --- src/opengl/texture.cpp | 8 +++++++- src/opengl/texture.hpp | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/opengl/texture.cpp b/src/opengl/texture.cpp index 3f4dadc0..5ce9f0af 100755 --- a/src/opengl/texture.cpp +++ b/src/opengl/texture.cpp @@ -43,9 +43,15 @@ namespace OpenGL gl.bindTexture (GL_TEXTURE_2D, _id); } + size_t texture::current_active_texture = -1; + void texture::set_active_texture (size_t num) { - gl.activeTexture (static_cast(GL_TEXTURE0 + num)); + if (num != current_active_texture) + { + gl.activeTexture(GL_TEXTURE0 + num); + current_active_texture = num; + } } void texture::unload() diff --git a/src/opengl/texture.hpp b/src/opengl/texture.hpp index 1bdf29fe..ecd6be4f 100755 --- a/src/opengl/texture.hpp +++ b/src/opengl/texture.hpp @@ -21,6 +21,7 @@ namespace OpenGL virtual void unload(); static void set_active_texture (size_t num = 0); + static size_t current_active_texture; protected: typedef GLuint internal_type;