Mercurial > hg > forks > multipaint-js

changeset 235:2e772a17a4ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 06 Sep 2018 15:42:31 +0300
parents 7afa7c257d93
children 69b031cc8064
files exporters.pde
diffstat 1 files changed, 43 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/exporters.pde	Thu Sep 06 13:27:04 2018 +0300
+++ b/exporters.pde	Thu Sep 06 15:42:31 2018 +0300
@@ -208,9 +208,9 @@
         for (yy = 0; yy < 8; yy++)
         for (x = 0; x < 32; x++)
         {
-            yp = y * 64 + yy * 8 + y2;
-            ad = 1024 + yp * 256 + x * 8;
-            mpCopyByte(fdata, ad, head);
+            mpCopyByte(fdata,
+                1024 + (y * 64 + yy * 8 + y2) * 256 + x * 8,
+                head);
             head++;
         }
 
@@ -251,11 +251,13 @@
         for (x = 0; x < 40; x++)
         for (y2 = 0; y2 < 8; y2++)
         {
-            head = 2 + x * 8 + y * (40 * 8) + y2;
-            ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320;
-            mpCopyByte(fdata, ad, head);
-            p1 = fdata[0x1f42 + x + y * 40] & 0x0f;
-            p2 = (fdata[0x1f42 + x + y * 40] >> 4) & 0x0f;
+            ad = x + y * 40;
+            mpCopyByte(fdata,
+                1024 + x * 8 + y * (320 * 8) + y2 * 320,
+                2 + x * 8 + y * (40 * 8) + y2);
+
+            p1 = fdata[0x1f42 + ad] & 0x0f;
+            p2 = (fdata[0x1f42 + ad] >> 4) & 0x0f;
 
             g_map[65536 + x + y * 40 * 8 + y2 * 40] = byte(p2);
             g_map[65536 + MX * MY * 8 + x + y * 40 * 8 + y2 * 40] = byte(p1);
@@ -277,14 +279,15 @@
         for (x = 0; x < 40; x++)
         for (y2 = 0; y2 < 8; y2++)
         {
-            head = 2050 + x * 8 + y * (40 * 8) + y2;
-            ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320;
-            mpCopyByte(fdata, ad, head);
+            ad = x + y * 40;
+            mpCopyByte(fdata,
+                1024 + x * 8 + y * (320 * 8) + y2 * 320,
+                2050 + x * 8 + y * (40 * 8) + y2);
 
-            p1 = fdata[1026 + x + y * 40] & 0x0f;
-            p2 = (fdata[1026 + x + y * 40] >> 4) & 0x0f;
-            l1 = fdata[2 + x + y * 40] & 0x0f;
-            l2 = (fdata[2 + x + y * 40] >> 4) & 0x0f;
+            p1 = fdata[1026 + ad] & 0x0f;
+            p2 = (fdata[1026 + ad] >> 4) & 0x0f;
+            l1 = fdata[2 + ad] & 0x0f;
+            l2 = (fdata[2 + ad] >> 4) & 0x0f;
 
             g_map[65536 + x + y * 40 * 8 + y2 * 40] = byte(convertluminance(l1, p2));
             g_map[65536 + MX * MY * 8 + x + y * 40 * 8 + y2 * 40] = byte(convertluminance(l2, p1));
@@ -303,22 +306,24 @@
         {
             return false;
         }
+
         int l1, l2;
         for (y = 0; y < 25; y++)
         for (x = 0; x < 40; x++)
         for (y2 = 0; y2 < 8; y2++)
         {
-            head = 2050 + x * 8 + y * (40 * 8) + y2;
-            ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320;
-            mpCopyByte(fdata, ad, head);
+            ad = x + y * 40;
+            mpCopyByte(fdata,
+                1024 + x * 8 + y * (320 * 8) + y2 * 320,
+                2050 + x * 8 + y * (40 * 8) + y2);
 
-            p1 = fdata[1026 + x + y * 40] & 0x0f;
-            p2 = (fdata[1026 + x + y * 40] >> 4) & 0x0f;
-            l1 = fdata[2 + x + y * 40] & 0x0f;
-            l2 = (fdata[2 + x + y * 40] >> 4) & 0x0f;
+            p1 = fdata[1026 + ad] & 0x0f;
+            p2 = (fdata[1026 + ad] >> 4) & 0x0f;
+            l1 = fdata[2 + ad] & 0x0f;
+            l2 = (fdata[2 + ad] >> 4) & 0x0f;
 
-            g_map[65536 + x + y * 40 + 1000] = byte(convertluminance(l1, p2));
-            g_map[65536 + x + y * 40 + 0000] = byte(convertluminance(l2, p1));
+            g_map[65536 + ad + 1000] = byte(convertluminance(l1, p2));
+            g_map[65536 + ad + 0000] = byte(convertluminance(l2, p1));
         }
 
         p1 = (int(fdata[1025]) >> 4) & 0x0f;
@@ -346,17 +351,18 @@
         for (x = 0; x < 40; x++)
         for (y2 = 0; y2 < 8; y2++)
         {
-            ad = 1024 + x * 8 + y * (320 * 8) + y2 * 320;
-            head = 2 + x * 8 + y * (40 * 8) + y2;
-            mpCopyByte(fdata, ad, head);
+            ad = x + y * 40;
+            mpCopyByte(fdata,
+                1024 + x * 8 + y * (320 * 8) + y2 * 320,
+                0x2402 + x * 8 + y * (40 * 8) + y2);
 
-            p1 = fdata[0x1f42 + x + y * 40] & 0x0f;
-            p2 = (fdata[0x1f42 + x + y * 40] >> 4) & 0x0f;
-            p3 = fdata[0x233a + x + y * 40] & 0x0f;
+            p1 = fdata[0x1f42 + ad] & 0x0f;
+            p2 = (fdata[0x1f42 + ad] >> 4) & 0x0f;
+            p3 = fdata[0x233a + ad] & 0x0f;
 
-            g_map[65536 + x + y * 40] = byte(p1);
-            g_map[65536 + x + y * 40 + 1000] = byte(p2);
-            g_map[65536 + x + y * 40 + 2000] = byte(p3);
+            g_map[65536 + ad] = byte(p1);
+            g_map[65536 + ad + 1000] = byte(p2);
+            g_map[65536 + ad + 2000] = byte(p3);
         }
         g_map[0] = byte(fdata[0x232a] & 0x0f); //bord
         g_map[1] = byte(fdata[0x232b] & 0x0f); //baku
@@ -387,9 +393,9 @@
             p2 = (fdata[0x0402 + ad] >> 4) & 0x0f;
             p3 = fdata[0x0002 + ad] & 0x0f;
 
-            g_map[65536 + x + y * 40] = byte(p1);
-            g_map[65536 + x + y * 40 + 1000] = byte(p2);
-            g_map[65536 + x + y * 40 + 2000] = byte(p3);
+            g_map[65536 + ad] = byte(p1);
+            g_map[65536 + ad + 1000] = byte(p2);
+            g_map[65536 + ad + 2000] = byte(p3);
         }
 
         // Background is not used, and border is not defined
@@ -412,6 +418,7 @@
             head = 7 + x * 8 + y * (32 * 8) + y2;
             ad = 1024 + x * 8 + y * (256 * 8) + y2 * 256;
             mpCopyByte(fdata, ad, head);
+
             p1 = fdata[(8199) + x * 8 + ((y * 8 * 32) + y2)] & 0x0f;
             p2 = (fdata[(8199) + x * 8 + ((y * 8 * 32) + y2)] >> 4) & 0x0f;