Changeset 528Tweet

Timestamp:

Mar 6, 2006, 11:21:48 AM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Reverted to integer colors in GL driver, fixed a bunch of warnings in slang.

File:

• libcaca/trunk/src/graphics.c (modified) (5 diffs)

libcaca/trunk/src/graphics.c

@@ -186 +186 @@
 
 #if defined(USE_GL)
-static float const gl_bgpal[][3] =
-{
-    { 0.0f, 0.0f, 0.0f },
-    { 0.0f, 0.0f, 0.5f },
-    { 0.0f, 0.5f, 0.0f },
-    { 0.0f, 0.5f, 0.5f },
-    { 0.5f, 0.0f, 0.0f },
-    { 0.5f, 0.0f, 0.5f },
-    { 0.5f, 0.5f, 0.0f },
-    { 0.5f, 0.5f, 0.5f },
+static unsigned int const gl_bgpal[] =
+  {
+    0,
+    0x0000007F,
+    0x00007F00,
+    0x00007F7F,
+    0x007F0000,
+    0x007F007F,
+    0x007F7F00,
+    0x007F7F7F,
     // + intensity
-    { 0.0f, 0.0f, 0.0f },
-    { 0.0f, 0.0f, 1.0f },
-    { 0.0f, 1.0f, 0.0f },
-    { 0.0f, 1.0f, 1.0f },
-    { 1.0f, 0.0f, 0.0f },
-    { 1.0f, 0.0f, 1.0f },
-    { 1.0f, 1.0f, 0.0f },
-    { 1.0f, 1.0f, 1.0f },
-};
+    0x00000000,
+    0x000000FF,
+    0x0000FF00,
+    0x0000FFFF,
+    0x00FF0000,
+    0x00FF00FF,
+    0x00FFFF00,
+    0x00FFFFFF,
+  };
 
 static caca_t *gl_kk; /* FIXME: we ought to get rid of this */
@@ -918 +918 @@
         uint8_t *attr = kk->qq->attr;
         uint8_t *chars = kk->qq->chars;
-        for(y = 0; y < kk->qq->height; y++)
+        for(y = 0; y < (int)kk->qq->height; y++)
         {
             SLsmg_gotorc(y, 0);
@@ -963 +963 @@
         uint8_t *attr = kk->qq->attr;
         uint8_t *chars = kk->qq->chars;
-        for(y = 0; y < kk->qq->height; y++)
+        for(y = 0; y < (int)kk->qq->height; y++)
         {
             move(y, 0);
@@ -1095 +1095 @@
                 uint8_t *attr = kk->qq->attr + offsetx + offsety * kk->qq->width;
                 int offset;
-                float br, bg, bb;
+
                 offset = attr[0] >> 4;
 
-                br = gl_bgpal[offset][0];
-                bg = gl_bgpal[offset][1];
-                bb = gl_bgpal[offset][2];
-
                 glDisable(GL_TEXTURE_2D);
-                glColor3f(br, bg, bb);
+                glColor3uiv(&gl_bgpal[offset]);
                 glBegin(GL_QUADS);
                     glVertex2f(x, y);
@@ -1130 +1126 @@
                 uint8_t *attr = kk->qq->attr + offsetx + offsety * kk->qq->width;
                 unsigned char *chr = kk->qq->chars + offsetx + offsety * kk->qq->width;
-                float fr, fg, fb;
-
-                fr = gl_bgpal[attr[0] & 0xf][0];
-                fg = gl_bgpal[attr[0] & 0xf][1];
-                fb = gl_bgpal[attr[0] & 0xf][2];
 
                 if(chr[0] != ' ')
                 {
                     glBindTexture(GL_TEXTURE_2D, kk->gl.id[chr[0]-32]);
-
-                    glColor3f(fr, fg, fb);
+                    glColor3uiv(&gl_bgpal[attr[0] & 0xf]);
                     glBegin(GL_QUADS);
                         glTexCoord2f(0, kk->gl.sh);