From 7d5f336e3626287bce65303f1b984b5f21bcc533 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 18 Apr 2018 21:31:33 -0400 Subject: [PATCH] Final block rendering system revisions, for now --- core/assets/version.properties | 4 ++-- .../anuke/mindustry/graphics/FloorRenderer.java | 17 +---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 60628748be..f29fa2a166 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Apr 18 21:17:48 EDT 2018 +#Wed Apr 18 21:31:08 EDT 2018 version=release -androidBuildCode=1044 +androidBuildCode=1049 name=Mindustry code=3.5 build=custom build diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index cda9f31c9b..bcf5bbb4c0 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -26,26 +26,11 @@ public class FloorRenderer { private final static int vsize = 4; private final static int chunksize = 32; - private AsyncExecutor executor = new AsyncExecutor(4); + private AsyncExecutor executor = new AsyncExecutor(8); private ShaderProgram program = createDefaultShader(); private Chunk[][] cache; private IntSet drawnLayerSet = new IntSet(); private IntArray drawnLayers = new IntArray(); - private short[] indices; - - public FloorRenderer(){ - int len = chunksize*chunksize*vsize * 6; - indices = new short[len]; - short j = 0; - for (int i = 0; i < len; i += 6, j += 4) { - indices[i] = j; - indices[i + 1] = (short)(j + 1); - indices[i + 2] = (short)(j + 2); - indices[i + 3] = (short)(j + 2); - indices[i + 4] = (short)(j + 3); - indices[i + 5] = j; - } - } public void drawFloor(){