From 5e349e237a8a51eb5a6aed162720a23af7ae99dd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 18 Apr 2022 16:58:50 -0400
Subject: [PATCH] Fast pack

---
 core/assets-raw/sprites/units/anthicus.png | Bin 2434 -> 2431 bytes
 tools/build.gradle                         |  69 +++++++++------------
 tools/src/mindustry/tools/Generators.java  |   2 +-
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/core/assets-raw/sprites/units/anthicus.png b/core/assets-raw/sprites/units/anthicus.png
index b4ca19858cc1fdad2e9b997eddf4141f08b3432c..a764180aab2f0560ac99569a9202477e42e08cd2 100644
GIT binary patch
delta 2350
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
UNSiPM00000NkvXXu0mh|g6!*;o&W#<

delta 2353
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
X;L|1An~lx@0000<MNUMnLIPld5j3d8

diff --git a/tools/build.gradle b/tools/build.gradle
index 244edc4133..ed57242306 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -22,41 +22,33 @@ import java.util.concurrent.Executors
 def genFolder = "../core/assets-raw/sprites_out/generated/"
 def doAntialias = !project.hasProperty("disableAntialias")
 def enableAA = true
-//on my machine, I have a native Nim AA implementation that is ~10x faster
-//it's not compiled for other platforms so they don't get it
-def useFastAA = project.hasProperty("fastAA") || System.getProperty("user.name") == "anuke"
 
 @groovy.transform.CompileStatic
-private def antialias(File file, boolean doAntialias, boolean useFastAA){
-    if(!doAntialias) return
+static int getRGB(Pixmap image, int ix, int iy) {
+    return image.getRaw(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
+}
 
-    if(useFastAA){
-        "antialias ${file.absolutePath}".execute().waitFor()
-        return
-    }
+@groovy.transform.CompileStatic
+static void antialias(File file){
+    Pixmap image = new Pixmap(new Fi(file))
+    Pixmap out = image.copy()
 
-    def image = new Pixmap(new Fi(file))
-    def out = image.copy()
-    def getRGB = { int ix, int iy ->
-        return image.getRaw(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
-    }
-
-    def color = new Color()
-    def sum = new Color()
-    def suma = new Color()
+    Color color = new Color()
+    Color sum = new Color()
+    Color suma = new Color()
     int[] p = new int[9]
 
     for(int x = 0; x < image.width; x++){
         for(int y = 0; y < image.height; y++){
-            int A = getRGB(x - 1, y + 1),
-                B = getRGB(x, y + 1),
-                C = getRGB(x + 1, y + 1),
-                D = getRGB(x - 1, y),
-                E = getRGB(x, y),
-                F = getRGB(x + 1, y),
-                G = getRGB(x - 1, y - 1),
-                H = getRGB(x, y - 1),
-                I = getRGB(x + 1, y - 1)
+            int A = getRGB(image, x - 1, y + 1),
+                B = getRGB(image, x, y + 1),
+                C = getRGB(image, x + 1, y + 1),
+                D = getRGB(image, x - 1, y),
+                E = getRGB(image, x, y),
+                F = getRGB(image, x + 1, y),
+                G = getRGB(image, x - 1, y - 1),
+                H = getRGB(image, x, y - 1),
+                I = getRGB(image, x + 1, y - 1)
 
             Arrays.fill(p, E)
 
@@ -73,10 +65,11 @@ private def antialias(File file, boolean doAntialias, boolean useFastAA){
 
             for(int val : p){
                 color.rgba8888(val)
-                suma.r += color.r * color.a
-                suma.g += color.g * color.a
-                suma.b += color.b * color.a
-                suma.a += color.a
+                color.premultiplyAlpha()
+                suma.r(suma.r + color.r)
+                suma.g(suma.g + color.g)
+                suma.b(suma.b + color.b)
+                suma.a(suma.a + color.a)
             }
 
             float fm = suma.a <= 0.001f ? 0f : (float)(1f / suma.a)
@@ -89,10 +82,10 @@ private def antialias(File file, boolean doAntialias, boolean useFastAA){
                 color.rgba8888(val)
                 float a = color.a
                 color.lerp(suma, (float) (1f - a))
-                sum.r += color.r
-                sum.g += color.g
-                sum.b += color.b
-                sum.a += a
+                sum.r(sum.r + color.r)
+                sum.g(sum.g + color.g)
+                sum.b(sum.b + color.b)
+                sum.a(sum.a + a)
                 total += 1f
             }
 
@@ -159,7 +152,7 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
         }
 
         if(enableAA){
-            ExecutorService executor = Executors.newFixedThreadPool(16)
+            ExecutorService executor = Executors.newFixedThreadPool(OS.cores)
             long ms = System.currentTimeMillis()
 
             //antialias everything except UI elements
@@ -167,13 +160,13 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
                 if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-")) || file.toString().contains(".9.png") || file.toString().contains("aaaa")) return
 
                 executor.submit{
-                    antialias(file.file, doAntialias, useFastAA)
+                    antialias(file.file)
                 }
             }
 
             Threads.await(executor)
 
-            println "Time taken for AA: ${(System.currentTimeMillis() - ms) / 1000f}"
+            println "Time taken for AA: ${(System.currentTimeMillis() - ms) / 1000f} seconds"
         }
 
         println("\n\nPacking normal 4096 sprites...\n\n")
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index 323fd40edc..0e4032aabd 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -154,7 +154,7 @@ public class Generators{
         });
 
         generate("cliffs", () -> {
-            ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+            ExecutorService exec = Executors.newFixedThreadPool(OS.cores);
             int size = 64;
             int dark = new Color(0.5f, 0.5f, 0.6f, 1f).mul(0.98f).rgba();
             int mid = Color.lightGray.rgba();