Changeset 530Tweet

Timestamp:

Mar 6, 2006, 1:13:12 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Mais je fais comme je veux bordel de cul !

File:

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

libcaca/trunk/src/graphics.c

@@ -186 +186 @@
 
 #if defined(USE_GL)
-static GLbyte const gl_bgpal[][3] =
-{
-    { 0x00, 0x00, 0x00 },
-    { 0x00, 0x00, 0x3f },
-    { 0x00, 0x3f, 0x00 },
-    { 0x00, 0x3f, 0x3f },
-    { 0x3f, 0x00, 0x00 },
-    { 0x3f, 0x00, 0x3f },
-    { 0x3f, 0x3f, 0x00 },
-    { 0x3f, 0x3f, 0x3f },
+static unsigned int const gl_bgpal[] =
+  {
+    0,
+    0x0000007F,
+    0x00007F00,
+    0x00007F7F,
+    0x007F0000,
+    0x007F007F,
+    0x007F7F00,
+    0x007F7F7F,
     // + intensity
-    { 0x00, 0x00, 0x00 },
-    { 0x00, 0x00, 0x7f },
-    { 0x00, 0x7f, 0x00 },
-    { 0x00, 0x7f, 0x7f },
-    { 0x7f, 0x00, 0x00 },
-    { 0x7f, 0x00, 0x7f },
-    { 0x7f, 0x7f, 0x00 },
-    { 0x7f, 0x7f, 0x7f }
-};
+    0x00000000,
+    0x000000FF,
+    0x0000FF00,
+    0x0000FFFF,
+    0x00FF0000,
+    0x00FF00FF,
+    0x00FFFF00,
+    0x00FFFFFF,
+  };
 
 static caca_t *gl_kk; /* FIXME: we ought to get rid of this */
@@ -1099 +1099 @@
 
                 glDisable(GL_TEXTURE_2D);
-                glColor3bv(gl_bgpal[offset]);
+                glColor4bv(gl_bgpal[offset]);
                 glBegin(GL_QUADS);
                     glVertex2f(x, y);
@@ -1130 +1130 @@
                 {
                     glBindTexture(GL_TEXTURE_2D, kk->gl.id[chr[0]-32]);
-                    glColor3bv(gl_bgpal[attr[0] & 0xf]);
+                    glColor4bv(gl_bgpal[attr[0] & 0xf]);
                     glBegin(GL_QUADS);
                         glTexCoord2f(0, kk->gl.sh);