Cleanup

core/src/mindustry/graphics/LoadRenderer.java

@@ -27,7 +27,7 @@ public class LoadRenderer implements Disposable{
     private static final String red = "[#" + colorRed + "]";
     private static final String orange = "[#" + color + "]";
     private static final FloatArray floats = new FloatArray();
-    private static final boolean preview = true;
+    private static final boolean preview = false;
 
     private float testprogress = 0f;
     private StringBuilder assetText = new StringBuilder();
@@ -137,6 +137,7 @@ public class LoadRenderer implements Disposable{
             }
         }
 
+        Draw.flush();
 
         float aspect = 1.94f;
 
@@ -228,10 +229,13 @@ public class LoadRenderer implements Disposable{
                     }else if(panei == 1){
                         float height = maxy - miny;
                         float barpad = s * 8f;
-                        float barspace = (height - barpad) / bars.length;
+
+                        int barsUsed = Math.min((int)((height - barpad) / (font.getLineHeight() * 1.4f)), bars.length);
+
+                        float barspace = (height - barpad) / barsUsed;
                         float barheight = barspace * 0.8f;
 
-                        for(int i = 0; i < bars.length; i++){
+                        for(int i = 0; i < barsUsed; i++){
                             Bar bar = bars[i];
                             if(bar.valid()){
                                 Draw.color(bar.red() ? colorRed : color);

core/src/mindustry/graphics/Shaders.java

@@ -108,8 +108,7 @@ public class Shaders{
     public static class SunShader extends LoadShader{
         public int octaves = 5;
         public float falloff = 0.5f, scale = 1f, power = 1.3f, magnitude = 0.6f, speed = 99999999999f, spread = 1.3f, seed = Mathf.random(9999f);
-
-        public float[] colorValues;
+        public Texture colors;
 
         public SunShader(){
             super("sun", "sun");
@@ -117,6 +116,10 @@ public class Shaders{
 
         @Override
         public void apply(){
+            colors.bind(1);
+            Gl.activeTexture(Gl.texture0);
+
+            setUniformi("u_colors", 1);
             setUniformi("u_octaves", octaves);
             setUniformf("u_falloff", falloff);
             setUniformf("u_scale", scale);
@@ -125,9 +128,6 @@ public class Shaders{
             setUniformf("u_time", Time.globalTime() / speed);
             setUniformf("u_seed", seed);
             setUniformf("u_spread", spread);
-
-            setUniformi("u_colornum", colorValues.length / 4);
-            setUniform4fv("u_colors[0]", colorValues, 0, colorValues.length);
         }
     }
 

core/src/mindustry/graphics/g3d/PlanetMesh.java

@@ -3,10 +3,11 @@ package mindustry.graphics.g3d;
 import arc.graphics.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
+import arc.util.*;
 import mindustry.type.*;
 
 /** Defines a mesh that is rendered for a planet. Subclasses provide a mesh and a shader. */
-public abstract class PlanetMesh{
+public abstract class PlanetMesh implements Disposable{
     protected final Mesh mesh;
     protected final Planet planet;
     protected final Shader shader;
@@ -28,4 +29,9 @@ public abstract class PlanetMesh{
         shader.apply();
         mesh.render(shader, Gl.triangles);
     }
+
+    @Override
+    public void dispose(){
+        mesh.dispose();
+    }
 }

core/src/mindustry/graphics/g3d/SunMesh.java

@@ -2,6 +2,7 @@ package mindustry.graphics.g3d;
 
 import arc.graphics.*;
 import arc.math.*;
+import arc.util.*;
 import mindustry.graphics.*;
 import mindustry.graphics.Shaders.*;
 import mindustry.type.*;
@@ -9,25 +10,19 @@ import mindustry.type.*;
 public class SunMesh extends ShaderSphereMesh{
     public int octaves = 5;
     public float falloff = 0.5f, scale = 1f, power = 1.3f, magnitude = 0.6f, speed = 99999999999f, spread = 1.3f, seed = Mathf.random(9999f);
-    public float[] colorValues;
+    public Texture colors;
 
     public SunMesh(Planet planet, int divisions){
         super(planet, Shaders.sun, divisions);
     }
 
-    public void setColors(Color... colors){
-        setColors(1f, colors);
-    }
-
     public void setColors(float scl, Color... colors){
-        colorValues = new float[colors.length*4];
-
-        for(int i = 0; i < colors.length; i ++){
-            colorValues[i*4] = colors[i].r * scl;
-            colorValues[i*4 + 1] = colors[i].g * scl;
-            colorValues[i*4 + 2] = colors[i].b * scl;
-            colorValues[i*4 + 3] = colors[i].a * scl;
+        Pixmap pix = new Pixmap(colors.length, 1);
+        for(int i = 0; i < colors.length; i++){
+            pix.draw(i, 0, Tmp.c1.set(colors[i]).mul(scl));
         }
+        this.colors = new Texture(pix);
+        pix.dispose();
     }
 
     @Override
@@ -40,6 +35,12 @@ public class SunMesh extends ShaderSphereMesh{
         s.magnitude = magnitude;
         s.speed = speed;
         s.seed = seed;
-        s.colorValues = colorValues;
+        s.colors = colors;
+    }
+
+    @Override
+    public void dispose(){
+        super.dispose();
+        colors.dispose();
     }
 }