Changeset 0c42eb7 in thomson

Timestamp:

Feb 13, 2013, 9:28:41 PM (11 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

b9b1bde

Parents:

2557cd0

Message:

Make sure the last point of a GPL use the same color (FORME or FOND) as the first point of the next GPL.
This avoids a glitch on the EFGJ033 gate array.

git-svn-id: ​svn://localhost/thomson@35 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• tools/gfx2mo5/libraw2mo5.c (modified) (6 diffs)

tools/gfx2mo5/libraw2mo5.c

@@ -1 +1 @@
 /* GFX2mo5 - libraw2mo5.c
  * CloudStrife - 20080921
- * PulkoMandy - 20101221
+ * PulkoMandy - 20101221, 20130213
  * Diffusé sous licence libre CeCILL v2
- * Voire LICENCE
+ * Voir LICENCE
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14 +15 @@
   unsigned char *tmpBuffer;
   int x,y;
+  int previous = 0;
 
   tmpBuffer = (unsigned char*)calloc(0x4000,1);
@@ -23 +25 @@
         #define width 320
 
+  bool lfo = false;
   for (y = 0; y < 200; y++)
         for (x = 0; x < 320; x+=8) {
@@ -28 +31 @@
                 int back = 255;
                 int pix;
+                bool oldlfo = lfo;
+
                 for(pix = 0; pix < 8; pix++) {
                         int nc = input[y*width+x+pix];
@@ -33 +38 @@
                         if (back == nc) {
                                 // Pixel is in backcolor, set FORME to 0
+                                lfo = false;
                         } else if (fore == nc) {
                                 // Pixel is in forecolor, set FORME to 1
                                 tmpBuffer[(y*320+x)/8] |= 0x80>>pix;
+                                lfo = true;
                         } else if (back==255) {
                                 // Pixel is in unknown color, back is free : allocate backcolor
                                 back = nc;
+                                lfo = false;
                         } else if (fore == 255) {
                                 // Pixel is unknown color, back is allocated : allocate front and set FORME
                                 fore = nc;
                                 tmpBuffer[(y*320+x)/8] |= 0x80>>pix;
+                                lfo = true;
                         } else {
                                 printf("Color clash at %d %d : %d %d %d\n",x+pix,y,fore, back,
@@ -48 +57 @@
                         }
                 }
-                if (fore == 255) fore = 0;
-                if (back == 255) back = 0;
 
-                tmpBuffer[0x2000+(y*320+x)/8] = (fore << 4) | back;
+                if (fore != 255) {
+                        previous &= 0xF;
+                        previous |= fore << 4;
+                }
+                if (back != 255) {
+                        previous &= 0xF0;
+                        previous |= back;
+                }
+
+                // Make sure the last pixel of this GPL and the first of the next GPL
+                // are both FORME or both FOND, else we get an ugly glitch on the
+                // EFGJ033 Gate Array MO5!
+                if(oldlfo == !(tmpBuffer[(y*320+x)/8] & 0x80))
+                {
+                        previous = (previous >> 4) | (previous << 4);
+                        tmpBuffer[(y*320+x)/8] ^= 0xFF;
+
+                        lfo = !lfo;
+                }
+
+                tmpBuffer[0x2000+(y*320+x)/8] = previous;
   }