From 94ee786dc8bc6c3abd2a4659da95a8259289bb69 Mon Sep 17 00:00:00 2001 From: Felix Koppe Date: Thu, 14 Nov 2024 17:13:56 +0100 Subject: [PATCH] Minor work --- .../src/main/java/pp/mdga/client/Animation/Animation.java | 8 ++++---- .../java/pp/mdga/client/Animation/EmptyAnimation.java | 2 +- .../src/main/java/pp/mdga/client/Board/BoardView.java | 6 +++--- .../mdga/client/src/main/java/pp/mdga/client/MdgaApp.java | 6 ++---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java index 4d87c22e..0ca7adcb 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java @@ -1,7 +1,7 @@ package pp.mdga.client.Animation; -public interface Animation { - void play(); - void stop(); - boolean isOver(); +abstract class Animation { + abstract void play(); + abstract void stop(); + abstract boolean isOver(); } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java index ea914547..f67fd945 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java @@ -1,6 +1,6 @@ package pp.mdga.client.Animation; -public class EmptyAnimation implements Animation { +class EmptyAnimation implements Animation { @Override void play() { //nothing 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 e161993b..7bbd1f1e 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 @@ -7,7 +7,7 @@ public class BoardView { private static final float GRID_SIZE = 10.0f; private static final float GRID_ELEVATION = 0.0f; - private static final int GRID_EXTEND = 11; + private static final int GRID_EXTEND = 5; private PileControl drawPile = new PileControl(); private PileControl discardPile = new PileControl(); @@ -22,8 +22,8 @@ public class BoardView { } private static Vector3f gridToWorld(int x, int y) { - assert(0 <= x && x < GRID_EXTEND); - assert(0 <= y && y < GRID_EXTEND); + assert(-GRID_EXTEND <= x && x <= GRID_EXTEND); + assert(-GRID_EXTEND <= y && y < GRID_EXTEND); return new Vector3f(GRID_SIZE * x, GRID_ELEVATION, GRID_SIZE * y); } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java index 120a1a25..1567ee4f 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -65,8 +65,8 @@ public void simpleInitApp() { createModel(Asset.world); - System.out.println(Asset.node_normal.getModelPath()); - System.out.println(Asset.node_normal.getDiffPath()); + //System.out.println(Asset.node_normal.getModelPath()); + //System.out.println(Asset.node_normal.getDiffPath()); } @@ -88,6 +88,4 @@ private Spatial createModel(Asset asset){ public void simpleUpdate(float tpf) { //this method will be called every game tick and can be used to make updates } - - } }