Changeset 239 for libcaca/trunk/srcTweet

Timestamp:

Nov 30, 2003, 4:56:02 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/bitmap.c: + Fine-tuned the new renderer. + Fixed warnings. + Changed hardcoded values to macros.

File:

• libcaca/trunk/src/bitmap.c (modified) (16 diffs)

libcaca/trunk/src/bitmap.c

@@ -43 +43 @@
 #include "caca_internals.h"
 
+#define NEW_RENDERER 1
+
 static void mask2shift(unsigned int, int *, int *);
 
@@ -309 +311 @@
                       struct caca_bitmap *bitmap, char *pixels)
 {
-    /* FIXME: this code is shite! */
-    static int white_colors[] =
+#if !NEW_RENDERER
+    static const int white_colors[] =
     {
         CACA_COLOR_BLACK,
@@ -317 +319 @@
         CACA_COLOR_WHITE
     };
-
-    static int light_colors[] =
+#endif
+
+    static const int light_colors[] =
     {
         CACA_COLOR_LIGHTMAGENTA,
@@ -329 +332 @@
     };
 
-    static int dark_colors[] =
+    static const int dark_colors[] =
     {
         CACA_COLOR_MAGENTA,
@@ -342 +345 @@
     /* FIXME: choose better characters! */
 #   define DENSITY_CHARS 13
-    static char density_chars[] =
+    static const char density_chars[] =
         "    "
         "    "
@@ -389 +392 @@
         enum caca_color outfg, outbg;
         char outch;
-#define NEW_DITHERER 1
-#ifdef NEW_DITHERER
-        int distbg, distfg, dist;
+#if NEW_RENDERER
+        int distbg, distfg, dist, hue1, hue2;
 #endif
 
@@ -401 +403 @@
         R = 0, G = 0, B = 0;
         get_rgb_default(bitmap, pixels, fromx, fromy, &r, &g, &b);
-#if 0
+#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);
@@ -412 +416 @@
         R += r; G += g; B += b;
         R /= 5; G /= 5; B /= 5;
-#else
-        R += r; G += g; B += b;
 #endif
 
@@ -421 +423 @@
         /* The hard work: calculate foreground and background colours,
          * as well as the most appropriate character to output. */
-#if NEW_DITHERER
-#define XRATIO 5*5
-#define YRATIO 3*3
+#if NEW_RENDERER
+#       define XRATIO 5*5
+#       define YRATIO 3*3
+#       define HRATIO 2*2
+#       define FUZZINESS XRATIO * 0x800
+
         /* distance to black */
         distbg = XRATIO * val * val;
-        distbg += XRATIO * 0x1000 * _get_dither() - XRATIO * 0x8000;
+        distbg += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
         outbg = CACA_COLOR_BLACK;
 
@@ -432 +437 @@
         dist = XRATIO * (val - 0x600) * (val - 0x600)
              + YRATIO * sat * sat;
-        dist += XRATIO * 0x1000 * _get_dither() - XRATIO * 0x8000;
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
+        dist = dist * 3 / 2;
         if(dist <= distbg)
         {
@@ -449 +455 @@
         dist = XRATIO * (val - 0xa00) * (val - 0xa00)
              + YRATIO * sat * sat;
-        dist += XRATIO * 0x1000 * _get_dither() - XRATIO * 0x8000;
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
+        dist = dist * 3 / 2;
         if(dist <= distbg)
         {
@@ -466 +473 @@
         dist = XRATIO * (val - 0x1000) * (val - 0x1000)
              + YRATIO * sat * sat;
-        dist += XRATIO * 0x1000 * _get_dither() - XRATIO * 0x8000;
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
         if(dist <= distbg)
         {
@@ -480 +487 @@
         }
 
-        /* check dist to dark */
+        hue1 = (hue + 0x800) & ~0xfff;
+        if(hue > hue1)
+            hue2 = (hue + 0x1800) & ~0xfff;
+        else
+            hue2 = (hue - 0x800) & ~0xfff;
+
+        /* check dist to 2nd closest dark color */
         dist = XRATIO * (val - 0x600) * (val - 0x600)
-             + YRATIO * (sat - 0x1000) * (sat - 0x1000);
-        dist += XRATIO * 0x1000 * _get_dither() - XRATIO * 0x8000;
+             + YRATIO * (sat - 0x1000) * (sat - 0x1000)
+             + HRATIO * (hue - hue2) * (hue - hue2);
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
         dist = dist * 3 / 4;
         if(dist <= distbg)
@@ -489 +503 @@
             outfg = outbg;
             distfg = distbg;
-            outbg = dark_colors[(hue + _get_dither() * 0x10) / 0x1000];
+            outbg = dark_colors[hue2 / 0x1000];
             distbg = dist;
         }
         else if(dist <= distfg)
         {
-            outfg = dark_colors[(hue + _get_dither() * 0x10) / 0x1000];
+            outfg = dark_colors[hue2 / 0x1000];
             distfg = dist;
         }
 
-        /* check dist to light */
+        /* check dist to 2nd closest light color */
         dist = XRATIO * (val - 0x1000) * (val - 0x1000)
-             + YRATIO * (sat - 0x1000) * (sat - 0x1000);
-        dist += XRATIO * 0x1000 * _get_dither() - XRATIO * 0x8000;
+             + YRATIO * (sat - 0x1000) * (sat - 0x1000)
+             + HRATIO * (hue - hue2) * (hue - hue2);
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
         dist = dist / 2;
         if(dist <= distbg)
@@ -507 +522 @@
             outfg = outbg;
             distfg = distbg;
-            outbg = light_colors[(hue + _get_dither() * 0x10) / 0x1000];
+            outbg = light_colors[hue2 / 0x1000];
             distbg = dist;
         }
         else if(dist <= distfg)
         {
-            outfg = light_colors[(hue + _get_dither() * 0x10) / 0x1000];
+            outfg = light_colors[hue2 / 0x1000];
+            distfg = dist;
+        }
+
+        /* check dist to closest dark color */
+        dist = XRATIO * (val - 0x600) * (val - 0x600)
+             + YRATIO * (sat - 0x1000) * (sat - 0x1000)
+             + HRATIO * (hue - hue1) * (hue - hue1);
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
+        dist = dist * 3 / 4;
+        if(dist <= distbg)
+        {
+            outfg = outbg;
+            distfg = distbg;
+            outbg = dark_colors[hue1 / 0x1000];
+            distbg = dist;
+        }
+        else if(dist <= distfg)
+        {
+            outfg = dark_colors[hue1 / 0x1000];
+            distfg = dist;
+        }
+
+        /* check dist to closest light color */
+        dist = XRATIO * (val - 0x1000) * (val - 0x1000)
+             + YRATIO * (sat - 0x1000) * (sat - 0x1000)
+             + HRATIO * (hue - hue1) * (hue - hue1);
+        dist += FUZZINESS * _get_dither() - 0x80 * FUZZINESS;
+        dist = dist / 2;
+        if(dist <= distbg)
+        {
+            outfg = outbg;
+            distfg = distbg;
+            outbg = light_colors[hue1 / 0x1000];
+            distbg = dist;
+        }
+        else if(dist <= distfg)
+        {
+            outfg = light_colors[hue1 / 0x1000];
             distfg = dist;
         }
@@ -521 +574 @@
         /* distbg can be > distfg because of dithering fuzziness */
         ch = distbg * 2 * (DENSITY_CHARS - 1) / (distbg + distfg);
-        ch = 4 * ch /*+ _get_dither() / 0x40*/;
+        ch = 4 * ch + _get_dither() / 0x40;
         outch = density_chars[ch];
 
 #else
         outbg = CACA_COLOR_BLACK;
-        if(sat < 0x200 + _get_dither() * 0x8)
+        if((unsigned int)sat < 0x200 + _get_dither() * 0x8)
             outfg = white_colors[1 + (val * 2 + _get_dither() * 0x10) / 0x1000];
-        else if(val > 0x800 + _get_dither() * 0x4)
+        else if((unsigned int)val > 0x800 + _get_dither() * 0x4)
             outfg = light_colors[(hue + _get_dither() * 0x10) / 0x1000];
         else