Changeset 246 for libcaca/trunk/srcTweet

Timestamp:

Dec 11, 2003, 5:31:49 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c: + Internally cache screen width and height.
• src/bitmap.c: + Added alpha support to caca_draw_bitmap(). For now, we only treat 0%

alpha as fully transparent, and any other value as fully opaque.

+ Slightly tuned colour weights in the renderer.
+ caca_set_bitmap_palette() takes unsigned ints.

• examples/demo.c: + Added a crap render demo.
• examples/aafire.c: + Set a 20ms delay. + Added alpha values to the palette.
• examples/view.c: + Draw a gray checkered grid below the image so that transparent images

look a lot nicer.

+ 'f' toggles "fullscreen" mode.

Location:

libcaca/trunk/src

Files:

• bitmap.c (modified) (18 diffs)
• box.c (modified) (2 diffs)
• caca.c (modified) (4 diffs)
• caca.h (modified) (2 diffs)
• caca_internals.h (modified) (1 diff)
• conic.c (modified) (1 diff)
• graphics.c (modified) (12 diffs)
• line.c (modified) (3 diffs)
• sprite.c (modified) (6 diffs)
• triangle.c (modified) (1 diff)

libcaca/trunk/src/bitmap.c

@@ -51 +51 @@
 static void mask2shift(unsigned int, int *, int *);
 
-static void get_rgb_default(struct caca_bitmap *, uint8_t *, int, int,
-                            unsigned int *, unsigned int *, unsigned int *);
+static void get_rgba_default(const struct caca_bitmap *, uint8_t *, int, int,
+                             unsigned int *, unsigned int *, unsigned int *,
+                             unsigned int *);
 static void rgb2hsv_default(int, int, int, int *, int *, int *);
 
@@ -128 +129 @@
     int bpp, palette;
     int w, h, pitch;
-    int rmask, gmask, bmask;
-    int rright, gright, bright;
-    int rleft, gleft, bleft;
+    int rmask, gmask, bmask, amask;
+    int rright, gright, bright, aright;
+    int rleft, gleft, bleft, aleft;
     void (*get_hsv)(struct caca_bitmap *, char *, int, int);
-    int red[256], green[256], blue[256];
+    int red[256], green[256], blue[256], alpha[256];
 };
 
@@ -161 +162 @@
 
 struct caca_bitmap *caca_create_bitmap(int bpp, int w, int h, int pitch,
-                                       int rmask, int gmask, int bmask)
+                                       int rmask, int gmask, int bmask,
+                                       int amask)
 {
     struct caca_bitmap *bitmap;
@@ -183 +185 @@
     bitmap->gmask = gmask;
     bitmap->bmask = bmask;
+    bitmap->amask = amask;
 
     /* Load bitmasks */
-    if(rmask || gmask || bmask)
+    if(rmask || gmask || bmask || amask)
     {
         mask2shift(rmask, &bitmap->rright, &bitmap->rleft);
         mask2shift(gmask, &bitmap->gright, &bitmap->gleft);
         mask2shift(bmask, &bitmap->bright, &bitmap->bleft);
+        mask2shift(amask, &bitmap->aright, &bitmap->aleft);
     }
 
@@ -199 +203 @@
         for(i = 0; i < 256; i++)
         {
-            bitmap->red[i] = i * 0x10;
-            bitmap->green[i] = i * 0x10;
-            bitmap->blue[i] = i * 0x10;
+            bitmap->red[i] = i * 0xfff / 256;
+            bitmap->green[i] = i * 0xfff / 256;
+            bitmap->blue[i] = i * 0xfff / 256;
+            bitmap->alpha[i] = 0xfff;
         }
     }
@@ -209 +214 @@
 
 void caca_set_bitmap_palette(struct caca_bitmap *bitmap,
-                             int red[], int green[], int blue[])
+                             unsigned int red[], unsigned int green[],
+                             unsigned int blue[], unsigned int alpha[])
 {
     int i;
@@ -220 +226 @@
         if(red[i] >= 0 && red[i] < 0x1000 &&
            green[i] >= 0 && green[i] < 0x1000 &&
-           blue[i] >= 0 && blue[i] < 0x1000)
+           blue[i] >= 0 && blue[i] < 0x1000 &&
+           alpha[i] >= 0 && alpha[i] < 0x1000)
         {
             bitmap->red[i] = red[i];
             bitmap->green[i] = green[i];
             bitmap->blue[i] = blue[i];
+            bitmap->alpha[i] = alpha[i];
         }
     }
@@ -237 +245 @@
 }
 
-static void get_rgb_default(struct caca_bitmap *bitmap, uint8_t *pixels,
-                            int x, int y, unsigned int *r,
-                            unsigned int *g, unsigned int *b)
+static void get_rgba_default(const struct caca_bitmap *bitmap, uint8_t *pixels,
+                             int x, int y, unsigned int *r, unsigned int *g,
+                             unsigned int *b, unsigned int *a)
 {
     uint32_t bits;
@@ -255 +263 @@
             if(__BYTE_ORDER == __BIG_ENDIAN)
 #else
-            static const uint32_t rmask = 0x12345678;
-            if(*(uint8_t *)&rmask == 0x12)
+            /* This is compile-time optimised with at least -O1 or -Os */
+            const uint32_t rmask = 0x12345678;
+            if(*(const uint8_t *)&rmask == 0x12)
 #endif
                 bits = ((uint32_t)pixels[0] << 16) |
@@ -281 +290 @@
         *g = bitmap->green[bits];
         *b = bitmap->blue[bits];
+        *a = bitmap->alpha[bits];
     }
     else
@@ -287 +297 @@
         *g = ((bits & bitmap->gmask) >> bitmap->gright) << bitmap->gleft;
         *b = ((bits & bitmap->bmask) >> bitmap->bright) << bitmap->bleft;
+        *a = ((bits & bitmap->amask) >> bitmap->aright) << bitmap->aleft;
     }
 }
@@ -321 +332 @@
 
 void caca_draw_bitmap(int x1, int y1, int x2, int y2,
-                      struct caca_bitmap *bitmap, char *pixels)
+                      const struct caca_bitmap *bitmap, char *pixels)
 {
 #if !NEW_RENDERER
@@ -359 +370 @@
     static const char density_chars[] =
         "    "
-        "    "
-        ".`  "
-        ",`.'"
-        "i:-^"
-        "|=+;"
-        "ox/\\"
-        "<>x%"
-        "&$zw"
-        "WXKM"
-        "#8##"
-        "8@8#"
-        "@8@8"
+        ".   "
+        "..  "
+        "...."
+        "::::"
+        ";=;="
+        "tftf"
+        "%$%$"
+        "&KSZ"
+        "WXGM"
+        "@@@@"
+        "8888"
+        "####"
         "????";
 
@@ -392 +403 @@
     }
 
-    for(y = y1 > 0 ? y1 : 0; y <= y2 && y <= (int)caca_get_height(); y++)
+    for(y = y1 > 0 ? y1 : 0; y <= y2 && y <= (int)_caca_height; y++)
         for(x = x1 > 0 ? x1 : 0, _init_dither(y);
-            x <= x2 && x <= (int)caca_get_width();
+            x <= x2 && x <= (int)_caca_width;
             x++)
     {
         int ch;
-        unsigned int r, g, b, R, G, B;
+        unsigned int r, g, b, a, R, G, B;
         int hue, sat, val;
         int fromx = w * (x - x1) / (x2 - x1 + 1);
@@ -414 +425 @@
         /* First get RGB */
         R = 0, G = 0, B = 0;
-        get_rgb_default(bitmap, pixels, fromx, fromy, &r, &g, &b);
+        get_rgba_default(bitmap, pixels, fromx, fromy, &r, &g, &b, &a);
+        if(a == 0)
+            continue;
 #if 1
         R += r; G += g; B += b;
 #else
         R += r; G += g; B += b;
-        get_rgb_default(bitmap, pixels, fromx - 1, fromy, &r, &g, &b);
+        get_rgba_default(bitmap, pixels, fromx - 1, fromy, &r, &g, &b, &a);
         R += r; G += g; B += b;
-        get_rgb_default(bitmap, pixels, fromx, fromy - 1, &r, &g, &b);
+        get_rgba_default(bitmap, pixels, fromx, fromy - 1, &r, &g, &b, &a);
         R += r; G += g; B += b;
-        get_rgb_default(bitmap, pixels, fromx + 1, fromy, &r, &g, &b);
+        get_rgba_default(bitmap, pixels, fromx + 1, fromy, &r, &g, &b, &a);
         R += r; G += g; B += b;
-        get_rgb_default(bitmap, pixels, fromx, fromy + 1, &r, &g, &b);
+        get_rgba_default(bitmap, pixels, fromx, fromy + 1, &r, &g, &b, &a);
         R += r; G += g; B += b;
         R /= 5; G /= 5; B /= 5;
@@ -444 +457 @@
         distbg = XRATIO * val * val;
         distbg += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
+        distbg = distbg * 2 / 4;
         outbg = CACA_COLOR_BLACK;
 
@@ -510 +524 @@
              + HRATIO * (hue - hue2) * (hue - hue2);
         dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
-        dist = dist * 3 / 4;
+//        dist = dist * 3 / 4;
         if(dist <= distbg)
         {
@@ -529 +543 @@
              + HRATIO * (hue - hue2) * (hue - hue2);
         dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
-        dist = dist / 2;
+        //dist = dist * 3 / 4;
+        //dist = dist / 2;
         if(dist <= distbg)
         {

libcaca/trunk/src/box.c

@@ -59 +59 @@
     }
 
-    xmax = caca_get_width() - 1;
-    ymax = caca_get_height() - 1;
+    xmax = _caca_width - 1;
+    ymax = _caca_height - 1;
 
     if(x2 < 0 || y2 < 0 || x1 > xmax || y1 > ymax)
@@ -112 +112 @@
     }
 
-    xmax = caca_get_width() - 1;
-    ymax = caca_get_height() - 1;
+    xmax = _caca_width - 1;
+    ymax = _caca_height - 1;
 
     if(x2 < 0 || y2 < 0 || x1 > xmax || y1 > ymax)

libcaca/trunk/src/caca.c

@@ -39 +39 @@
 #   include <dos.h>
 #   include <conio.h>
-#   if defined(SCREENUPDATE_IN_PC_H)
-#       include <pc.h>
-#   endif
 #else
 #   error "no graphics library detected"
@@ -63 +60 @@
 
 #if defined(USE_CONIO)
-static struct text_info ti;
 char *_caca_screen;
 #endif
@@ -133 +129 @@
 unsigned int caca_get_width(void)
 {
-#if defined(USE_SLANG)
-    return SLtt_Screen_Cols;
-#elif defined(USE_NCURSES)
-    return COLS;
-#elif defined(USE_CONIO)
-    return ti.screenwidth;
-#endif
+    return _caca_width;
 }
 
 unsigned int caca_get_height(void)
 {
-#if defined(USE_SLANG)
-    return SLtt_Screen_Rows;
-#elif defined(USE_NCURSES)
-    return LINES;
-#else
-    return ti.screenheight;
-#endif
+    return _caca_height;
 }
 
@@ -213 +197 @@
     textcolor((enum COLORS)WHITE);
     textbackground((enum COLORS)BLACK);
-    gotoxy(caca_get_width(), caca_get_height());
+    gotoxy(_caca_width, _caca_height);
     cputs("\r\n");
     _setcursortype(_NORMALCURSOR);

libcaca/trunk/src/caca.h

@@ -201 +201 @@
 struct caca_sprite;
 struct caca_sprite * caca_load_sprite(const char *);
-int caca_get_sprite_frames(struct caca_sprite *);
-int caca_get_sprite_width(struct caca_sprite *, int);
-int caca_get_sprite_height(struct caca_sprite *, int);
-int caca_get_sprite_dx(struct caca_sprite *, int);
-int caca_get_sprite_dy(struct caca_sprite *, int);
-void caca_draw_sprite(int, int, struct caca_sprite *, int);
+int caca_get_sprite_frames(const struct caca_sprite *);
+int caca_get_sprite_width(const struct caca_sprite *, int);
+int caca_get_sprite_height(const struct caca_sprite *, int);
+int caca_get_sprite_dx(const struct caca_sprite *, int);
+int caca_get_sprite_dy(const struct caca_sprite *, int);
+void caca_draw_sprite(int, int, const struct caca_sprite *, int);
 void caca_free_sprite(struct caca_sprite *);
 
@@ -213 +213 @@
  */
 struct caca_bitmap;
-struct caca_bitmap *caca_create_bitmap(int, int, int, int, int, int, int);
-void caca_set_bitmap_palette(struct caca_bitmap *, int[], int[], int[]);
-void caca_draw_bitmap(int, int, int, int, struct caca_bitmap *, char *);
+struct caca_bitmap *caca_create_bitmap(int, int, int, int, int, int, int, int);
+void caca_set_bitmap_palette(struct caca_bitmap *, unsigned int[],
+                             unsigned int[], unsigned int[], unsigned int[]);
+void caca_draw_bitmap(int, int, int, int, const struct caca_bitmap *, char *);
 void caca_free_bitmap(struct caca_bitmap *);
 

libcaca/trunk/src/caca_internals.h

@@ -38 +38 @@
 
 #if defined(USE_CONIO)
+extern struct text_info _ti;
 extern char *_caca_screen;
 #endif
+
+extern unsigned int _caca_width;
+extern unsigned int _caca_height;
 
 extern char *_caca_empty_line;

libcaca/trunk/src/conic.c

@@ -192 +192 @@
     uint8_t b = 0;
 
-    if(xo + x >= 0 && xo + x < (int)caca_get_width())
+    if(xo + x >= 0 && xo + x < (int)_caca_width)
         b |= 0x1;
-    if(xo - x >= 0 && xo - x < (int)caca_get_width())
+    if(xo - x >= 0 && xo - x < (int)_caca_width)
         b |= 0x2;
-    if(yo + y >= 0 && yo + y < (int)caca_get_height())
+    if(yo + y >= 0 && yo + y < (int)_caca_height)
         b |= 0x4;
-    if(yo - y >= 0 && yo - y < (int)caca_get_height())
+    if(yo - y >= 0 && yo - y < (int)_caca_height)
         b |= 0x8;
 

libcaca/trunk/src/graphics.c

@@ -36 +36 @@
 #elif defined(USE_CONIO)
 #   include <conio.h>
+#   if defined(SCREENUPDATE_IN_PC_H)
+#       include <pc.h>
+#   endif
 #else
 #   error "no graphics library detected"
@@ -55 +58 @@
 #include "caca_internals.h"
 
+#ifdef USE_CONIO
+static struct text_info ti;
+#endif
+
+unsigned int _caca_width;
+unsigned int _caca_height;
+
 static unsigned int _caca_delay;
 static unsigned int _caca_rendertime;
@@ -93 +103 @@
     char *data;
 #endif
-    if(x < 0 || x >= (int)caca_get_width() ||
-       y < 0 || y >= (int)caca_get_height())
+    if(x < 0 || x >= (int)_caca_width ||
+       y < 0 || y >= (int)_caca_height)
         return;
 
@@ -104 +114 @@
     addch(c);
 #elif defined(USE_CONIO)
-    data = _caca_screen + 2 * (x + y * caca_get_width());
+    data = _caca_screen + 2 * (x + y * _caca_width);
     data[0] = c;
     data[1] = (_caca_bgcolor << 4) | _caca_fgcolor;
@@ -116 +126 @@
     unsigned int len;
 
-    if(y < 0 || y >= (int)caca_get_height() || x >= (int)caca_get_width())
+    if(y < 0 || y >= (int)_caca_height || x >= (int)_caca_width)
         return;
 
@@ -130 +140 @@
     }
 
-    if(x + len >= caca_get_width())
-    {
-        memcpy(_caca_scratch_line, s, caca_get_width() - x);
-        _caca_scratch_line[caca_get_width() - x] = '\0';
+    if(x + len >= _caca_width)
+    {
+        memcpy(_caca_scratch_line, s, _caca_width - x);
+        _caca_scratch_line[_caca_width - x] = '\0';
         s = _caca_scratch_line;
     }
@@ -144 +154 @@
     addstr(s);
 #elif defined(USE_CONIO)
-    char *buf = _caca_screen + 2 * (x + y * caca_get_width());
+    char *buf = _caca_screen + 2 * (x + y * _caca_width);
     while(*s)
     {
@@ -161 +171 @@
     va_list args;
 
-    if(y < 0 || y >= (int)caca_get_height() || x >= (int)caca_get_width())
+    if(y < 0 || y >= (int)_caca_height || x >= (int)_caca_width)
         return;
 
-    if(caca_get_width() - x + 1 > BUFSIZ)
-        buf = malloc(caca_get_width() - x + 1);
+    if(_caca_width - x + 1 > BUFSIZ)
+        buf = malloc(_caca_width - x + 1);
 
     va_start(args, format);
 #if defined(HAVE_VSNPRINTF)
-    vsnprintf(buf, caca_get_width() - x + 1, format, args);
+    vsnprintf(buf, _caca_width - x + 1, format, args);
 #else
     vsprintf(buf, format, args);
 #endif
-    buf[caca_get_width() - x] = '\0';
+    buf[_caca_width - x] = '\0';
     va_end(args);
 
@@ -186 +196 @@
     enum caca_color oldfg = caca_get_fg_color();
     enum caca_color oldbg = caca_get_bg_color();
-    int y = caca_get_height();
+    int y = _caca_height;
 
     caca_set_color(CACA_COLOR_LIGHTGRAY, CACA_COLOR_BLACK);
@@ -235 +245 @@
     SLtt_Has_Alt_Charset = 0;
 
+    _caca_width = SLtt_Screen_Cols;
+    _caca_height = SLtt_Screen_Rows;
+
 #elif defined(USE_NCURSES)
     static int curses_colors[] =
@@ -293 +306 @@
         }
 
+    _caca_width = COLS;
+    _caca_height = LINES;
+
 #elif defined(USE_CONIO)
     gettextinfo(&ti);
@@ -303 +319 @@
     /* FIXME */
 #   endif
-
-#endif
-    _caca_empty_line = malloc(caca_get_width() + 1);
-    memset(_caca_empty_line, ' ', caca_get_width());
-    _caca_empty_line[caca_get_width()] = '\0';
-
-    _caca_scratch_line = malloc(caca_get_width() + 1);
+    _caca_width = ti.screenwidth;
+    _caca_height = ti.screenheight;
+
+#endif
+    _caca_empty_line = malloc(_caca_width + 1);
+    memset(_caca_empty_line, ' ', _caca_width);
+    _caca_empty_line[_caca_width] = '\0';
+
+    _caca_scratch_line = malloc(_caca_width + 1);
 
     _caca_delay = 0;

libcaca/trunk/src/line.c

@@ -172 +172 @@
     else if(bits1 & (1<<1))
     {
-        int xmax = caca_get_width() - 1;
+        int xmax = _caca_width - 1;
         s->y1 = s->y2 - (s->x2 - xmax) * (s->y2 - s->y1) / (s->x2 - s->x1);
         s->x1 = xmax;
@@ -183 +183 @@
     else if(bits1 & (1<<3))
     {
-        int ymax = caca_get_height() - 1;
+        int ymax = _caca_height - 1;
         s->x1 = s->x2 - (s->y2 - ymax) * (s->x2 - s->x1) / (s->y2 - s->y1);
         s->y1 = ymax;
@@ -204 +204 @@
     if(x < 0)
         b |= (1<<0);
-    else if(x >= (int)caca_get_width())
+    else if(x >= (int)_caca_width)
         b |= (1<<1);
 
     if(y < 0)
         b |= (1<<2);
-    else if(y >= (int)caca_get_height())
+    else if(y >= (int)_caca_height)
         b |= (1<<3);
 

libcaca/trunk/src/sprite.c

@@ -166 +166 @@
 }
 
-int caca_get_sprite_frames(struct caca_sprite *sprite)
+int caca_get_sprite_frames(const struct caca_sprite *sprite)
 {
     if(sprite == NULL)
@@ -174 +174 @@
 }
 
-int caca_get_sprite_width(struct caca_sprite *sprite, int f)
+int caca_get_sprite_width(const struct caca_sprite *sprite, int f)
 {
     if(sprite == NULL)
@@ -185 +185 @@
 }
 
-int caca_get_sprite_height(struct caca_sprite *sprite, int f)
+int caca_get_sprite_height(const struct caca_sprite *sprite, int f)
 {
     if(sprite == NULL)
@@ -196 +196 @@
 }
 
-int caca_get_sprite_dx(struct caca_sprite *sprite, int f)
+int caca_get_sprite_dx(const struct caca_sprite *sprite, int f)
 {
     if(sprite == NULL)
@@ -207 +207 @@
 }
 
-int caca_get_sprite_dy(struct caca_sprite *sprite, int f)
+int caca_get_sprite_dy(const struct caca_sprite *sprite, int f)
 {
     if(sprite == NULL)
@@ -218 +218 @@
 }
 
-void caca_draw_sprite(int x, int y, struct caca_sprite *sprite, int f)
+void caca_draw_sprite(int x, int y, const struct caca_sprite *sprite, int f)
 {
     int i, j;

libcaca/trunk/src/triangle.c

@@ -71 +71 @@
     x3 *= 4;
 
-    xmax = caca_get_width() - 1;
-    ymax = caca_get_height() - 1;
+    xmax = _caca_width - 1;
+    ymax = _caca_height - 1;
 
     /* Rasterize our triangle */