Changeset 2213 for www/labsTweet

Timestamp:

Jan 23, 2008, 10:32:45 PM (15 years ago)

Author:

Sam Hocevar

Message:

• img2oric now outputs Oric files.

Location:

www/labs

Files:

• OUTPUT.TAP (added)
• img2oric.c (modified) (19 diffs)
• img2oric.html (modified) (1 diff)
• xeuphoric.png (added)

www/labs/img2oric.c

@@ -32 +32 @@
 
 /*
+ * BMP output name and Oric output name
+ */
+#define BMPFILE "output.bmp"
+#define ORICFILE "OUTPUT" /* ".TAP" will be appended */
+
+/*
  * Image dimensions and recursion depth. DEPTH = 2 is a reasonable value,
  * DEPTH = 3 gives good quality, and higher values may improve the results
@@ -67 +73 @@
  * colour is repeated 6 times so that we can point to the palette to paste
  * whole blocks of 6 pixels. It’s also organised so that palette[7-x] is the
- * RGB negative of palette[x]. Finally, it’s roughly ordered by brightness to
- * allow for other tricks later.
- */
-#define O 0x0000
-#define I 0xffff
+ * RGB negative of palette[x], and screen command X uses palette[X & 7].
+ */
+#define o 0x0000
+#define X 0xffff
 static const int palette[8][6 * 3] =
 {
-    { O, O, O,   O, O, O,   O, O, O,   O, O, O,   O, O, O,   O, O, O },
-    { O, O, I,   O, O, I,   O, O, I,   O, O, I,   O, O, I,   O, O, I },
-    { I, O, O,   I, O, O,   I, O, O,   I, O, O,   I, O, O,   I, O, O },
-    { I, O, I,   I, O, I,   I, O, I,   I, O, I,   I, O, I,   I, O, I },
-    { O, I, O,   O, I, O,   O, I, O,   O, I, O,   O, I, O,   O, I, O },
-    { O, I, I,   O, I, I,   O, I, I,   O, I, I,   O, I, I,   O, I, I },
-    { I, I, O,   I, I, O,   I, I, O,   I, I, O,   I, I, O,   I, I, O },
-    { I, I, I,   I, I, I,   I, I, I,   I, I, I,   I, I, I,   I, I, I },
+    { o, o, o,   o, o, o,   o, o, o,   o, o, o,   o, o, o,   o, o, o },
+    { X, o, o,   X, o, o,   X, o, o,   X, o, o,   X, o, o,   X, o, o },
+    { o, X, o,   o, X, o,   o, X, o,   o, X, o,   o, X, o,   o, X, o },
+    { X, X, o,   X, X, o,   X, X, o,   X, X, o,   X, X, o,   X, X, o },
+    { o, o, X,   o, o, X,   o, o, X,   o, o, X,   o, o, X,   o, o, X },
+    { X, o, X,   X, o, X,   X, o, X,   X, o, X,   X, o, X,   X, o, X },
+    { o, X, X,   o, X, X,   o, X, X,   o, X, X,   o, X, X,   o, X, X },
+    { X, X, X,   X, X, X,   X, X, X,   X, X, X,   X, X, X,   X, X, X },
 };
 
@@ -117 +122 @@
 static inline int ctoi(int p) { return ctoi_table[p / 0x100]; }
 
-static inline void domove(uint8_t move, uint8_t *bg, uint8_t *fg)
-{
-    if(move < 16)
-        *fg = move & 0x7;
-    else if(move < 32)
-        *bg = move & 0x7;
+/*
+ * Set new background and foreground colours according to the given command.
+ */
+static inline void domove(uint8_t command, uint8_t *bg, uint8_t *fg)
+{
+    if((command & 0x78) == 0x00)
+        *fg = command & 0x7;
+    else if((command & 0x78) == 0x10)
+        *bg = command & 0x7;
 }
 
@@ -205 +213 @@
     int const *voidrgb, *nvoidrgb, *vec, *rgb;
     int besterror, curerror, suberror, statice, voide, nvoide;
-    int i, c;
+    int i, j, c;
     uint8_t command, bestcommand;
 
@@ -232 +240 @@
      * 33: inverse video stuff */
     besterror = 0x7ffffff;
-    bestcommand = 16;
+    bestcommand = 0x10;
     memcpy(bestrgb, voidrgb, 6 * 3 * sizeof(int));
-    for(command = 0; command < 34; command++)
+    for(j = 0; j < 34; j++)
     {
+        static uint8_t const lookup[] =
+        {
+            0x00, 0x04, 0x01, 0x05, 0x02, 0x06, 0x03, 0x07,
+            0x80, 0x84, 0x81, 0x85, 0x82, 0x86, 0x83, 0x87,
+            0x10, 0x14, 0x11, 0x15, 0x12, 0x16, 0x13, 0x17,
+            0x90, 0x94, 0x91, 0x95, 0x92, 0x96, 0x93, 0x97,
+            0x40, 0xc0
+        };
+
         uint8_t newbg = bg, newfg = fg;
+
+        command = lookup[j];
         domove(command, &newbg, &newfg);
 
-        /* Keeping bg and fg is useless, because we could use commands
-         * 32 and 33 instead */
-        if(command < 32 && newbg == bg && newfg == fg)
+        /* Keeping bg and fg is useless, because we could use standard
+         * pixel printing instead */
+        if((command & 0x40) == 0x00 && newbg == bg && newfg == fg)
             continue;
 
@@ -248 +267 @@
          * interesting, so we continue anyway. */
 
-        if(command < 8)
+#if 0
+        /* Bit 6 off and bit 5 on seems illegal */
+        if((command & 0x60) == 0x20)
+            continue;
+
+        /* Bits 6 and 5 off and bit 3 on seems illegal */
+        if((command & 0x68) == 0x08)
+            continue;
+#endif
+
+        if((command & 0xf8) == 0x00)
         {
             curerror = voide;
@@ -254 +283 @@
             vec = voidvec;
         }
-        else if(command < 16)
+        else if((command & 0xf8) == 0x80)
         {
             curerror = nvoide;
@@ -260 +289 @@
             vec = nvoidvec;
         }
-        else if(command < 24)
+        else if((command & 0xf8) == 0x10)
         {
             rgb = palette[newbg];
@@ -266 +295 @@
             vec = tmpvec;
         }
-        else if(command < 32)
+        else if((command & 0xf8) == 0x90)
         {
             rgb = palette[7 - newbg];
@@ -276 +305 @@
             int const *bgcolor, *fgcolor;
 
-            if(command == 32)
+            if((command & 0x80) == 0x00)
             {
                 bgcolor = palette[bg]; fgcolor = palette[fg];
@@ -315 +344 @@
                     memcpy(tmpvec, vec2, 3 * sizeof(int));
                     memcpy(tmprgb + i * 3, fgcolor, 3 * sizeof(int));
+                    command |= (1 << (5 - i));
                 }
             }
@@ -335 +365 @@
         if(depth == 0)
             suberror = 0; /* It’s the end of the tree */
-        else if(command < 32)
+        else if((command & 0x68) == 0x00)
         {
             bestmove(in + 6 * 3, newbg, newfg, vec, depth - 1,
@@ -341 +371 @@
 
 #if 0
-            /* Penalty for background changes; they're hard to revert. The
+            /* Slight penalty for colour changes; they're hard to revert. The
              * value of 2 was determined empirically. 1.5 is not enough and
              * 3 is too much. */
             if(newbg != bg)
-                suberror *= 2;
+                suberror = suberror * 10 / 8;
+            else if(newfg != fg)
+                suberror = suberror * 9 / 8;
 #endif
         }
@@ -369 +401 @@
 {
     SDL_Surface *tmp, *surface;
+    FILE *f;
     int *src, *dst, *srcl, *dstl;
     uint8_t *pixels;
@@ -379 +412 @@
     if(!tmp)
         return 2;
+
+    f = fopen(ORICFILE ".TAP", "w");
+    if(!f)
+        return 3;
+    fwrite("\x16\x16\x16\x16\x24", 1, 5, f);
+    fwrite("\x00\xff\x80\x00\xbf\x3f\xa0\x00", 1, 8, f);
+    fwrite(ORICFILE, 1, strlen(ORICFILE), f);
+    fwrite("\x00", 1, 1, f);
 
     init_tables();
@@ -414 +455 @@
             int errvec[3] = { 0, 0, 0 };
             int dummy, i;
-            uint8_t move;
+            uint8_t command;
 
             depth = (x + DEPTH < WIDTH) ? DEPTH : (WIDTH - x) / 6 - 1;
@@ -420 +461 @@
             dstl = dst + y * stride + x * 3;
 
-            /* Recursively compute and apply best move */
-            move = bestmove(srcl, bg, fg, errvec, depth, 0x7fffff,
-                            &dummy, dstl);
+            /* Recursively compute and apply best command */
+            command = bestmove(srcl, bg, fg, errvec, depth, 0x7fffff,
+                               &dummy, dstl);
             /* Propagate error */
             for(c = 0; c < 3; c++)
@@ -440 +481 @@
             }
             /* Iterate */
-            domove(move, &bg, &fg);
+            domove(command, &bg, &fg);
+            /* Write byte to file */
+            fwrite(&command, 1, 1, f);
         }
     }
@@ -452 +495 @@
                 pixels[y * surface->pitch + x * 4 + 2 - c]
                     = itoc(dst[y * stride + x * 3 + c]) / 0x100;
-    SDL_SaveBMP(surface, "output.bmp");
+    SDL_SaveBMP(surface, BMPFILE);
+
+    fclose(f);
 
     return 0;

www/labs/img2oric.html

@@ -41 +41 @@
 <h2 style="clear: both;"> Downloads </h2>
 
-<p> No downloads are available yet. However, the file <tt><a
+<p> No real downloads are available yet. However, the file <tt><a
 href="img2oric.c">img2oric.c</a></tt> may be compiled on Linux to obtain an
 almost functional, yet extremely slow (around 2 minutes to process an image on
 a modern computer) program. </p>
 
+<h2> Usage </h2>
+
+<p> <tt>img2oric</tt> will output to <tt>output.bmp</tt>, an image file
+containing the new version, and to <tt>OUTPUT.DAT</tt> which contains the
+Oric-format file. </p>
+
+<p> You can download a <a href="OUTPUT.DAT">sample <tt>OUTPUT.DAT</tt></a>
+file as generated by <tt>img2oric</tt>. To load it into an emulator, just
+type <b><tt>HIRES:CLOAD"OUTPUT"</tt></b> and it will be displayed on the Oric
+screen: </p>
+
+<p style="text-align: center;">
+  <img src="xeuphoric.png" width="488" height="469" class="matrix" alt="" />
+</p>
 <h2> Screenshots </h2>