Fast pack

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){
+static int getRGB(Pixmap image, int ix, int iy) {
-    if(!doAntialias) return
+    return image.getRaw(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0))
+}
 
-    if(useFastAA){
+@groovy.transform.CompileStatic
-        "antialias ${file.absolutePath}".execute().waitFor()
+static void antialias(File file){
-        return
+    Pixmap image = new Pixmap(new Fi(file))
-    }
+    Pixmap out = image.copy()
 
-    def image = new Pixmap(new Fi(file))
+    Color color = new Color()
-    def out = image.copy()
+    Color sum = new Color()
-    def getRGB = { int ix, int iy ->
+    Color suma = new Color()
-        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()
     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),
+            int A = getRGB(image, x - 1, y + 1),
-                B = getRGB(x, y + 1),
+                B = getRGB(image, x, y + 1),
-                C = getRGB(x + 1, y + 1),
+                C = getRGB(image, x + 1, y + 1),
-                D = getRGB(x - 1, y),
+                D = getRGB(image, x - 1, y),
-                E = getRGB(x, y),
+                E = getRGB(image, x, y),
-                F = getRGB(x + 1, y),
+                F = getRGB(image, x + 1, y),
-                G = getRGB(x - 1, y - 1),
+                G = getRGB(image, x - 1, y - 1),
-                H = getRGB(x, y - 1),
+                H = getRGB(image, x, y - 1),
-                I = getRGB(x + 1, 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
+                color.premultiplyAlpha()
-                suma.g += color.g * color.a
+                suma.r(suma.r + color.r)
-                suma.b += color.b * color.a
+                suma.g(suma.g + color.g)
-                suma.a += color.a
+                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.r(sum.r + color.r)
-                sum.g += color.g
+                sum.g(sum.g + color.g)
-                sum.b += color.b
+                sum.b(sum.b + color.b)
-                sum.a += a
+                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")

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();