From 7bed6d5d01fe48281c670209d21695ac7a029b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Thu, 21 Mar 2024 16:50:58 +0100 Subject: [PATCH] Render Row of HexagonTerrainTiles --- client/src/main/java/core/engine/Engine.java | 15 ++++++++++++--- .../main/java/core/engine/terrain/Terrain.java | 7 +++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/client/src/main/java/core/engine/Engine.java b/client/src/main/java/core/engine/Engine.java index 499e01e..b131434 100644 --- a/client/src/main/java/core/engine/Engine.java +++ b/client/src/main/java/core/engine/Engine.java @@ -122,6 +122,14 @@ public class Engine { Light light = new Light(new Vector3f(0,0,-20), new Vector3f(1,1,1)); + + HexagonModel hexagonModel = new HexagonModel(); + RawModel hexagonRawModel = loader.loadToVAO(hexagonModel.getVertices(), hexagonModel.getTextureCoords(), hexagonModel.getNormals(), hexagonModel.getIndices()); + ModelTexture hexagonTexture = new ModelTexture(loader.loadTexture("white")); + TexturedModel hexagontexturedModel = new TexturedModel(hexagonRawModel, hexagonTexture); + + //Entity entity = new Entity(hexagontexturedModel, new Vector3f(1.7319988f,0,0), 0,0,0,1f); + // Run the rendering loop until the user has attempted to close // the window or has pressed the ESCAPE key. MasterRenderer renderer = new MasterRenderer(); @@ -204,12 +212,13 @@ public class Engine { public void invoke(long window, int key, int scancode, int action, int mods) { if(key == GLFW_KEY_A) { //move camera to left - + /*entity.increasePosition(0.001f, 0, 0); + System.out.println(entity.getPosition());*/ } if(key == GLFW_KEY_D) { - //move camera to right - camera.moveRight(); + /*entity.increasePosition(-0.001f, 0, 0); + System.out.println(entity.getPosition());*/ } if(key == GLFW_KEY_W) { diff --git a/client/src/main/java/core/engine/terrain/Terrain.java b/client/src/main/java/core/engine/terrain/Terrain.java index 984418c..41275c6 100644 --- a/client/src/main/java/core/engine/terrain/Terrain.java +++ b/client/src/main/java/core/engine/terrain/Terrain.java @@ -26,9 +26,12 @@ public class Terrain { ModelTexture hexagonTexture = new ModelTexture(loader.loadTexture("white")); TexturedModel hexagontexturedModel = new TexturedModel(hexagonRawModel, hexagonTexture); - TerrainTile terrainTile = new TerrainTile(hexagontexturedModel, new Vector3f(1.3f,0,0.68f), 0,0,0,0.075f); List generatedTerrainTiles = new ArrayList<>(); - generatedTerrainTiles.add(terrainTile); + for(int x=-16; x<16; x++) { + generatedTerrainTiles.add(new TerrainTile(hexagontexturedModel, new Vector3f(x * 1.7319988f , 0, 0), 0, 0, 0,1)); + } + + System.out.println(31 * 1.7319988f); return new Terrain(generatedTerrainTiles); }