Compiles in Ubuntu 14.04 with gcc

ChangeLog.md

@@ -2,6 +2,12 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140624 ]
+    * Some changes to allow compilation with Ubuntu 14.04 / gcc
+    * Modified utils/png to allow compilation with different integer sizes
+      Thanks to Christian for his help and his Linux machine :)
+    * Removed TextureManagers fUseMipmaps flag, now always used
+
     [ 20140623 ]
     * Use unsigned char instead of float for colors
 

include/TextureManager.h

@@ -25,8 +25,7 @@ public:
     };
 
     enum TextureFlag {
-        fUseMipmaps      = (1 << 0),
-        fUseMultiTexture = (1 << 1),
+        fUseMultiTexture = (1 << 0),
     };
 
     /*!
@@ -51,7 +50,7 @@ public:
      * \param height height of newly allocated buffer, power of 2, pref same as width
      * \returns newly allocated texture buffer filled with specified color
      */
-    static unsigned char *generateColorTexture(unsigned char rgba[4],
+    static unsigned char *generateColorTexture(const unsigned char rgba[4],
                                                 unsigned int width,
                                                 unsigned int height);
 
@@ -117,7 +116,7 @@ public:
      * \param height height of new texture
      * \returns texture ID or -1 on error
      */
-    int loadColorTexture(unsigned char rgba[4],
+    int loadColorTexture(const unsigned char rgba[4],
                             unsigned int width, unsigned int height);
 
     /*!

src/Font.cpp

@@ -5,6 +5,9 @@
  * \author xythobuz
  */
 
+#include <stdio.h>
+#include <stdarg.h>
+
 #include "global.h"
 #include "utils/strings.h"
 #include "Font.h"

src/FontTRLE.cpp

@@ -7,6 +7,7 @@
 
 #include <fstream>
 #include <sstream>
+#include <stdexcept>
 
 #include "global.h"
 #include "utils/strings.h"

src/Render.cpp

@@ -89,20 +89,12 @@ void Render::loadTexture(unsigned char *image,
 int Render::initTextures(char *textureDir) {
     char *filename;
     unsigned int numTextures = 0;
-    unsigned char color[4];
 
     mTexture.reset();
     mTexture.setMaxTextureCount(128);  /* TR never needs more than 32 iirc
                                           However, color texturegen is a lot */
 
-    mTexture.setFlag(TextureManager::fUseMipmaps);
-
-    color[0] = 0xff;
-    color[1] = 0xff;
-    color[2] = 0xff;
-    color[3] = 0xff;
-
-    if (mTexture.loadColorTexture(color, 32, 32) > -1)
+    if (mTexture.loadColorTexture(WHITE, 32, 32) > -1)
         numTextures++;
 
     // Temporary

src/TextureManager.cpp

@@ -29,7 +29,7 @@ TextureManager::~TextureManager() {
     reset();
 }
 
-unsigned char *TextureManager::generateColorTexture(unsigned char rgba[4],
+unsigned char *TextureManager::generateColorTexture(const unsigned char rgba[4],
         unsigned int width, unsigned int height) {
     assert(rgba != NULL);
     assert(width > 0);
@@ -47,7 +47,7 @@ unsigned char *TextureManager::generateColorTexture(unsigned char rgba[4],
     return image;
 }
 
-int TextureManager::loadColorTexture(unsigned char rgba[4],
+int TextureManager::loadColorTexture(const unsigned char rgba[4],
         unsigned int width, unsigned int height) {
     assert(rgba != NULL);
     assert(width > 0);
@@ -228,21 +228,12 @@ int TextureManager::loadBufferSlot(unsigned char *image,
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-    if (mFlags & fUseMipmaps) {
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                GL_NEAREST_MIPMAP_LINEAR);
-        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                GL_LINEAR_MIPMAP_LINEAR);
+    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 
-        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-        glTexImage2D(GL_TEXTURE_2D, 0, bytes, width, height, 0, glcMode, GL_UNSIGNED_BYTE, image);
-    } else {
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-
-        glTexImage2D(GL_TEXTURE_2D, 0, glcMode, width, height, 0,
-                glcMode, GL_UNSIGNED_BYTE, image);
-    }
+    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+    glTexImage2D(GL_TEXTURE_2D, 0, bytes, width, height, 0, glcMode, GL_UNSIGNED_BYTE, image);
 
     //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 

src/utils/png.cpp

@@ -101,10 +101,14 @@ int pngLoad(const char *filename, unsigned char **image, unsigned int *width, un
     png_read_info(png_ptr, info_ptr);
 
     int bit_depth, color_type;
+    png_uint_32 tmpWidth, tmpHeight;
 
-    png_get_IHDR(png_ptr, info_ptr, width, height, &bit_depth, &color_type,
+    png_get_IHDR(png_ptr, info_ptr, &tmpWidth, &tmpHeight, &bit_depth, &color_type,
             NULL, NULL, NULL);
 
+    *width = tmpWidth;
+    *height = tmpHeight;
+
     if (bit_depth != 8) {
         pngPrint("%s: Unsupported bit depth %d.  Must be 8.", filename, bit_depth);
         return -7;