unsigned char instead of float for colors

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140623 ]
+    * Use unsigned char instead of float for colors
+
     [ 20140622 ]
     * Wrote simple image reader/writer utilizing libpng
     * Created utils/pixels for pixel handling utilities

TODO.md

@@ -10,6 +10,7 @@
     * Rewrite Console and use operator << to write to the console?
 * SDL_TTF 2.0.12+ [can do line breaks](http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688), use it
 * 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 combining Mesh and StaticMesh...
+* Don’t use float everywhere just because (eg. float colors)
 
 ## Changes
 

include/Camera.h

@@ -5,6 +5,7 @@
  * \author Mongoose
  * \author xythobuz
  */
+
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
 

include/Font.h

@@ -15,7 +15,7 @@ typedef struct {
     int w;
     int h;
     float scale;
-    float color[4];
+    unsigned char color[4];
 } FontString;
 
 /*!
@@ -35,7 +35,7 @@ public:
 
     virtual void writeString(FontString &s) = 0;
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...)
+    virtual void drawText(unsigned int x, unsigned int y, float scale, const unsigned char color[4], const char *s, ...)
         __attribute__((format(printf, 6, 0)));
 
 protected:

include/RoomData.h

@@ -19,7 +19,7 @@ public:
     BoundingBox();
     void getBoundingBox(vec3_t box[2]);
     void setBoundingBox(vec3_t min, vec3_t max);
-    void display(bool points, const vec4_t c1, const vec4_t c2);
+    void display(bool points, const unsigned char c1[4], const unsigned char c2[4]);
     bool inBox(vec_t x, vec_t y, vec_t z);
     bool inBoxPlane(vec_t x, vec_t z);
 

include/TextureManager.h

@@ -152,8 +152,6 @@ private:
     unsigned int mTextureCount; //!< Texture counter
     unsigned int mTextureLimit; //!< The texture limit
     unsigned int mFlags;        //!< Class options
-    int mTextureId;             //!< Currently bound texture id
-    int mTextureId2;            //!< Multitexture Texture Id
 };
 
 #endif

include/global.h

@@ -48,17 +48,17 @@
 #include <cassert>
 #endif
 
-// Colors used for Rendering
-const float BLACK[]       = {  0.0f,  0.0f,  0.0f, 1.0f };
-const float DIM_WHITE[]   = {  0.5f,  0.5f,  0.5f, 1.0f };
-const float WHITE[]       = {  1.0f,  1.0f,  1.0f, 1.0f };
-const float RED[]         = {  1.0f,  0.0f,  0.0f, 1.0f };
-const float GREEN[]       = {  0.0f,  1.0f,  0.0f, 1.0f };
-const float NEXT_PURPLE[] = {  0.3f,  0.3f,  0.5f, 1.0f };
-const float OR_BLUE[]     = {  0.5f,  0.7f,  1.0f, 1.0f };
-const float PINK[]        = {  1.0f,  0.0f,  1.0f, 1.0f };
-const float YELLOW[]      = {  1.0f,  1.0f,  0.0f, 1.0f };
-const float CYAN[]        = {  0.0f,  1.0f,  1.0f, 1.0f };
+// Colors used where ever needed
+const unsigned char BLACK[]  = {   0,   0,   0, 255 };
+const unsigned char GREY[]   = { 128, 128, 128, 255 };
+const unsigned char WHITE[]  = { 255, 255, 255, 255 };
+const unsigned char RED[]    = { 255,   0,   0, 255 };
+const unsigned char GREEN[]  = {   0, 255,   0, 255 };
+const unsigned char PURPLE[] = {  77,  77, 128, 255 };
+const unsigned char BLUE[]   = { 128, 179, 255, 255 };
+const unsigned char PINK[]   = { 255,   0, 255, 255 };
+const unsigned char YELLOW[] = { 255, 255,   0, 255 };
+const unsigned char CYAN[]   = {   0, 255, 255, 255 };
 
 // Actions that can be bound to a key and sent to the game engine
 typedef enum {

src/Console.cpp

@@ -101,7 +101,7 @@ void Console::display() {
             scrollIndicator = 100;
         }
 
-        getFont().drawText(10, 10, 0.70f, OR_BLUE,
+        getFont().drawText(10, 10, 0.70f, BLUE,
                 "%s uptime %lus scroll %d%%", VERSION, systemTimerGet() / 1000, scrollIndicator);
 
         // Draw output log
@@ -116,14 +116,14 @@ void Console::display() {
         }
         for (int i = 0; i < end; i++) {
             getFont().drawText(10, ((i + drawOffset) * lineSteps) + firstLine,
-                    0.75f, OR_BLUE, "%s", mHistory[i + historyOffset - mLineOffset]);
+                    0.75f, BLUE, "%s", mHistory[i + historyOffset - mLineOffset]);
         }
 
         // Draw current input
         if ((mInputBufferPointer > 0) && (mInputBuffer[0] != '\0')) {
-            getFont().drawText(10, inputLine, 0.75f, OR_BLUE, "> %s", mInputBuffer);
+            getFont().drawText(10, inputLine, 0.75f, BLUE, "> %s", mInputBuffer);
         } else {
-            getFont().drawText(10, inputLine, 0.75f, OR_BLUE, ">");
+            getFont().drawText(10, inputLine, 0.75f, BLUE, ">");
         }
 
         //! \todo display the current mPartialInput. The UTF-8 segfaults SDL-TTF, somehow?

src/Font.cpp

@@ -22,7 +22,7 @@ void Font::setFont(const char *font) {
     mFontName = fullPath(font, 0);
 }
 
-void Font::drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...) {
+void Font::drawText(unsigned int x, unsigned int y, float scale, const unsigned char color[4], const char *s, ...) {
     FontString tempText;
     va_list args;
     va_start(args, s);

src/FontSDL.cpp

@@ -50,10 +50,10 @@ void FontSDL::writeString(FontString &s) {
     assert(s.text != NULL);
 
     SDL_Color color;
-    color.r = (unsigned char)(s.color[0] * 255.0f);
-    color.g = (unsigned char)(s.color[1] * 255.0f);
-    color.b = (unsigned char)(s.color[2] * 255.0f);
-    color.a = (unsigned char)(s.color[3] * 255.0f);
+    color.r = s.color[0];
+    color.g = s.color[1];
+    color.b = s.color[2];
+    color.a = s.color[3];
 
     SDL_Surface *surface = TTF_RenderUTF8_Blended(mFont, s.text, color);
     if (surface == NULL) {
@@ -87,7 +87,7 @@ void FontSDL::writeString(FontString &s) {
     GLuint xMax = xMin + s.w;
     GLuint yMax = yMin + s.h;
 
-    glColor4f(color.r / 256.0f, color.g / 256.0f, color.b / 256.0f, color.a / 256.0f);
+    glColor4ubv(s.color);
 
     glBegin(GL_QUADS);
     glTexCoord2f(0.0f, 0.0f);

src/FontTRLE.cpp

@@ -123,7 +123,7 @@ void FontTRLE::writeChar(unsigned int index, unsigned int xDraw, FontString &s)
 
     // draw
     glBindTexture(GL_TEXTURE_2D, mFontTexture);
-    glColor4f(s.color[0], s.color[1], s.color[2], s.color[3]);
+    glColor4f(s.color[0] * 256.0f, s.color[1] * 256.0f, s.color[2] * 256.0f, s.color[3] * 256.0f);
     glBegin(GL_QUADS);
     glTexCoord2f(txMin, tyMin);
     glVertex2i(xMin, yMin);

src/Menu.cpp

@@ -30,10 +30,10 @@ Menu::Menu() {
     mMin = 0;
 
     mainText.text = bufferString(VERSION);
-    mainText.color[0] = OR_BLUE[0];
-    mainText.color[1] = OR_BLUE[1];
-    mainText.color[2] = OR_BLUE[2];
-    mainText.color[3] = OR_BLUE[3];
+    mainText.color[0] = BLUE[0];
+    mainText.color[1] = BLUE[1];
+    mainText.color[2] = BLUE[2];
+    mainText.color[3] = BLUE[3];
     mainText.scale = 1.2f;
     mainText.y = 10;
     mainText.w = 0;
@@ -194,7 +194,7 @@ void Menu::displayMapList() {
         if ((i + min) == (int)mCursor)
             getFont().drawText(25, 100 + (25 * i), 0.75f, RED, "%s", map);
         else
-            getFont().drawText(25, 100 + (25 * i), 0.75f, OR_BLUE, "%s", map);
+            getFont().drawText(25, 100 + (25 * i), 0.75f, BLUE, "%s", map);
     }
 }
 
@@ -212,7 +212,7 @@ void Menu::display() {
         getFont().writeString(mainText);
 
         if (!mMapListFilled) {
-            getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, OR_BLUE, "Generating map list...");
+            getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, BLUE, "Generating map list...");
         } else {
             if (mMapList.size() == 0) {
                 getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, RED, "No maps found! See README.md");

src/OpenRaider.cpp

@@ -120,13 +120,13 @@ void OpenRaider::frame() {
 
     // Draw FPS counter
     if (mFPS)
-        getFont().drawText(10, getWindow().getHeight() - 20, 0.5f, OR_BLUE, "%dFPS", fps);
+        getFont().drawText(10, getWindow().getHeight() - 20, 0.5f, BLUE, "%dFPS", fps);
 
 #ifdef DEBUG
     // Draw debug infos
     if (getGame().isLoaded() && (!getMenu().isVisible())) {
         for (int i = 0; i < 3; i++) {
-            getFont().drawText(10, getWindow().getHeight() - ((4 - i) * 20), 0.5f, OR_BLUE, "%.2f (%.2f)",
+            getFont().drawText(10, getWindow().getHeight() - ((4 - i) * 20), 0.5f, BLUE, "%.2f (%.2f)",
                 getGame().getLara().getPos(i) / 256.0f, getGame().getLara().getAngle(i));
         }
     }

src/Render.cpp

@@ -81,7 +81,7 @@ void Render::loadTexture(unsigned char *image,
         unsigned int width, unsigned int height,
         unsigned int id)
 {
-    glColor3fv(WHITE);
+    glColor3ubv(WHITE);
     mTexture.loadBufferSlot(image, width, height, TextureManager::RGBA, 32, id);
 }
 
@@ -169,11 +169,22 @@ void setLighting(bool on)
 {
     if (on)
     {
+        float color[4];
+        color[0] = WHITE[0] * 256.0f;
+        color[1] = WHITE[1] * 256.0f;
+        color[2] = WHITE[2] * 256.0f;
+        color[3] = WHITE[3] * 256.0f;
+
         glEnable(GL_LIGHTING);
         glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 0);
-        glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, WHITE);
-        glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, WHITE);
-        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, DIM_WHITE);
+        glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, color);
+        glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, color);
+
+        color[0] = GREY[0] * 256.0f;
+        color[1] = GREY[1] * 256.0f;
+        color[2] = GREY[2] * 256.0f;
+        color[3] = GREY[3] * 256.0f;
+        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, color);
     }
     else
     {
@@ -249,7 +260,13 @@ void Render::setFlags(unsigned int flags)
         glFogf(GL_FOG_DENSITY, 0.00008f);
         glFogf(GL_FOG_START, 30000.0f);
         glFogf(GL_FOG_END, 50000.0f);
-        glFogfv(GL_FOG_COLOR, BLACK);
+
+        float color[4];
+        color[0] = BLACK[0] * 256.0f;
+        color[1] = BLACK[1] * 256.0f;
+        color[2] = BLACK[2] * 256.0f;
+        color[3] = BLACK[3] * 256.0f;
+        glFogfv(GL_FOG_COLOR, color);
     }
 
     if (flags & Render::fGL_Lights)
@@ -275,8 +292,8 @@ void Render::setMode(int n)
             break;
         case Render::modeSolid:
         case Render::modeWireframe:
-            glClearColor(NEXT_PURPLE[0], NEXT_PURPLE[1],
-                    NEXT_PURPLE[2], NEXT_PURPLE[3]);
+            glClearColor(PURPLE[0] * 256.0f, PURPLE[1] * 256.0f,
+                    PURPLE[2] * 256.0f, PURPLE[3] * 256.0f);
             glDisable(GL_TEXTURE_2D);
             break;
         default:
@@ -412,7 +429,7 @@ void Render::display()
     updateViewVolume();
 
     // Render world
-    glColor3fv(DIM_WHITE); // was WHITE
+    glColor3ubv(GREY); // was WHITE
     drawSkyMesh(96.0);
 
     // Figure out how much of the map to render
@@ -507,7 +524,7 @@ void Render::drawLoadScreen()
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
 
-    glColor3fv(WHITE);
+    glColor3ubv(WHITE);
 
     if (mFlags & Render::fGL_Lights)
         glDisable(GL_LIGHTING);
@@ -691,7 +708,7 @@ bool Render::isVisible(float x, float y, float z)
     if (mMode == Render::modeWireframe)
     {
         glPointSize(5.0);
-        glColor3fv(PINK);
+        glColor3ubv(PINK);
         glBegin(GL_POINTS);
         glVertex3f(x, y, z);
         glEnd();
@@ -707,7 +724,7 @@ bool Render::isVisible(float x, float y, float z, float radius)
     if (mMode == Render::modeWireframe)
     {
         glPointSize(5.0);
-        glColor3fv(PINK);
+        glColor3ubv(PINK);
         glBegin(GL_POINTS);
         glVertex3f(x, y, z);
         glEnd();

src/Room.cpp

@@ -461,7 +461,7 @@ void Room::display(bool alpha) {
 
     if ((!alpha) && getRender().getMode() == Render::modeWireframe) {
         glLineWidth(2.0);
-        glColor3fv(RED);
+        glColor3ubv(RED);
 
         for (unsigned int i = 0; i < sizePortals(); i++) {
             Portal &portal = getPortal(i);
@@ -486,7 +486,7 @@ void Room::display(bool alpha) {
     glTranslated(pos[0], pos[1], pos[2]);
 
     // Reset since GL_MODULATE used, reset to WHITE
-    glColor3fv(WHITE);
+    glColor3ubv(WHITE);
 
     switch (getRender().getMode())
     {

src/RoomData.cpp

@@ -43,14 +43,14 @@ bool BoundingBox::inBoxPlane(vec_t x, vec_t z) {
             && (z > a[2]) && (z < b[2]));
 }
 
-void BoundingBox::display(bool points, const vec4_t c1, const vec4_t c2) {
+void BoundingBox::display(bool points, const unsigned char c1[4], const unsigned char c2[4]) {
     // Bind before entering now
     //glBindTexture(GL_TEXTURE_2D, 1);
     glPointSize(4.0);
     //glLineWidth(1.25);
 
     //! \fixme Need to make custom color key for this
-    glColor3fv(c1);
+    glColor3ubv(c1);
 
     glBegin(GL_POINTS);
     glVertex3f(b[0], b[1], b[2]);
@@ -68,7 +68,7 @@ void BoundingBox::display(bool points, const vec4_t c1, const vec4_t c2) {
 
     glEnd();
 
-    glColor3fv(c2);
+    glColor3ubv(c2);
 
     glBegin(GL_LINES);
     // max, top quad

src/Sprite.cpp

@@ -129,14 +129,14 @@ void Sprite::display() {
             glEnd();
             break;
         case Render::modeWireframe:
-            glColor3fv(CYAN);
+            glColor3ubv(CYAN);
             glBegin(GL_LINE_LOOP);
             glVertex3fv(vertex[0]);
             glVertex3fv(vertex[1]);
             glVertex3fv(vertex[2]);
             glVertex3fv(vertex[3]);
             glEnd();
-            glColor3fv(WHITE);
+            glColor3ubv(WHITE);
             break;
         default:
             glBindTexture(GL_TEXTURE_2D, texture+1);

src/StaticMesh.cpp

@@ -247,10 +247,10 @@ void StaticMesh::display() {
         //   return;
 
         //! \fixme 'AMBIENT' -- Mongoose 2002.01.08
-        glColor3fv(WHITE);
+        glColor3ubv(WHITE);
 
         if (getRender().getMode() == Render::modeWireframe)
-            glColor3fv(WHITE);
+            glColor3ubv(WHITE);
 
         glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         glBindTexture(GL_TEXTURE_2D, 1);  // White texture for colors

src/TextureManager.cpp

@@ -21,8 +21,6 @@
 TextureManager::TextureManager() {
     mTextureIds = NULL;
     mFlags = 0;
-    mTextureId = -1;
-    mTextureId2 = -1;
     mTextureCount = 0;
     mTextureLimit = 0;
 }
@@ -33,21 +31,17 @@ TextureManager::~TextureManager() {
 
 unsigned char *TextureManager::generateColorTexture(unsigned char rgba[4],
         unsigned int width, unsigned int height) {
-    unsigned char *image;
-    unsigned int i, size;
-
     assert(rgba != NULL);
     assert(width > 0);
     assert(height > 0);
 
-    image = new unsigned char[height*width*4];
+    unsigned char *image = new unsigned char[height * width * 4];
 
-    for (i = 0, size = width*height; i < size; ++i) {
-        /* RBGA */
-        image[i*4]   = rgba[0];
-        image[i*4+1] = rgba[1];
-        image[i*4+2] = rgba[2];
-        image[i*4+3] = rgba[3];
+    for (unsigned int i = 0; i < (width * height); i++) {
+        image[i * 4] = rgba[0];
+        image[(i * 4) + 1] = rgba[1];
+        image[(i * 4) + 2] = rgba[2];
+        image[(i * 4) + 3] = rgba[3];
     }
 
     return image;
@@ -55,15 +49,12 @@ unsigned char *TextureManager::generateColorTexture(unsigned char rgba[4],
 
 int TextureManager::loadColorTexture(unsigned char rgba[4],
         unsigned int width, unsigned int height) {
-    unsigned char *image;
-    int id;
-
     assert(rgba != NULL);
     assert(width > 0);
     assert(height > 0);
 
-    image = generateColorTexture(rgba, width, height);
-    id = loadBuffer(image, width, height, RGBA, 32);
+    unsigned char *image = generateColorTexture(rgba, width, height);
+    int id = loadBuffer(image, width, height, RGBA, 32);
     delete [] image;
 
     return id;
@@ -89,9 +80,7 @@ void TextureManager::reset() {
 }
 
 void TextureManager::disableMultiTexture() {
-    mFlags ^= fUseMultiTexture;
-    mTextureId = -1;
-    mTextureId2 = -1;
+    mFlags &= ~fUseMultiTexture;
 
     glDisable(GL_TEXTURE_2D);
     glActiveTextureARB(GL_TEXTURE0_ARB);
@@ -106,23 +95,17 @@ void TextureManager::useMultiTexture(float aU, float aV, float bU, float bV) {
 }
 
 void TextureManager::useMultiTexture(float u, float v) {
-    if (!(mFlags & fUseMultiTexture))
-        return;
-
-    glMultiTexCoord2fARB(GL_TEXTURE0_ARB, u, v);
-    glMultiTexCoord2fARB(GL_TEXTURE1_ARB, u, v);
+    useMultiTexture(u, v, u, v);
 }
 
 void TextureManager::bindMultiTexture(int texture0, int texture1) {
     assert(mTextureIds != NULL);
     assert(texture0 >= 0);
-    assert((unsigned int)texture0 <= mTextureCount);
     assert(texture1 >= 0);
+    assert((unsigned int)texture0 <= mTextureCount);
     assert((unsigned int)texture1 <= mTextureCount);
 
     mFlags |= fUseMultiTexture;
-    mTextureId  = texture0;
-    mTextureId2 = texture1;
 
     glActiveTextureARB(GL_TEXTURE0_ARB);
     glEnable(GL_TEXTURE_2D);
@@ -134,12 +117,8 @@ void TextureManager::bindMultiTexture(int texture0, int texture1) {
 }
 
 void TextureManager::setMaxTextureCount(unsigned int n) {
-    assert(n > 0);
-
     mTextureLimit = n;
-
     mTextureIds = new unsigned int[n];
-
     glGenTextures(n, mTextureIds);
 }
 
@@ -274,8 +253,6 @@ void TextureManager::bindTextureId(unsigned int n) {
     assert(mTextureIds != NULL);
     assert(n <= mTextureCount);
 
-    mTextureId = n;
-
     glEnable(GL_TEXTURE_2D);
     //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
@@ -283,11 +260,15 @@ void TextureManager::bindTextureId(unsigned int n) {
 }
 
 int TextureManager::loadPCX(const char *filename) {
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
+
     unsigned char *image;
     unsigned int w, h, bpp;
     ColorMode c;
     int id = -1;
     int error = pcxLoad(filename, &image, &w, &h, &c, &bpp);
+
     if (error == 0) {
         unsigned char *image2 = scaleBuffer(image, &w, &h, bpp);
         if (image2) {
@@ -297,19 +278,20 @@ int TextureManager::loadPCX(const char *filename) {
         id = loadBuffer(image, w, h, c, bpp);
         delete [] image;
     }
+
     return id;
 }
 
 int TextureManager::loadTGA(const char *filename) {
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
+
     unsigned char *image = NULL;
     unsigned char *image2 = NULL;
     unsigned int w, h;
     char type;
     int id = -1;
 
-    assert(filename != NULL);
-    assert(filename[0] != '\0');
-
     if (!tgaCheck(filename)) {
         tgaLoad(filename, &image, &w, &h, &type);
 

src/utils/pcx.cpp

@@ -13,12 +13,8 @@
 #include "global.h"
 #include "utils/pcx.h"
 
-#ifdef DEBUG
 #include "Console.h"
 #define pcxPrint getConsole().print
-#else
-void pcxPrint(...) { }
-#endif
 
 int pcxCheck(const char *filename) {
     assert(filename != NULL);

src/utils/png.cpp

@@ -15,12 +15,8 @@
 #include "utils/pixel.h"
 #include "utils/png.h"
 
-#ifdef DEBUG
 #include "Console.h"
 #define pngPrint getConsole().print
-#else
-void pngPrint(...) { }
-#endif
 
 int pngCheck(const char *filename) {
     png_byte header[8];