From ed7002bab0c1281b2245d4e92df44c15a04c962b Mon Sep 17 00:00:00 2001 From: Solargale Date: Thu, 9 Apr 2020 09:27:17 -0600 Subject: [PATCH] Removed the triples with pairs again. Need to find a system to remove chunks efficiently --- core/src/com/mygdx/game/Dimension/Chunks.java | 6 +++--- core/src/com/mygdx/game/Dimension/WorldRenderer.java | 4 ++-- core/src/com/mygdx/game/Main.java | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/com/mygdx/game/Dimension/Chunks.java b/core/src/com/mygdx/game/Dimension/Chunks.java index 17224ad..8b51bf7 100644 --- a/core/src/com/mygdx/game/Dimension/Chunks.java +++ b/core/src/com/mygdx/game/Dimension/Chunks.java @@ -1,7 +1,7 @@ //https://www.redblobgames.com/maps/terrain-from-noise/ package com.mygdx.game.Dimension; -import com.github.czyzby.kiwi.util.tuple.immutable.Triple; +import com.github.czyzby.kiwi.util.tuple.immutable.Pair; import com.mygdx.game.OpenSimplexNoise; import java.util.HashMap; @@ -9,7 +9,7 @@ import java.util.HashMap; import static com.mygdx.game.Restrictions.*; public class Chunks { - public static HashMap, Block> blocks = new HashMap<>(); + public static HashMap, Block> blocks = new HashMap<>(); private long seed = 1; @@ -24,7 +24,7 @@ public class Chunks { //Going from start of selected chunk to end of selected chunk in x and y for (int i = startX; i != endX; i++){ for (int j = startY; j != endY; j++) { - blocks.put(new Triple(i, j, 0), getTerrain(i, j)); + blocks.put(new Pair<>(i, j), getTerrain(i, j)); } } } diff --git a/core/src/com/mygdx/game/Dimension/WorldRenderer.java b/core/src/com/mygdx/game/Dimension/WorldRenderer.java index f4b0acb..387aaae 100644 --- a/core/src/com/mygdx/game/Dimension/WorldRenderer.java +++ b/core/src/com/mygdx/game/Dimension/WorldRenderer.java @@ -2,7 +2,7 @@ package com.mygdx.game.Dimension; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.github.czyzby.kiwi.util.tuple.immutable.Triple; +import com.github.czyzby.kiwi.util.tuple.immutable.Pair; import com.mygdx.game.Character.InputController; import com.mygdx.game.Character.Mouse; import com.mygdx.game.Restrictions; @@ -19,7 +19,7 @@ public class WorldRenderer implements Restrictions { } public void drawWorld(Batch batch) { - for (Triple chunkpair : Chunks.blocks.keySet()) { + for (Pair chunkpair : Chunks.blocks.keySet()) { String name = Chunks.blocks.get(chunkpair).getName(); int drawingLocationX = chunkpair.getFirst() << TILE_SHIFT; diff --git a/core/src/com/mygdx/game/Main.java b/core/src/com/mygdx/game/Main.java index 3bc780a..7d5d2ea 100644 --- a/core/src/com/mygdx/game/Main.java +++ b/core/src/com/mygdx/game/Main.java @@ -39,7 +39,6 @@ public class Main extends ApplicationAdapter { Mouse mouse = new Mouse(); gui = new GUI(mouse,fitViewport); - worldRenderer = new WorldRenderer(mouse); batch = new SpriteBatch(); }