diff --git a/client/src/main/java/core/engine/Engine.java b/client/src/main/java/core/engine/Engine.java index fdaf483..64a6e07 100644 --- a/client/src/main/java/core/engine/Engine.java +++ b/client/src/main/java/core/engine/Engine.java @@ -128,7 +128,7 @@ public class Engine { //Create Hexagon HexagonModel hexagonModel = new HexagonModel(); - RawModel hexagonRawModel = loader.loadToVAO(hexagonModel.getVertices(), hexagonModel.getTextureCoords(), hexagonModel.getNormals(), hexagonModel.getIndices()); + RawModel hexagonRawModel = loader.loadHexagon(hexagonModel); ModelTexture hexagonTexture = new ModelTexture(loader.loadTexture("white")); TexturedModel hexagontexturedModel = new TexturedModel(hexagonRawModel, hexagonTexture); Entity hexagonEntity = new Entity(hexagontexturedModel, new Vector3f(0,1,0), 0,0,0,1); diff --git a/client/src/main/java/core/engine/Loader.java b/client/src/main/java/core/engine/Loader.java index 143ed4c..50e3f21 100644 --- a/client/src/main/java/core/engine/Loader.java +++ b/client/src/main/java/core/engine/Loader.java @@ -1,5 +1,6 @@ package core.engine; +import core.engine.model.HexagonModel; import core.engine.model.RawModel; import core.engine.textures.Texture; import org.lwjgl.BufferUtils; @@ -29,6 +30,10 @@ public class Loader { return new RawModel(vaoID, indices.length); } + public RawModel loadHexagon(HexagonModel hexagonModel) { + return loadToVAO(hexagonModel.getVertices(), hexagonModel.getTextureCoords(), hexagonModel.getNormals(), hexagonModel.getIndices()); + } + public int loadTexture(String fileName) { Texture texture = new Texture("res/" + fileName + ".png"); int textureID = texture.getTextureID(); diff --git a/client/src/main/java/core/engine/terrain/Terrain.java b/client/src/main/java/core/engine/terrain/Terrain.java index 0486a38..f04a728 100644 --- a/client/src/main/java/core/engine/terrain/Terrain.java +++ b/client/src/main/java/core/engine/terrain/Terrain.java @@ -9,7 +9,6 @@ import java.util.List; public class Terrain { - private List terrainTiles = new ArrayList<>(); public Terrain(Loader loader, ModelTexture modelTexture) {