Added utils/pixels

TODO.md

@@ -10,7 +10,6 @@
     * Rewrite Console and use operator << to write to the console?
 * SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
 * Mesh has 2 different approaches of storing the same data (eg. mColors and mColorArray), but half of ‘em isn’t implemented. Unify this, probably even reusing the Mesh class for the model_meshes...
-* glTexImage2D has alignment requirements?!?! https://www.khronos.org/opengles/sdk/1.1/docs/man/glTexImage2D.xml
 
 ## Changes
 

include/Texture.h

@@ -9,8 +9,6 @@
 #ifndef _TEXTURE_H
 #define _TEXTURE_H
 
-#include <stdio.h>
-
 /*!
  * \brief Texture registry
  */
@@ -18,10 +16,12 @@ class Texture {
 public:
 
     enum ColorMode {
-        GREYSCALE = 1,
+        GREYSCALE,
         RGB,
         RGBA,
-        ARGB
+        ARGB,
+        BGR,
+        BGRA
     };
 
     enum TextureFlag {
@@ -40,6 +40,11 @@ public:
     ~Texture();
 
     /*!
+     * \brief Resets all texture data
+     */
+    void reset();
+
+    /*!
      * \brief Generates a texture buffer with (width * height * 4) bytes.
      * \param rgba 32bpp RGBA color to fill into buffer
      * \param width width of newly allocated buffer, power of 2, pref same as height
@@ -125,11 +130,6 @@ public:
     int loadPCX(const char *filename);
 
     /*!
-     * \brief Resets all texture data
-     */
-    void reset();
-
-    /*!
      * \brief Sets an option flag
      * \param flag flag to set
      */

include/utils/pixel.h

@@ -0,0 +1,14 @@
+/*!
+ * \file include/utils/pixel.h
+ * \brief Pixel buffer utilities
+ *
+ * \author xythobuz
+ */
+
+#ifndef _UTILS_PIXEL_H_
+#define _UTILS_PIXEL_H_
+
+void argb2rgba32(unsigned char *image, unsigned int w, unsigned int h);
+
+#endif
+

src/Texture.cpp

@@ -13,6 +13,7 @@
 
 #include "global.h"
 #include "utils/pcx.h"
+#include "utils/pixel.h"
 #include "utils/strings.h"
 #include "utils/tga.h"
 #include "Texture.h"
@@ -164,24 +165,6 @@ int Texture::loadBuffer(unsigned char *image,
     return id;
 }
 
-void convertARGB32bppToRGBA32bpp(unsigned char *image,
-        unsigned int w, unsigned int h) {
-    unsigned int i, size = w * h;
-
-    assert(image != NULL);
-    assert(w > 0);
-    assert(h > 0);
-
-    for (i = 0; i < size; ++i) {
-        /* 32-bit ARGB to RGBA */
-        unsigned char swap = image[(i * 4) + 3];
-        image[(i * 4)] = image[(i * 4) + 1];
-        image[(i * 4) + 1] = image[(i * 4) + 2];
-        image[(i * 4) + 2] = image[(i * 4) + 3];
-        image[(i * 4) + 3] = swap;
-    }
-}
-
 int Texture::loadBufferSlot(unsigned char *image,
         unsigned int width, unsigned int height,
         ColorMode mode, unsigned int bpp,
@@ -205,6 +188,7 @@ int Texture::loadBufferSlot(unsigned char *image,
             bytes = 1;
             glcMode = GL_LUMINANCE;
             break;
+
         case RGB:
             if (bpp != 24) {
                 printf("Texture::Load ERROR Unsupported RGB, %i bpp\n", bpp);
@@ -213,9 +197,10 @@ int Texture::loadBufferSlot(unsigned char *image,
             bytes = 3;
             glcMode = GL_RGB;
             break;
+
         case ARGB:
             if (bpp == 32) {
-                convertARGB32bppToRGBA32bpp(image, width, height);
+                argb2rgba32(image, width, height);
             } else {
                 printf("Texture::Load ERROR Unsupported ARGB, %i bpp\n", bpp);
                 return -1;
@@ -223,6 +208,7 @@ int Texture::loadBufferSlot(unsigned char *image,
             bytes = 4;
             glcMode = GL_RGBA;
             break;
+
         case RGBA:
             if (bpp != 32) {
                 printf("Texture::Load ERROR Unsupported RGBA, %i bpp\n", bpp);
@@ -231,6 +217,24 @@ int Texture::loadBufferSlot(unsigned char *image,
             bytes = 4;
             glcMode = GL_RGBA;
             break;
+
+        case BGR:
+            if (bpp != 24) {
+                printf("Texture::Load ERROR Unsupported BGR, %i bpp\n", bpp);
+                return -1;
+            }
+            bytes = 3;
+            glcMode = GL_BGR_EXT;
+            break;
+
+        case BGRA:
+            if (bpp != 32) {
+                printf("Texture::Load ERROR Unsupported BGRA, %i bpp\n", bpp);
+                return -1;
+            }
+            bytes = 4;
+            glcMode = GL_BGRA_EXT;
+            break;
     }
 
     glClearColor(0.0, 0.0, 0.0, 0.0);

src/utils/CMakeLists.txt

@@ -1,5 +1,6 @@
 # Source files
 set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp")
+set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "time.cpp")

src/utils/pixel.cpp

@@ -0,0 +1,25 @@
+/*!
+ * \file src/utils/pixel.cpp
+ * \brief Pixel buffer utilities
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "utils/pixel.h"
+
+void argb2rgba32(unsigned char *image, unsigned int w, unsigned int h) {
+    assert(image != nullptr);
+    assert(w > 0);
+    assert(h > 0);
+
+    for (unsigned int i = 0; i < (w * h); ++i) {
+        /* 32-bit ARGB to RGBA */
+        unsigned char swap = image[(i * 4) + 3];
+        image[(i * 4)] = image[(i * 4) + 1];
+        image[(i * 4) + 1] = image[(i * 4) + 2];
+        image[(i * 4) + 2] = image[(i * 4) + 3];
+        image[(i * 4) + 3] = swap;
+    }
+}
+

src/utils/strings.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file include/utils/strings.h
+ * \file src/utils/strings.cpp
  * \brief String handling utilities
  *
  * \author xythobuz

src/utils/time.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file include/utils/time.h
+ * \file src/utils/time.cpp
  * \brief Time handling utilities
  *
  * \author xythobuz