This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch upstream/latest in repository colobot.
commit df8223700baa865233925267d362f4a9efa1d328 Author: Tomasz Kapuściński <[email protected]> Date: Tue May 19 16:26:41 2015 +0200 Corrected compilation error --- src/graphics/opengl/gldevice.cpp | 4 ++-- src/graphics/opengl/glutil.cpp | 14 ++++++++++++++ src/graphics/opengl/glutil.h | 7 ++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index c7fed3d..84a5472 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -935,8 +935,8 @@ void CGLDevice::SetTextureCoordGeneration(int index, TextureGenerationParams &pa for (int i = 0; i < 4; i++) { - GLuint texCoordGen = textureCoordGen[i]; - GLuint texCoord = textureCoordinates[i]; + GLuint texCoordGen = TranslateTextureCoordinateGen(i); + GLuint texCoord = TranslateTextureCoordinate(i); switch (params.coords[i].mode) { diff --git a/src/graphics/opengl/glutil.cpp b/src/graphics/opengl/glutil.cpp index 139a26e..d39ac5a 100644 --- a/src/graphics/opengl/glutil.cpp +++ b/src/graphics/opengl/glutil.cpp @@ -148,4 +148,18 @@ bool InPlane(Math::Vector normal, float originPlane, Math::Vector center, float return true; } +GLenum TranslateTextureCoordinate(int index) +{ + assert(index >= 0 && index < 4); + + return textureCoordinates[index]; +} + +GLenum TranslateTextureCoordinateGen(int index) +{ + assert(index >= 0 && index < 4); + + return textureCoordGen[index]; +} + } diff --git a/src/graphics/opengl/glutil.h b/src/graphics/opengl/glutil.h index 4e86698..7f9e701 100644 --- a/src/graphics/opengl/glutil.h +++ b/src/graphics/opengl/glutil.h @@ -26,9 +26,6 @@ namespace Gfx { -GLuint textureCoordinates[]; -GLuint textureCoordGen[]; - /** \enum VBOMode \brief VBO autodetect/override @@ -82,4 +79,8 @@ GLenum TranslateGfxBlendFunc(BlendFunc func); bool InPlane(Math::Vector normal, float originPlane, Math::Vector center, float radius); +GLenum TranslateTextureCoordinate(int index); + +GLenum TranslateTextureCoordinateGen(int index); + } // namespace Gfx -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
