diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java index 11a7dea9..3ea2a555 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java @@ -3,7 +3,7 @@ public enum Asset { bigTent, cardStack, - cir("Models/lcir/cir_newOrigin.obj"), + cir("Models/+cir/cir_newOrigin.obj"), heer("Models/heer/heer_newOrigin.obj"), jet, lw("Models/lw/lw_newOrigin.obj"), 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 8e4a417a..65943b74 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 @@ -53,6 +53,8 @@ public void simpleInitApp() { notificationSynchronizer = new NotificationSynchronizer(this); inputSynchronizer = new InputSynchronizer(this); modelSyncronizer = new ModelSyncronizer(this); + + enter(state); } @Override diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java index 97288ae8..0ae3da2e 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java @@ -1,5 +1,8 @@ package pp.mdga.client; +import pp.mdga.client.board.BoardHandler; +import pp.mdga.client.gui.GuiHandler; +import pp.mdga.client.view.CeremonyView; import pp.mdga.client.view.GameView; import pp.mdga.client.view.LobbyView; import pp.mdga.game.Color; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java index 6e1cd347..de7693e8 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java @@ -63,7 +63,6 @@ public void onEnter() { camera.init(); boardHandler.init(); guiHandler.init(); - continueButton.show(); @@ -84,8 +83,6 @@ public void onEnter() { @Override public void onLeave() { - continueButton.hide(); - camera.shutdown(); boardHandler.shutdown(); guiHandler.shutdown(); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ThrowPieceNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/ThrowPieceNotification.java index ad81f2f8..7fe09660 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ThrowPieceNotification.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/ThrowPieceNotification.java @@ -4,17 +4,14 @@ import java.util.UUID; -public class ThrowPieceNotification extends Notification{ +public class ThrowPieceNotification extends Notification { private UUID pieceId; /** * This constructor is used to create a new ThrowPieceNotification * - * @param pieceId1 the pieceId1 - * @param pieceId2 the pieceId2 - * @param nodeIndex the nodeIndex - * @param colorPiece2 the color + * @param pieceId the pieceId */ public ThrowPieceNotification(UUID pieceId) { this.pieceId = pieceId;