From c66c3590b17882c0a06f64d3595c80c5eab83197 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 10 Jun 2020 17:42:45 -0400 Subject: [PATCH] Batch cleanup --- core/src/mindustry/ClientLauncher.java | 3 +++ core/src/mindustry/graphics/IndexedRenderer.java | 2 +- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index d7287df1be..ac2aefe26c 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -20,6 +20,8 @@ import mindustry.mod.*; import mindustry.net.Net; import mindustry.ui.*; +import java.nio.*; + import static arc.Core.*; import static mindustry.Vars.*; @@ -33,6 +35,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform @Override public void setup(){ + loader = new LoadRenderer(); Events.fire(new ClientCreateEvent()); diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java index 96194c0883..e0157cc54b 100644 --- a/core/src/mindustry/graphics/IndexedRenderer.java +++ b/core/src/mindustry/graphics/IndexedRenderer.java @@ -63,7 +63,7 @@ public class IndexedRenderer implements Disposable{ program.bind(); texture.bind(); - program.setUniformMatrix4("u_projTrans", BatchShader.copyTransform(combined)); + program.setUniformMatrix4("u_projTrans", combined); program.setUniformi("u_texture", 0); mesh.render(program, Gl.triangles, 0, vertices.length / vsize); diff --git a/gradle.properties b/gradle.properties index fa1b5d8ac6..103bb23a42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=a92a05d03367ca1481fbf8768635eec38204babc +archash=db822fce837c326b28f091138bf6b34839767b51