Mercurial > hg > forks > multipaint-js

changeset 196:5c08f024e542

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, 23 Aug 2018 20:24:04 +0300
parents b36cfb497223
children 4bdb6d0df3ca
files exporters.pde
diffstat 1 files changed, 45 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/exporters.pde	Thu Aug 23 20:23:46 2018 +0300
+++ b/exporters.pde	Thu Aug 23 20:24:04 2018 +0300
@@ -1042,7 +1042,7 @@
 
     int balx, baly, xx, yy, x2, y2, rr, gg, bb, avg, i, j, target;
     int cx, cy;
-    int aas, bbs, swap, idefix, avx, avy;
+    int swap, idefix, avx, avy;
     int[] pixut = new int[260];
     int[] idx = new int[260];
     int[] histog = new int[8192];
@@ -1149,48 +1149,48 @@
             pixut[i] = 0;
             idx[i] = i;
         }
-        for (yy = cy * vertti; yy <= cy * vertti + vertti - 1; yy++) {
-            for (xx = cx * 8; xx <= cx * 8 + 7; xx = xx + g_pixelw) {
-                x2 = int(image.width / X) * xx;
-                y2 = int(image.height / Y) * yy;
-                rr = 0;
-                gg = 0;
-                bb = 0;
-                avg = 0;
-
-                for (avy = 0; avy < baly; avy++)
-                for (avx = 0; avx < balx; avx++)
-                {
-                    c = image.get(x2 + avx, y2 + avy);
-                    rr += int(red(c));
-                    gg += int(green(c));
-                    bb += int(blue(c));
-                    avg++;
-                }
+        for (yy = cy * vertti; yy <= cy * vertti + vertti - 1; yy++)
+        for (xx = cx * 8; xx <= cx * 8 + 7; xx = xx + g_pixelw)
+        {
+            x2 = int(image.width / X) * xx;
+            y2 = int(image.height / Y) * yy;
+            rr = 0;
+            gg = 0;
+            bb = 0;
+            avg = 0;
 
-                rr = int(rr / avg);
-                gg = int(gg / avg);
-                bb = int(bb / avg);
-                g_farge = 0;
-                target = -1;
-                compa = 9999;
-                for (i = 0; i < xcolors; i++)
+            for (avy = 0; avy < baly; avy++)
+            for (avx = 0; avx < balx; avx++)
+            {
+                c = image.get(x2 + avx, y2 + avy);
+                rr += int(red(c));
+                gg += int(green(c));
+                bb += int(blue(c));
+                avg++;
+            }
+
+            rr = int(rr / avg);
+            gg = int(gg / avg);
+            bb = int(bb / avg);
+            g_farge = 0;
+            target = -1;
+            compa = 9999;
+            for (i = 0; i < xcolors; i++)
+            {
+                fld = dist(rr, gg, bb, g_r[i], g_g[i], g_b[i]);
+                if (fld < compa)
                 {
-                    fld = dist(rr, gg, bb, g_r[i], g_g[i], g_b[i]);
-                    if (fld < compa)
-                    {
-                        compa = fld;
-                        target = i;
-                    }
+                    compa = fld;
+                    target = i;
                 }
+            }
 
-                g_farge = target;
-                pixut[target]++; //histogramming
-            }
+            g_farge = target;
+            pixut[target]++; //histogramming
         }
 
-        for (aas = 0; aas < xcolors; aas++)
-        for (bbs = 0; bbs <= aas; bbs++)
+        for (int aas = 0; aas < xcolors; aas++)
+        for (int bbs = 0; bbs <= aas; bbs++)
         {
             if (pixut[aas] > pixut[bbs])
             {
@@ -1206,6 +1206,7 @@
         for (idefix = 0; idefix < limitter; idefix++)
         {
             i = idx[idefix];
+
             for (yy = cy * vertti; yy <= cy * vertti + vertti - 1; yy++)
             for (xx = cx * 8; xx <= cx * 8 + 7; xx = xx + g_pixelw)
             {
@@ -1217,7 +1218,8 @@
                 bb = 0;
                 avg = 0;
                 for (avy = 0; avy < baly; avy++)
-                for (avx = 0; avx < balx; avx++) {
+                for (avx = 0; avx < balx; avx++)
+                {
                     c = image.get(x2 + avx, y2 + avy);
                     rr = rr + int(red(c));
                     gg = gg + int(green(c));
@@ -1228,13 +1230,15 @@
                 rr = int(rr / avg);
                 gg = int(gg / avg);
                 bb = int(bb / avg);
+
                 g_farge = 0;
                 target = -1;
                 compa = 9999;
                 for (j = 0; j < limitter; j++)
                 {
                     fld = dist(rr, gg, bb, g_r[idx[j]], g_g[idx[j]], g_b[idx[j]]);
-                    if (fld < compa) {
+                    if (fld < compa)
+                    {
                         compa = fld;
                         target = idx[j];
                     }
@@ -1265,12 +1269,10 @@
     if (output == null)
         return;
 
+    color c = color(g_r[259], g_g[259], g_b[259]);
     for (int yy = 0; yy < output.width; yy++)
     for (int xx = 0; xx < output.width; xx++)
-    {
-        color c = color(g_r[259], g_g[259], g_b[259]);
         output.set(xx, yy, c);
-    }
 
     for (int yy = 0; yy < Y; yy++)
     for (int xx = 0; xx < X; xx++)
@@ -1285,7 +1287,7 @@
         if (g_machine == MSX && f == 0)
             f = g_map[1];
 
-        color c = color(g_r[f], g_g[f], g_b[f]);
+        c = color(g_r[f], g_g[f], g_b[f]);
 
         for (int vertti = 0; vertti <= omag; vertti++)
         for (int mortti = 0; mortti <= omag; mortti++)