Changeset 780 for libcaca/trunk/caca/driver_gl.cTweet

Timestamp:

Apr 16, 2006, 11:52:05 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Added truecolor support to the X11 and GL drivers.

File:

• libcaca/trunk/caca/driver_gl.c (modified) (3 diffs)

libcaca/trunk/caca/driver_gl.c

@@ -42 +42 @@
  */
 
-/* Ok, I just suck. */
-static GLbyte const gl_bgpal[][4] =
-{
-    { 0x00, 0x00, 0x00, 0x7f },
-    { 0x00, 0x00, 0x3f, 0x7f },
-    { 0x00, 0x3f, 0x00, 0x7f },
-    { 0x00, 0x3f, 0x3f, 0x7f },
-    { 0x3f, 0x00, 0x00, 0x7f },
-    { 0x3f, 0x00, 0x3f, 0x7f },
-    { 0x3f, 0x3f, 0x00, 0x7f },
-    { 0x3f, 0x3f, 0x3f, 0x7f },
-    // + intensity
-    // >.
-    // ()
-    // ^^
-    { 0x1f, 0x1f, 0x1f, 0x7f },
-    { 0x1f, 0x1f, 0x7f, 0x7f },
-    { 0x1f, 0x7f, 0x1f, 0x7f },
-    { 0x1f, 0x7f, 0x7f, 0x7f },
-    { 0x7f, 0x1f, 0x1f, 0x7f },
-    { 0x7f, 0x1f, 0x7f, 0x7f },
-    { 0x7f, 0x7f, 0x1f, 0x7f },
-    { 0x7f, 0x7f, 0x7f, 0x7f }
-};
-
 static caca_t *gl_kk; /* FIXME: we ought to get rid of this */
 
@@ -248 +223 @@
         for(x = 0; x < kk->drv.p->width; x += kk->drv.p->font_width)
         {
+            uint16_t bg = _cucul_argb32_to_rgb12bg(*attr++);
             glDisable(GL_TEXTURE_2D);
-            glColor4bv(gl_bgpal[_cucul_argb32_to_ansi4bg(*attr++)]);
+            glColor3b(((bg & 0xf00) >> 8) * 8,
+                      ((bg & 0x0f0) >> 4) * 8,
+                      (bg & 0x00f) * 8);
             glBegin(GL_QUADS);
                 glVertex2f(x, y);
@@ -279 +257 @@
             if(c > 0x00000020 && c < 0x00000080)
             {
+                uint16_t fg = _cucul_argb32_to_rgb12fg(*attr);
                 glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[c - 32]);
-                glColor4bv(gl_bgpal[_cucul_argb32_to_ansi4fg(*attr)]);
+                glColor3b(((fg & 0xf00) >> 8) * 8,
+                          ((fg & 0x0f0) >> 4) * 8,
+                          (fg & 0x00f) * 8);
                 glBegin(GL_QUADS);
                     glTexCoord2f(0, kk->drv.p->sh);