Added texture debugging

README.md

@@ -152,6 +152,7 @@ Pressing <UP> will go back to last command entered (saves typing).
 
 | Command          | Action                                       |
 | ----------------:|:-------------------------------------------- |
+| texture INT      | Display the specified 2D texture for 2s      |
 | wireframe        | Render in wireframe (for debugging)          |
 | solid            | Render solid color polygons                  |
 | texture          | Render with textures                         |

include/Render.h

@@ -232,6 +232,13 @@ public:
 
     void addSkeletalModel(SkeletalModel *mdl);
 
+    /*!
+     * \brief Show a texture for a second, for debugging
+     * \param textureId texture id to show
+     * \returns GL texture id on success, < 0 on error
+     */
+    int showTextureDebug(int textureId);
+
 private:
 
     /*!

include/Texture.h

@@ -231,6 +231,20 @@ public:
 
     void useMultiTexture(float aU, float aV, float bU, float bV);
 
+    /*!
+     * \brief Show a texture for a second, for debugging
+     * \param textureId texture id to show
+     * \returns GL texture id on success, < 0 on error
+     */
+    int showTextureDebug(int textureId);
+
+    /*!
+     * \brief Renders debug texture.
+     *
+     * Called in 2D mode from Texture::Display().
+     */
+    void debugTextureRender(int width, int height);
+
 private:
 
     int nextPower(int seed);
@@ -238,6 +252,9 @@ private:
     unsigned char *scaleBuffer(unsigned char *image, int width, int height,
                                 int components);
 
+    int textureDebug;
+    int textureDebugFrames;
+
     unsigned int *mTextureIds;  //!< GL texture list
     unsigned int mTextureCount; //!< Texture counter
     unsigned int mTextureLimit; //!< The texture limit

src/CMakeLists.txt

@@ -26,10 +26,10 @@ if (APPLE)
     set (MACOSX_BUNDLE_INFO_STRING "OpenSource TombRaider Game Engine")
     set (MACOSX_BUNDLE_ICON_FILE "AppIcon")
     set (MACOSX_BUNDLE_GUI_IDENTIFIER "de.xythobuz.OpenRaider")
-    set (MACOSX_BUNDLE_LONG_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}-${OpenRaider_VERSION_RELEASE}")
     set (MACOSX_BUNDLE_BUNDLE_NAME "OpenRaider")
-    set (MACOSX_BUNDLE_SHORT_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}-${OpenRaider_VERSION_RELEASE}")
-    set (MACOSX_BUNDLE_BUNDLE_VERSION "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}-${OpenRaider_VERSION_RELEASE}")
+    set (MACOSX_BUNDLE_SHORT_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}${OpenRaider_VERSION_RELEASE}")
+    set (MACOSX_BUNDLE_LONG_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}${OpenRaider_VERSION_RELEASE} (${CMAKE_BUILD_TYPE})")
+    set (MACOSX_BUNDLE_BUNDLE_VERSION "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}${OpenRaider_VERSION_RELEASE} (${CMAKE_BUILD_TYPE})")
     set (MACOSX_BUNDLE_COPYRIGHT "2001 - 2014")
 
     # Copy Icon

src/OpenRaider.cpp

@@ -2762,6 +2762,14 @@ void OpenRaider::consoleCommand(char *cmd)
     {
         m_mouseY = static_cast<float>(atof(cmd));
     }
+    else if (rc_command("texture", cmd))
+    {
+        int error, tex = atoi(cmd);
+        if ((error = m_render.showTextureDebug(tex)) < 0)
+            print(false, "Could not load texture %d (%d)!", tex, error);
+        else
+            print(false, "Displaying texture %d in %d...", tex, error);
+    }
     else if (rc_command("r_pigtails", cmd))
     {
         if (gLaraModel)

src/Render.cpp

@@ -161,6 +161,12 @@ void Render::screenShot(char *filenameBase)
 // Public Mutators
 ////////////////////////////////////////////////////////////
 
+
+int Render::showTextureDebug(int textureId) {
+    return mTexture.showTextureDebug(textureId);
+}
+
+
 void Render::addRoom(RenderRoom *room)
 {
     mRooms.pushBack(room);
@@ -959,6 +965,7 @@ void Render::Display()
     glEnterMode2d(mWidth, mHeight);
     glColor3fv(OR_BLUE);
     mString.Render();
+    mTexture.debugTextureRender(mWidth, mHeight);
     glExitMode2d();
 
 #ifdef USING_EMITTER

src/Texture.cpp

@@ -44,6 +44,8 @@ Texture::Texture()
     //gTextureManager = this;
 
     initSDL_TTF();
+
+    textureDebug = -1;
 }
 
 
@@ -210,6 +212,42 @@ void glPrint3d(float x, float y, float z,
 }
 
 
+int Texture::showTextureDebug(int textureId) {
+    if (textureId >= getTextureCount())
+        return -1;
+
+    textureDebug = textureId;
+    textureDebugFrames = 100;
+
+    return mTextureIds[textureId];
+}
+
+
+void Texture::debugTextureRender(int width, int height) {
+    int xMin, xMax, yMin, yMax;
+
+    xMin = yMin = 0;
+    xMax = width;
+    yMax = height;
+
+    if ((textureDebug >= 0) && (textureDebugFrames > 0)) {
+        glColor3f(1, 1, 1);
+        bindTextureId(textureDebug);
+
+        // Draw a textured quad
+        glBegin(GL_QUADS);
+        glTexCoord2f(0, 0); glVertex3f(xMin, yMin, 0);
+        glTexCoord2f(0, 1); glVertex3f(xMin, yMax, 0);
+        glTexCoord2f(1, 1); glVertex3f(xMax, yMax, 0);
+        glTexCoord2f(1, 0); glVertex3f(xMax, yMin, 0);
+
+        glEnd();
+
+        textureDebugFrames--;
+    }
+}
+
+
 int Texture::loadFontTTF(const char *filename,
         unsigned int utf8Offset, unsigned int count)
 {
@@ -653,7 +691,13 @@ void convertARGB32bppToRGBA32bpp(unsigned char *image,
     }
 }
 
-GLint deprecated_gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
+// http://mmmovania.blogspot.de/2011/01/opengl-30-and-above-deprecated-func-and.html
+// http://www.g-truc.net/post-0256.html
+GLint deprecated_gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data) {
+    glTexParameteri(target, GL_GENERATE_MIPMAP, GL_TRUE);
+    glTexImage2D(target, 0, internalFormat, width, height, 0, format, type, data);
+    return 0;
+}
 
 int Texture::loadBufferSlot(unsigned char *image,
         unsigned int width, unsigned int height,
@@ -758,15 +802,6 @@ int Texture::loadBufferSlot(unsigned char *image,
 }
 
 
-// http://mmmovania.blogspot.de/2011/01/opengl-30-and-above-deprecated-func-and.html
-// http://www.g-truc.net/post-0256.html
-GLint deprecated_gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data) {
-    glTexParameteri(target, GL_GENERATE_MIPMAP, GL_TRUE);
-    glTexImage2D(target, 0, internalFormat, width, height, 0, format, type, data);
-    return 0;
-}
-
-
 void Texture::bindTextureId(unsigned int n)
 {
     if ((int)n == mTextureId || !mTextureIds || n > mTextureCount)