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

Timestamp:

Apr 6, 2006, 3:41:56 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Store colour information on 32 bits, for future 12-bit colour support.

File:

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

libcaca/trunk/caca/driver_gl.c

@@ -246 +246 @@
     for(y = 0; y < kk->drv.p->height; y += kk->drv.p->font_height)
     {
-        uint8_t *attr = kk->qq->attr + line * kk->qq->width;
+        uint32_t *attr = kk->qq->attr + line * kk->qq->width;
 
         for(x = 0; x < kk->drv.p->width; x += kk->drv.p->font_width)
         {
             glDisable(GL_TEXTURE_2D);
-            glColor4bv(gl_bgpal[attr[0] >> 4]);
+            glColor4bv(gl_bgpal[_cucul_rgba32_to_ansi4bg(*attr++)]);
             glBegin(GL_QUADS);
                 glVertex2f(x, y);
@@ -259 +259 @@
                 glVertex2f(x, y + kk->drv.p->font_height);
             glEnd();
-
-            attr++;
         }
 
@@ -274 +272 @@
     for(y = 0; y < kk->drv.p->height; y += kk->drv.p->font_height)
     {
-        uint8_t *attr = kk->qq->attr + line * kk->qq->width;
+        uint32_t *attr = kk->qq->attr + line * kk->qq->width;
         uint32_t *chars = kk->qq->chars + line * kk->qq->width;
 
@@ -284 +282 @@
             {
                 glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[c - 32]);
-                glColor4bv(gl_bgpal[attr[0] & 0xf]);
+                glColor4bv(gl_bgpal[_cucul_rgba32_to_ansi4fg(*attr)]);
                 glBegin(GL_QUADS);
                     glTexCoord2f(0, kk->drv.p->sh);