diff --git a/Projekte/.run/MdgaApp.run.xml b/Projekte/.run/MdgaApp.run.xml
deleted file mode 100644
index 4c60627e..00000000
--- a/Projekte/.run/MdgaApp.run.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 04dfb6d2..ffded4e9 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
@@ -28,7 +28,7 @@ public enum Asset {
ship(0.8f),
smallTent,
tank,
- world("Models/world/world_export_newTex.obj", "Models/world/world_diff.png",1.2f),
+ world(1.2f),
shieldRing("Models/shieldRing/shieldRing.j3o", null),
treeSmall(1.2f),
treeBig(1.2f),
@@ -39,10 +39,10 @@ public enum Asset {
shieldCard,
shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.png"),
dice,
- tankShoot("Models/tank/tank_shoot_bot.obj", "Models/tank/tank_diff.png"),
- tankShootTop("Models/tank/tank_shoot_top.obj", "Models/tank/tank_diff.png"),
- treesSmallBackground("Models/treeSmall/small_trees_background.obj", "Models/treeSmall/treeSmall_diff.png", 1.2f),
- treesBigBackground("Models/treeBig/big_trees_background.obj", "Models/treeBig/treeBig_diff.png", 1.2f),
+ tankShoot("Models/tank/tankShoot_bot.j3o", "Models/tank/tank_diff.png"),
+ tankShootTop("Models/tank/tankShoot_top.j3o", "Models/tank/tank_diff.png"),
+ treesSmallBackground("Models/treeSmall/treesSmallBackground.j3o", "Models/treeSmall/treeSmall_diff.png", 1.2f),
+ treesBigBackground("Models/treeBig/treesBigBackground.j3o", "Models/treeBig/treeBig_diff.png", 1.2f),
shell
;
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
index 2d53db04..bd258c59 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
@@ -156,6 +156,9 @@ else if(boardSelect != null) {
p = UUID.randomUUID();
gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID()));
gameView.getBoardHandler().movePieceStartAnim(p,0);
+ gameView.getGuiHandler().addCardOwn(BonusCard.SHIELD);
+ gameView.getGuiHandler().setSelectableCards(List.of(BonusCard.SHIELD));
+
// gameView.getBoardHandler().movePieceAnim(p,0, 8);
} else {
// gameView.getBoardHandler().throwBombAnim(p);
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 4c379be2..518feb52 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
@@ -128,7 +128,7 @@ public void simpleInitApp() {
gameView = new GameView(this);
ceremonyView = new CeremonyView(this);
- enter(MdgaState.GAME);
+ enter(MdgaState.MAIN);
}
/**
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 0baad3a8..f36eee69 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
@@ -85,12 +85,13 @@ private void handleGame(Notification notification) {
GuiHandler guiHandler = gameView.getGuiHandler();
BoardHandler boardHandler = gameView.getBoardHandler();
ModelSynchronizer modelSynchronizer = app.getModelSynchronize();
+ Color ownColor = gameView.getOwnColor();
if (notification instanceof AcquireCardNotification n) {
guiHandler.addCardOwn(n.getBonusCard());
} else if (notification instanceof ActivePlayerNotification n) {
gameView.getGuiHandler().setActivePlayer(n.getColor());
- boardHandler.showDice(n.getColor());
+ if(n.getColor() != ownColor) boardHandler.showDice(n.getColor());
} else if (notification instanceof CeremonyNotification ceremonyNotification) {
app.enter(MdgaState.CEREMONY);
CeremonyView ceremonyView = (CeremonyView) app.getView();
@@ -142,7 +143,7 @@ private void handleGame(Notification notification) {
} else if (notification instanceof NoShieldNotification n) {
boardHandler.unshieldPiece(n.getPieceId());
} else if (notification instanceof PlayCardNotification n) {
- if(n.getColor() == gameView.getOwnColor()) guiHandler.playCardOwn(n.getCard());
+ if(n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard());
else guiHandler.playCardEnemy(n.getColor(), n.getCard());
} else if (notification instanceof PlayerInGameNotification n) {
boardHandler.addPlayer(n.getColor(),n.getPiecesList());
@@ -151,7 +152,7 @@ private void handleGame(Notification notification) {
gameView.leaveInterrupt();
} else if (notification instanceof RollDiceNotification n) {
gameView.getGuiHandler().hideText();
- if(n.getColor() == gameView.getOwnColor()){
+ if(n.getColor() == ownColor){
guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1);
}
else {
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/CameraHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/CameraHandler.java
index 82e333d5..431f74a7 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/CameraHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/CameraHandler.java
@@ -102,15 +102,18 @@ public void init(Color ownColor) {
* and resets the camera position and rotation to its default state.
*/
public void shutdown() {
- app.getRootNode().removeLight(sun);
- app.getRootNode().removeLight(ambient);
+ init = false;
+ fpp.removeFilter(fxaaFilter);
+ fpp.removeFilter(ssaoFilter);
+ fpp.removeFilter(dlsf);
app.getRootNode().detachChild(sky);
+ app.getRootNode().removeLight(ambient);
+ app.getRootNode().removeLight(sun);
+
// Reset the camera to its default state
app.getCamera().setLocation(defaultCameraPosition);
app.getCamera().setRotation(defaultCameraRotation);
-
- fpp.removeFilter(dlsf);
}
/**
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/ActionTextHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/ActionTextHandler.java
index b5bd3571..cd5d1cba 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/ActionTextHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/ActionTextHandler.java
@@ -152,5 +152,4 @@ void rollRankingResultOwn(Color color, int eye){
void diceNow(){
createTopText("Klicke zum Würfeln", 5, 80, ColorRGBA.White, 0);
}
-
}
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
index 0f2eacbd..25d34f94 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
@@ -8,6 +8,7 @@
import com.jme3.math.Vector3f;
import com.jme3.post.FilterPostProcessor;
import com.jme3.post.filters.ComposeFilter;
+import com.jme3.post.filters.FXAAFilter;
import com.jme3.renderer.Camera;
import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort;
@@ -31,35 +32,46 @@ public class CardLayer extends AbstractAppState {
private List cardBuffer;
private final FilterPostProcessor fpp;
private final Camera overlayCam;
- Texture2D backTexture;
+ private Texture2D backTexture;
+ private FXAAFilter fxaaFilter;
+ private ViewPort view;
+ private DirectionalLightShadowFilter dlsf;
+ DirectionalLight sun;
+ ComposeFilter compose;
+
public CardLayer(FilterPostProcessor fpp, Camera overlayCam, Texture2D backTexture) {
this.overlayCam = overlayCam;
this.fpp = fpp;
- this.cardBuffer = new ArrayList<>();
- init = false;
this.backTexture = backTexture;
+ cardBuffer = new ArrayList<