From a3c5af58d70e759363497a8a07bd44e4b15f01ed Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 14 Nov 2024 23:24:12 +0100 Subject: [PATCH] Remove grid extend limits --- .../java/{ => pp/mdga/client}/Acoustic/AcousticHandler.java | 2 +- .../client/src/main/java/pp/mdga/client/Board/BoardView.java | 4 ---- .../client/src/main/java/pp/mdga/client/Board/MapLoader.java | 4 ++-- Projekte/settings.gradle | 3 --- 4 files changed, 3 insertions(+), 10 deletions(-) rename Projekte/mdga/client/src/main/java/{ => pp/mdga/client}/Acoustic/AcousticHandler.java (50%) diff --git a/Projekte/mdga/client/src/main/java/Acoustic/AcousticHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Acoustic/AcousticHandler.java similarity index 50% rename from Projekte/mdga/client/src/main/java/Acoustic/AcousticHandler.java rename to Projekte/mdga/client/src/main/java/pp/mdga/client/Acoustic/AcousticHandler.java index e9179802..21a7936a 100644 --- a/Projekte/mdga/client/src/main/java/Acoustic/AcousticHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Acoustic/AcousticHandler.java @@ -1,4 +1,4 @@ -package Acoustic; +package pp.mdga.client.Acoustic; public class AcousticHandler { } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java index c443369f..93287e32 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java @@ -12,7 +12,6 @@ public class BoardView { private static final float GRID_SIZE = 1.72f; private static final float GRID_ELEVATION = 0.0f; - private static final int GRID_EXTEND = 5; private static final String MAP_NAME = "circle_map.mdga"; private final MdgaApp mdgaApp; @@ -61,9 +60,6 @@ private Spatial createModel(Asset asset){ } private static Vector3f gridToWorld(int x, int y) { - assert(-GRID_EXTEND <= x && x <= GRID_EXTEND); - assert(-GRID_EXTEND <= y && y < GRID_EXTEND); - return new Vector3f(GRID_SIZE * x, GRID_SIZE * y, GRID_ELEVATION); } } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/MapLoader.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/MapLoader.java index fc60077c..16af95fd 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/MapLoader.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/MapLoader.java @@ -27,12 +27,12 @@ public List loadMap(String mapName) { if(entry.charAt(0) == '#') continue; String[] parts = entry.trim().split(" "); - assert(parts.length == 2); + if(parts.length != 2) throw new RuntimeException(); String assetName = parts[0]; String[] coordinates = parts[1].split(","); - assert(coordinates.length == 2); + if(coordinates.length != 2) throw new RuntimeException(); int x = Integer.parseInt(coordinates[0]); int y = Integer.parseInt(coordinates[1]); diff --git a/Projekte/settings.gradle b/Projekte/settings.gradle index 532a4d06..104d7419 100644 --- a/Projekte/settings.gradle +++ b/Projekte/settings.gradle @@ -34,6 +34,3 @@ } include 'mdga:client' findProject(':mdga:client')?.name = 'client' -include 'mdga:client' -findProject(':mdga:client')?.name = 'client' -