added some logic to the tests

merge dev into test

See merge request progproj/gruppen-ht24/Gruppe-01!33

.gitignore

@@ -1,5 +1,3 @@
-
-.run/
 .gradle
 build/
 #!gradle/wrapper/gradle-wrapper.jar

Projekte/.run/MdgaApp.run.xml

@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MdgaApp" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-20" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="MAIN_CLASS_NAME" value="pp.mdga.client.MdgaApp" />
+    <module name="Projekte.mdga.client.main" />
+    <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=logging.properties -ea" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="pp.mdga.client.board.outline.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java

@@ -0,0 +1,4 @@
+package pp.battleship.game.client;
+
+public class AnimationState {
+}

Projekte/mdga/client/build.gradle

@@ -26,14 +26,3 @@ implementation project(":mdga:model")
     mainClass = 'pp.mdga.client.MdgaApp'
     applicationName = 'MDGA'
 }
-
-tasks.register('fatJar', Jar) {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    manifest {
-        attributes 'Main-Class': 'pp.mdga.client.MdgaApp'
-    }
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    with jar
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java

@@ -11,7 +11,6 @@ public enum Asset {
     cir,
     heer,
     jet,
-    jet_noGear("Models/jet/jet_noGear.j3o", "Models/jet/jet_diff.png"),
     lw,
     marine,
     node_home_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"),
@@ -31,21 +30,16 @@ public enum Asset {
     tank,
     world(1.2f),
     shieldRing("Models/shieldRing/shieldRing.j3o", null),
-    treeSmall(1.2f),
-    treeBig(1.2f),
+    treeSmall,
+    treeBig,
     turboCard,
-    turboSymbol("Models/turboCard/turboSymbol.j3o", "Models/turboCard/turboCard_diff.png"),
+    turboSymbol("Models/turboCard/turboSymbol.j3o", "Models/turboCard/turboCard_diff.j3o"),
     swapCard,
-    swapSymbol("Models/swapCard/swapSymbol.j3o", "Models/swapCard/swapCard_diff.png"),
+    swapSymbol("Models/swapCard/swapSymbol.j3o", "Models/swapCard/swapCard_diff.j3o"),
     shieldCard,
-    shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.png"),
-    dice,
-    missile("Models/missile/AVMT300.obj", "Models/missile/texture.jpg", 0.1f),
-    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;
+    shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.j3o"),
+    dice
+    ;
 
     private final String modelPath;
     private final String diffPath;
@@ -82,8 +76,7 @@ public enum Asset {
     Asset(String modelPath) {
         String folderFileName = "./" + ROOT + name() + "/" + name();
         this.modelPath = modelPath;
-        this.diffPath = folderFileName + "_diff.png";
-        ;
+        this.diffPath = folderFileName + "_diff.png";;
         this.size = 1f;
     }
 
@@ -106,7 +99,7 @@ public enum Asset {
      * @param diffPath  Path to the diffuse texture file.
      * @param size      Scaling factor for the asset.
      */
-    Asset(String modelPath, String diffPath, float size) {
+    Asset(String modelPath, String diffPath, float size){
         this.modelPath = modelPath;
         this.diffPath = diffPath;
         this.size = size;

Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java

@@ -12,17 +12,21 @@
 import com.jme3.renderer.Camera;
 import com.jme3.scene.Node;
 import com.jme3.scene.control.AbstractControl;
+import com.jme3.scene.control.Control;
 import pp.mdga.client.board.NodeControl;
 import pp.mdga.client.board.OutlineControl;
-import pp.mdga.client.board.OutlineOEControl;
 import pp.mdga.client.board.PieceControl;
 import pp.mdga.client.gui.CardControl;
 import pp.mdga.client.gui.DiceControl;
 import pp.mdga.client.view.GameView;
+import pp.mdga.game.BonusCard;
 import pp.mdga.game.Color;
+import pp.mdga.game.Piece;
+import pp.mdga.notification.FinishNotification;
+import pp.mdga.notification.MovePieceNotification;
+import pp.mdga.notification.SelectableCardsNotification;
 
 import java.util.List;
-import java.util.UUID;
 
 public class InputSynchronizer {
 
@@ -33,12 +37,7 @@ public class InputSynchronizer {
     private float rotationAngle = 180f;
     private int scrollValue = 0;
     private CardControl hoverCard;
-    private OutlineOEControl hoverPiece;
-
-    private boolean clickAllowed = true;
-
-    private boolean isRotateLeft = false;
-    private boolean isRotateRight = false;
+    private PieceControl hoverPiece;
 
     /**
      * Constructor initializes the InputSynchronizer with the application context.
@@ -55,23 +54,6 @@ public class InputSynchronizer {
         setupInput();
     }
 
-    /**
-     * Updates the rotation angle based on user input.
-     *
-     * @param tpf The time per frame.
-     */
-    public void update(float tpf) {
-        if (isRotateLeft && isRotateRight) {
-            return;
-        }
-        if (isRotateLeft) {
-            rotationAngle += 180 * tpf;
-        }
-        if (isRotateRight) {
-            rotationAngle -= 180 * tpf;
-        }
-    }
-
     /**
      * Configures input mappings for various actions and binds them to listeners.
      */
@@ -79,23 +61,22 @@ private void setupInput() {
         inputManager.addMapping("Settings", new KeyTrigger(KeyInput.KEY_ESCAPE));
         inputManager.addMapping("Forward", new KeyTrigger(KeyInput.KEY_RETURN));
 
-        inputManager.addMapping("Left", new KeyTrigger(KeyInput.KEY_Q));
-        inputManager.addMapping("Right", new KeyTrigger(KeyInput.KEY_E));
-
         inputManager.addMapping("RotateRightMouse", new MouseButtonTrigger(MouseInput.BUTTON_RIGHT));
         inputManager.addMapping("MouseLeft", new MouseAxisTrigger(MouseInput.AXIS_X, false)); // Left movement
         inputManager.addMapping("MouseRight", new MouseAxisTrigger(MouseInput.AXIS_X, true)); // Right movement
+        inputManager.addMapping("MouseVertical", new MouseAxisTrigger(MouseInput.AXIS_Y, false), new MouseAxisTrigger(MouseInput.AXIS_Y, true)); //Mouse Up Down movement
         inputManager.addMapping("MouseScrollUp", new MouseAxisTrigger(MouseInput.AXIS_WHEEL, false)); // Scroll up
         inputManager.addMapping("MouseScrollDown", new MouseAxisTrigger(MouseInput.AXIS_WHEEL, true)); // Scroll down
         inputManager.addMapping("Test", new KeyTrigger(KeyInput.KEY_J));
         inputManager.addMapping("Click", new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
 
 
-        inputManager.addListener(actionListener, "Settings", "Forward", "RotateRightMouse", "Click", "Left", "Right", "Test");
+        inputManager.addListener(actionListener, "Settings", "Forward", "RotateRightMouse", "Click", "Test");
         inputManager.addListener(analogListener, "MouseLeft", "MouseRight", "MouseScrollUp", "MouseScrollDown");
     }
 
-    UUID p = null;
+    private boolean test = false;
+
     /**
      * Handles action-based input events such as key presses and mouse clicks.
      */
@@ -111,65 +92,42 @@ public void onAction(String name, boolean isPressed, float tpf) {
             if (name.equals("RotateRightMouse")) {
                 rightMousePressed = isPressed;
             }
-            if (name.equals("Click") && isPressed) {
-                if (!clickAllowed) {
-                    return;
-                }
-
+            if(name.equals("Click") && isPressed) {
                 if (app.getView() instanceof GameView gameView) {
                     DiceControl diceSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayerRootNode(), DiceControl.class);
                     CardControl cardLayerSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayerRootNode(), CardControl.class);
-                    OutlineOEControl boardSelect = checkHover(app.getCamera(), app.getRootNode(), OutlineOEControl.class);
+                    OutlineControl boardSelect = checkHover(app.getCamera(), app.getRootNode(), OutlineControl.class);
 
-                    if (diceSelect != null) {
+                    if(diceSelect != null) {
                         app.getModelSynchronize().rolledDice();
-                    } else if (cardLayerSelect != null) {
+                    }
+                    else if(cardLayerSelect != null) {
                         //cardSelect
-                        if (cardLayerSelect.isSelectable()) gameView.getGuiHandler().selectCard(cardLayerSelect);
-                    } else if (boardSelect != null) {
+                        if(cardLayerSelect.isSelectable()) gameView.getGuiHandler().selectCard(cardLayerSelect);
+                    }
+                    else if(boardSelect != null) {
                         //boardSelect
-                        if (boardSelect.isSelectable()) gameView.getBoardHandler().pieceSelect(boardSelect);
-                    } else {
+                        if(boardSelect instanceof PieceControl pieceControl){
+                            if(pieceControl.isSelectable()) gameView.getBoardHandler().pieceSelect(pieceControl);
+                        }
+                        if(boardSelect instanceof NodeControl nodeControl){
+//
+                        }
+                    }
+                    else {
                         //both null
                     }
                 }
 
 
             }
-            if (name.equals("Left")) {
-                isRotateLeft = !isRotateLeft;
-            }
-            if (name.equals("Right")) {
-                isRotateRight = !isRotateRight;
-            }
-            if (name.equals("Test2") && isPressed) {
-                if (app.getView() instanceof GameView gameView) {
-
-                    if (p == null) {
-                        p = UUID.randomUUID();
-                        gameView.getBoardHandler().addPlayer(Color.AIRFORCE, List.of(p, UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()));
-                        gameView.getBoardHandler().movePieceStartAnim(p, 0);
-                        gameView.getBoardHandler().outlineMove(List.of(p), List.of(2), List.of(false));
-                        //gameView.getBoardHandler().movePieceAnim(p,0, 8);
-                    } else {
-                        gameView.getBoardHandler().throwPiece(p, Color.ARMY);
-                        //gameView.getBoardHandler().movePieceStartAnim(p,0);
-                    }
-
+            if(name.equals("Test") &&isPressed){
+                if(app.getView() instanceof GameView gameView){
 //                    gameView.getGuiHandler().rollRankingResult(Color.AIRFORCE, 1);
 //                    gameView.getGuiHandler().rollRankingResult(Color.ARMY, 2);
 //                    gameView.getGuiHandler().rollRankingResult(Color.NAVY, 3);
 //                    gameView.getGuiHandler().rollRankingResult(Color.CYBER, 4);
-//                    gameView.getGuiHandler().showDice();
-//                    UUID p1 = UUID.randomUUID();
-
-//                    gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p1,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID()));
-//                    gameView.getBoardHandler().movePieceStartAnim(p1,0);
-                    //gameView.getGuiHandler().drawCard(Color.ARMY);
-                    //gameView.getGuiHandler().addCardOwn(BonusCard.SHIELD);
-                    //gameView.getGuiHandler().playCardOwn(BonusCard.SHIELD);
-
-
+                    gameView.getGuiHandler().showDice();
                 }
             }
         }
@@ -183,13 +141,17 @@ public void onAction(String name, boolean isPressed, float tpf) {
         public void onAnalog(String name, float value, float tpf) {
             if (name.equals("MouseLeft") && rightMousePressed) {
                 rotationAngle -= value * 360f;
-            } else if (name.equals("MouseRight") && rightMousePressed) {
+            }
+            else if (name.equals("MouseRight") && rightMousePressed) {
                 rotationAngle += value * 360f;
-            } else if (name.equals("MouseScrollUp")) {
+            }
+            else if (name.equals("MouseScrollUp")) {
                 scrollValue = Math.max(1, scrollValue - 5);
-            } else if (name.equals("MouseScrollDown")) {
+            }
+            else if (name.equals("MouseScrollDown")) {
                 scrollValue = Math.min(100, scrollValue + 5);
-            } else if (name.equals("MouseLeft") || name.equals("MouseRight") || name.equals("MouseVertical")) {
+            }
+            else if (name.equals("MouseLeft") || name.equals("MouseRight") || name.equals("MouseVertical")){
                 hoverPiece();
                 hoverCard();
             }
@@ -200,13 +162,12 @@ public void onAnalog(String name, float value, float tpf) {
      * Detects the hovered piece and updates its hover state.
      */
     private <T extends AbstractControl> T checkHover(Camera cam, Node root, Class<T> controlType) {
-        if (cam == null || root == null || controlType == null) return null;
+        if(cam == null || root == null || controlType == null) return null;
         CollisionResults results = new CollisionResults();
         Ray ray = new Ray(cam.getLocation(), getMousePos(cam).subtract(cam.getLocation()).normalize());
         root.collideWith(ray, results);
-        for (CollisionResult collisionResult : results) {
-            if (collisionResult.getGeometry().getControl(controlType) != null)
-                return collisionResult.getGeometry().getControl(controlType);
+        for(CollisionResult collisionResult : results){
+            if(collisionResult.getGeometry().getControl(controlType) != null) return collisionResult.getGeometry().getControl(controlType);
         }
         return null;
     }
@@ -215,16 +176,16 @@ private <T extends AbstractControl> T checkHover(Camera cam, Node root, Class<T>
      * Detects the hovered card and updates its hover state.
      */
     private <T extends AbstractControl> T checkHoverOrtho(Camera cam, Node root, Class<T> controlType) {
-        if (cam == null || root == null || controlType == null) return null;
+        if(cam == null || root == null || controlType == null) return null;
         CollisionResults results = new CollisionResults();
         Vector3f mousePos = getMousePos(cam);
         mousePos.setZ(cam.getLocation().getZ());
         Ray ray = new Ray(mousePos, getMousePos(cam).subtract(mousePos).normalize());
         root.collideWith(ray, results);
         if (results.size() > 0) {
-            for (CollisionResult res : results) {
+            for(CollisionResult res : results ){
                 T control = res.getGeometry().getControl(controlType);
-                if (control != null) return control;
+                if(control != null) return control;
             }
         }
         return null;
@@ -236,15 +197,15 @@ private <T extends AbstractControl> T checkHoverOrtho(Camera cam, Node root, Cla
      */
     private void hoverPiece() {
         if (app.getView() instanceof GameView gameView) {
-            OutlineOEControl control = checkPiece();
+            PieceControl control = checkPiece();
             if (control != null) {
                 if (control != hoverPiece) {
-                    pieceOff(gameView);
+                    pieceOff();
                     hoverPiece = control;
-                    if(hoverPiece.isHoverable()) gameView.getBoardHandler().hoverOn(hoverPiece);
+                    hoverPiece.hover();
                 }
             } else {
-                pieceOff(gameView);
+                pieceOff();
             }
         }
     }
@@ -260,7 +221,7 @@ private void hoverCard() {
                 if (control != hoverCard) {
                     cardOff();
                     hoverCard = control;
-                    hoverCard.hoverOn();
+                    hoverCard.hover();
                 }
             } else {
                 cardOff();
@@ -273,8 +234,8 @@ private void hoverCard() {
      *
      * @return The PieceControl of the hovered piece, or null if no piece is hovered.
      */
-    private OutlineOEControl checkPiece() {
-        return checkHover(app.getCamera(), app.getRootNode(), OutlineOEControl.class);
+    private PieceControl checkPiece() {
+        return checkHover(app.getCamera(), app.getRootNode(), PieceControl.class);
     }
 
     /**
@@ -285,19 +246,17 @@ private OutlineOEControl checkPiece() {
      */
     private CardControl checkCard(GameView gameView) {
         return checkHoverOrtho(
-                gameView.getGuiHandler().getCardLayerCamera(),
-                gameView.getGuiHandler().getCardLayerRootNode(),
-                CardControl.class
+            gameView.getGuiHandler().getCardLayerCamera(),
+            gameView.getGuiHandler().getCardLayerRootNode(),
+            CardControl.class
         );
     }
 
     /**
      * Disables the hover effect on the currently hovered piece, if any.
      */
-    private void pieceOff(GameView gameView) {
-        if (hoverPiece != null) {
-            if(hoverPiece.isHoverable()) gameView.getBoardHandler().hoverOff(hoverPiece);
-        }
+    private void pieceOff() {
+        if (hoverPiece != null) hoverPiece.hoverOff();
         hoverPiece = null;
     }
 
@@ -331,7 +290,7 @@ public float getRotation() {
         return (rotationAngle / 2) % 360;
     }
 
-    public void setRotation(float rotationAngle) {
+    public void setRotation(float rotationAngle){
         this.rotationAngle = rotationAngle;
     }
 
@@ -343,12 +302,4 @@ public void setRotation(float rotationAngle) {
     public int getScroll() {
         return scrollValue;
     }
-
-    public void setClickAllowed(boolean allowed) {
-        clickAllowed = allowed;
-    }
-
-    public boolean isClickAllowed() {
-        return clickAllowed;
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java

@@ -4,11 +4,10 @@
 import com.jme3.system.AppSettings;
 import com.simsilica.lemur.GuiGlobals;
 import pp.mdga.client.acoustic.AcousticHandler;
-import pp.mdga.client.animation.TimerManager;
 import pp.mdga.client.dialog.JoinDialog;
 import pp.mdga.client.view.*;
 
-import java.awt.*;
+import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.prefs.Preferences;
@@ -21,80 +20,47 @@ public class MdgaApp extends SimpleApplication {
 
     private static Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
 
-    /**
-     * Handles acoustic effects and state-based sounds.
-     */
+    /** Handles acoustic effects and state-based sounds. */
     private AcousticHandler acousticHandler;
 
-    /**
-     * Synchronizes notifications throughout the application.
-     */
+    /** Synchronizes notifications throughout the application. */
     private NotificationSynchronizer notificationSynchronizer;
 
-    /**
-     * Manages input events and synchronization.
-     */
+    /** Manages input events and synchronization. */
     private InputSynchronizer inputSynchronizer;
 
-    /**
-     * Synchronizes game models.
-     */
+    /** Synchronizes game models. */
     private ModelSynchronizer modelSynchronizer;
 
-    /**
-     * The currently active view in the application.
-     */
+    /** The currently active view in the application. */
     private MdgaView view = null;
 
-    /**
-     * The current state of the application.
-     */
+    /** The current state of the application. */
     private MdgaState state = null;
 
-    /**
-     * Scale for rendering images.
-     */
-    private final float imageScale = prefs.getInt("scale", 1);
+    /** Scale for rendering images. */
+    private float imageScale = prefs.getInt("scale", 1);
 
-    /**
-     * The main menu view.
-     */
-    private MainView mainView;
+    /** The main menu view. */
+    private MdgaView mainView;
 
-    /**
-     * The lobby view.
-     */
-    private LobbyView lobbyView;
+    /** The lobby view. */
+    private MdgaView lobbyView;
 
-    /**
-     * The game view.
-     */
-    private GameView gameView;
+    /** The game view. */
+    private MdgaView gameView;
 
-    /**
-     * The ceremony view.
-     */
-    private CeremonyView ceremonyView;
+    /** The ceremony view. */
+    private MdgaView ceremonyView;
 
-    /**
-     * The client game logic.
-     */
+    /** The client game logic. */
     private final ClientGameLogic clientGameLogic;
 
     private ExecutorService executor;
 
     private ServerConnection networkConnection;
 
-    private final TimerManager timerManager = new TimerManager();
-
-
-    public static final int DEBUG_MULTIPLIER = 1;
-
-    /**
-     * Constructs a new MdgaApp instance.
-     * Initializes the network connection and client game logic.
-     */
-    public MdgaApp() {
+    private MdgaApp() {
         networkConnection = new NetworkSupport(this);
         this.clientGameLogic = new ClientGameLogic(networkConnection);
     }
@@ -108,30 +74,15 @@ public MdgaApp() {
     public static void main(String[] args) {
         AppSettings settings = new AppSettings(true);
         settings.setSamples(128);
-
-        if (prefs.getBoolean("fullscreen", false)) {
-            Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-            int screenWidth = (int) screenSize.getWidth();
-            int screenHeight = (int) screenSize.getHeight();
-
-            settings.setResolution(screenWidth, screenHeight);
-
-            settings.setFullscreen(true);
-        } else {
-            settings.setWidth(prefs.getInt("width", 1280));
-            settings.setHeight(prefs.getInt("height", 720));
-        }
-
+        settings.setWidth(prefs.getInt("width", 1280));
+        settings.setHeight(prefs.getInt("height", 720));
         settings.setCenterWindow(true);
         settings.setVSync(false);
-        settings.setTitle("MDGA");
-        settings.setVSync(true);
+
         MdgaApp app = new MdgaApp();
         app.setSettings(settings);
         app.setShowSettings(false);
         app.setPauseOnLostFocus(false);
-        app.setDisplayStatView(false);
-
         app.start();
     }
 
@@ -169,8 +120,6 @@ public void simpleUpdate(float tpf) {
         view.update(tpf);
         acousticHandler.update();
         notificationSynchronizer.update();
-        inputSynchronizer.update(tpf);
-        timerManager.update(tpf);
     }
 
     /**
@@ -276,22 +225,14 @@ public NotificationSynchronizer getNotificationSynchronizer() {
      * Prepares the app for a new game cycle.
      */
     public void setup() {
+
     }
 
-    /**
-     * Gets the client game logic.
-     *
-     * @return the {@link ClientGameLogic} instance
-     */
     public ClientGameLogic getGameLogic() {
         return clientGameLogic;
     }
 
-    /**
-     * Gets the executor service.
-     *
-     * @return the {@link ExecutorService} instance
-     */
+
     public ExecutorService getExecutor() {
         if (this.executor == null) {
             this.executor = Executors.newCachedThreadPool();
@@ -300,117 +241,34 @@ public ExecutorService getExecutor() {
         return this.executor;
     }
 
-    /**
-     * Gets the network connection.
-     *
-     * @return the {@link ServerConnection} instance
-     */
-    public ServerConnection getNetworkSupport() {
+    public ServerConnection getNetworkSupport(){
         return networkConnection;
     }
 
-    /**
-     * Updates the resolution settings.
-     *
-     * @param width the new width
-     * @param height the new height
-     * @param imageFactor the new image factor
-     * @param isFullscreen whether the game is in fullscreen mode
-     */
-    public void updateResolution(int width, int height, float imageFactor, boolean isFullscreen) {
-        if (isFullscreen) {
-            int baseWidth = 1280;
-            int baseHeight = 720;
-            float baseAspectRatio = (float) baseWidth / baseHeight;
-            float newAspectRatio = (float) width / height;
+    public void updateResolution(int width, int height, float imageFactor) {
+        prefs.putInt("width", width);
+        prefs.putInt("height", height);
+        prefs.putFloat("scale", imageFactor);
 
-            float scaleFactor = Math.max((float) width / baseWidth, (float) height / baseHeight);
-
-            Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-            int screenWidth = (int) screenSize.getWidth();
-            int screenHeight = (int) screenSize.getHeight();
-            settings.setResolution(screenWidth, screenHeight);
-            settings.setFullscreen(true);
-
-            prefs.putFloat("scale", scaleFactor);
-            prefs.putBoolean("fullscreen", true);
-        } else {
-            prefs.putInt("width", width);
-            prefs.putInt("height", height);
-            prefs.putFloat("scale", imageFactor);
-            prefs.putBoolean("fullscreen", false);
-        }
-    }
-
-    /**
-     * Restarts the application.
-     */
-    public static void restartApp() {
         try {
-            String javaBin = System.getProperty("java.home") + "/bin/java";
-            String classPath = System.getProperty("java.class.path");
-            String className = System.getProperty("sun.java.command");
-
-            ProcessBuilder builder = new ProcessBuilder(
-                    javaBin, "-cp", classPath, className
-            );
-
-            builder.start();
-
-            System.exit(0);
+            restartApp();
         } catch (Exception e) {
-            throw new RuntimeException("restart failed");
+            //nothing
         }
     }
 
-    /**
-     * Cleans up the application after a game.
-     */
-    public void afterGameCleanup() {
-        MainView main = (MainView) mainView;
+    public static void restartApp() throws IOException {
+        String javaBin = System.getProperty("java.home") + "/bin/java";
+        String classPath = System.getProperty("java.class.path");
+        String className = System.getProperty("sun.java.command");
 
-        main.getJoinDialog().disconnect();
-        if (clientGameLogic.isHost()) {
-            main.getHostDialog().shutdownServer();
-        }
+        ProcessBuilder builder = new ProcessBuilder(
+            javaBin, "-cp", classPath, className
+        );
 
-        ceremonyView.afterGameCleanup();
-    }
+        builder.start();
 
-    /**
-     * Gets the game view.
-     *
-     * @return the {@link GameView} instance
-     */
-    public GameView getGameView() {
-        return gameView;
-    }
-
-    /**
-     * Gets the timer manager.
-     *
-     * @return the {@link TimerManager} instance
-     */
-    public TimerManager getTimerManager() {
-        return timerManager;
-    }
-
-    /**
-     * Gets the ceremony view.
-     *
-     * @return the {@link CeremonyView} instance
-     */
-    public CeremonyView getCeremonyView() {
-        return ceremonyView;
-    }
-
-    @Override
-    public void destroy() {
-        afterGameCleanup();
-        if (executor != null) {
-            executor.shutdown();
-        }
-        super.destroy();
+        System.exit(0);
     }
 }
 

Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java

@@ -1,243 +1,148 @@
 package pp.mdga.client;
 
+import pp.mdga.client.acoustic.MdgaSound;
+import pp.mdga.client.server.MdgaServer;
+import pp.mdga.client.view.CeremonyView;
 import pp.mdga.client.view.GameView;
+import pp.mdga.client.view.LobbyView;
 import pp.mdga.game.BonusCard;
 import pp.mdga.game.Color;
+import pp.mdga.message.client.LobbyReadyMessage;
+import pp.mdga.notification.AcquireCardNotification;
+import pp.mdga.notification.DrawCardNotification;
+import pp.mdga.notification.TskSelectNotification;
 
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * The ModelSynchronizer class is responsible for synchronizing the model state with the view and game logic.
- */
 public class ModelSynchronizer {
     private static final Logger LOGGER = Logger.getLogger(ModelSynchronizer.class.getName());
     private MdgaApp app;
 
     private UUID a;
     private UUID b;
-    private BonusCard card;
+    private  BonusCard card;
     private boolean swap;
 
-    /**
-     * Constructor for ModelSynchronizer.
-     *
-     * @param app the MdgaApp instance
-     */
     ModelSynchronizer(MdgaApp app) {
         this.app = app;
         swap = false;
     }
 
-    /**
-     * Handles the end of an animation.
-     */
     public void animationEnd() {
-        if (app.getNotificationSynchronizer().waitForAnimation) {
-            app.getNotificationSynchronizer().waitForAnimation = false;
-        } else {
-            app.getGameLogic().selectAnimationEnd();
-        }
+        app.getGameLogic().selectAnimationEnd();
     }
 
-    /**
-     * Selects a piece or swap based on the current state.
-     *
-     * @param a the first UUID
-     * @param b the second UUID
-     */
-    public void select(UUID a, UUID b) {
-        if (swap) selectSwap(a, b);
+    public void select(UUID a, UUID b){
+        if(swap) selectSwap(a,b);
         else selectPiece(a);
     }
 
-    /**
-     * Selects a swap between two pieces.
-     *
-     * @param a the first UUID
-     * @param b the second UUID
-     */
     public void selectSwap(UUID a, UUID b) {
+        // TODO call from somewhere
         LOGGER.log(Level.INFO, "selectPiece");
         this.a = a;
         this.b = b;
 
         GameView gameView = (GameView) app.getView();
-        if (a != null && b != null) {
+        if(a != null && b != null) {
             gameView.needConfirm();
         } else {
             gameView.noConfirm();
         }
     }
 
-    /**
-     * Selects a single piece.
-     *
-     * @param piece the UUID of the piece
-     */
     public void selectPiece(UUID piece) {
+        // TODO call from somewhere
         LOGGER.log(Level.INFO, "selectPiece");
 
         this.a = piece;
 
         GameView gameView = (GameView) app.getView();
-        if (piece != null) {
+        if(piece != null) {
             gameView.needConfirm();
         } else {
             gameView.noConfirm();
         }
     }
 
-    /**
-     * Selects a bonus card.
-     *
-     * @param card the BonusCard instance
-     */
     public void selectCard(BonusCard card) {
+        // TODO call from somewhere
         LOGGER.log(Level.INFO, "selectCard");
 
         this.card = card;
 
         GameView gameView = (GameView) app.getView();
-
-        if (card != null) {
+        if(card != null) {
             gameView.needConfirm();
         } else {
-            gameView.showNoPower();
+            gameView.noConfirm();
         }
     }
 
-    /**
-     * Confirms the current selection.
-     */
     public void confirm() {
         LOGGER.log(Level.INFO, "confirm");
 
         GameView gameView = (GameView) app.getView();
 
-        gameView.getGuiHandler().hideText();
-
-        if (a != null && b != null) {
-            app.getGameLogic().selectPiece(a);
-            app.getGameLogic().selectPiece(b);
+        if(a != null && b != null) {
+            selectPiece(a);
+            selectPiece(b);
             gameView.getBoardHandler().clearSelectable();
         } else if (a != null) {
-            app.getGameLogic().selectPiece(a);
+            selectPiece(a);
             gameView.getBoardHandler().clearSelectable();
-        } else {
-            app.getGameLogic().selectCard(card);
+        } else if (card != null){
+            selectCard(card);
             gameView.getGuiHandler().clearSelectableCards();
+        } else {
+            throw new RuntimeException("nothing to confirm");
         }
 
-        a = null;
-        b = null;
-        card = null;
-
         gameView.noConfirm();
-        gameView.hideNoPower();
     }
 
-    /**
-     * Selects a TSK color.
-     *
-     * @param color the Color instance
-     */
     public void selectTsk(Color color) {
         app.getGameLogic().selectTsk(color);
     }
 
-    /**
-     * Unselects a TSK color.
-     *
-     * @param color the Color instance
-     */
     public void unselectTsk(Color color) {
         app.getGameLogic().deselectTSK(color);
     }
 
-    /**
-     * Handles the event of rolling dice.
-     */
     public void rolledDice() {
         app.getGameLogic().selectDice();
     }
 
-    /**
-     * Sets the player's name.
-     *
-     * @param name the player's name
-     */
     public void setName(String name) {
+        // TODO call from somewhere
         LOGGER.log(Level.INFO, "setName: {0}", name);
         app.getGameLogic().selectName(name);
     }
 
-    /**
-     * Sets the player's ready status.
-     *
-     * @param ready the ready status
-     */
     public void setReady(boolean ready) {
         app.getGameLogic().selectReady(ready);
     }
 
-    /**
-     * Sets the host port.
-     *
-     * @param port the host port
-     */
     public void setHost(int port) {
         app.getGameLogic().selectJoin("");
     }
 
-    /**
-     * Sets the join IP and port.
-     *
-     * @param ip the IP address
-     * @param port the port number
-     */
     public void setJoin(String ip, int port) {
         app.getGameLogic().selectJoin(ip);
     }
 
-    /**
-     * Handles the event of leaving the game.
-     */
     public void leave() {
         app.getGameLogic().selectLeave();
     }
 
-    /**
-     * Enters a specific game state.
-     *
-     * @param state the MdgaState instance
-     */
     public void enter(MdgaState state) {
         LOGGER.log(Level.INFO, "enter: {0}", state);
         //app.enter(state);
     }
 
-    /**
-     * Proceeds to the next game state.
-     */
-    public void next() {
-        app.getGameLogic().selectNext();
-    }
-
-    /**
-     * Sets the swap state.
-     *
-     * @param swap the swap state
-     */
-    public void setSwap(boolean swap) {
+    public void setSwap(boolean swap){
         this.swap = swap;
     }
-
-    /**
-     * Forces an action.
-     */
-    public void force() {
-        // Implementation needed
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/NetworkSupport.java

@@ -6,47 +6,23 @@
 
 import java.io.IOException;
 
-/**
- * The NetworkSupport class provides support for network communication between the client and server.
- * It implements the MessageListener and ClientStateListener interfaces to handle incoming messages
- * and client state changes, respectively.
- */
 public class NetworkSupport implements MessageListener<Client>, ClientStateListener, ServerConnection {
-
     private static final System.Logger LOGGER = System.getLogger(NetworkSupport.class.getName());
     private final MdgaApp app;
     private Client client;
 
-    /**
-     * Constructor for NetworkSupport.
-     *
-     * @param app the MdgaApp instance
-     */
     public NetworkSupport(MdgaApp app) {
         this.app = app;
     }
 
-    /**
-     * Returns the MdgaApp instance.
-     *
-     * @return the MdgaApp instance
-     */
     public MdgaApp getApp() {
         return this.app;
     }
 
-    /**
-     * Returns whether the client is connected to the server.
-     *
-     * @return true if the client is connected, false otherwise
-     */
     public boolean isConnected() {
         return this.client != null && this.client.isConnected();
     }
 
-    /**
-     * Connects the client to the server.
-     */
     public void connect() {
         if (this.client != null) {
             throw new IllegalStateException("trying to join a game again");
@@ -60,9 +36,6 @@ public void connect() {
 
     }
 
-    /**
-     * Disconnects the client from the server.
-     */
     public void disconnect() {
         if (this.client != null) {
             this.client.close();
@@ -71,13 +44,6 @@ public void disconnect() {
         }
     }
 
-    /**
-     * Initializes the network connection to the server.
-     *
-     * @param host the server host
-     * @param port the server port
-     * @throws IOException if an I/O error occurs
-     */
     public void initNetwork(String host, int port) throws IOException {
         if (this.client != null) {
             throw new IllegalStateException("trying to join a game again");
@@ -89,12 +55,6 @@ public void initNetwork(String host, int port) throws IOException {
         }
     }
 
-    /**
-     * Handles incoming messages from the server.
-     *
-     * @param client the client
-     * @param message the message
-     */
     public void messageReceived(Client client, Message message) {
         LOGGER.log(System.Logger.Level.INFO, "message received from server: {0}", new Object[]{message});
         if (message instanceof ServerMessage serverMessage) {
@@ -103,21 +63,10 @@ public void messageReceived(Client client, Message message) {
 
     }
 
-    /**
-     * Handles client connection to the server.
-     *
-     * @param client the client
-     */
     public void clientConnected(Client client) {
         LOGGER.log(System.Logger.Level.INFO, "Client connected: {0}", new Object[]{client});
     }
 
-    /**
-     * Handles client disconnection from the server.
-     *
-     * @param client the client
-     * @param disconnectInfo the disconnect information
-     */
     public void clientDisconnected(Client client, ClientStateListener.DisconnectInfo disconnectInfo) {
         LOGGER.log(System.Logger.Level.INFO, "Client {0} disconnected: {1}", new Object[]{client, disconnectInfo});
         if (this.client != client) {
@@ -129,11 +78,6 @@ public void clientDisconnected(Client client, ClientStateListener.DisconnectInfo
         }
     }
 
-    /**
-     * Sends a message to the server.
-     *
-     * @param message the message
-     */
     @Override
     public void send(ClientMessage message) {
         LOGGER.log(System.Logger.Level.INFO, "sending {0}", new Object[]{message});

Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java

@@ -1,175 +1,101 @@
 package pp.mdga.client;
 
-import com.jme3.system.NanoTimer;
-import pp.mdga.client.acoustic.MdgaSound;
 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.BonusCard;
 import pp.mdga.game.Color;
 import pp.mdga.notification.*;
 
 import java.util.ArrayList;
-import java.util.Timer;
-import java.util.TimerTask;
 
-/**
- * The NotificationSynchronizer class is responsible for handling and synchronizing notifications
- * received from the game logic and updating the application state accordingly.
- */
 public class NotificationSynchronizer {
     private final MdgaApp app;
 
     private ArrayList<Notification> notifications = new ArrayList<>();
 
-    private NanoTimer timer = new NanoTimer();
-    private float delay = 0;
-
-    private static final float STANDARD_DELAY = 2.5f;
-
-    public boolean waitForAnimation = false;
-
-    /**
-     * Constructs a NotificationSynchronizer with the specified MdgaApp instance.
-     *
-     * @param app the MdgaApp instance
-     */
     NotificationSynchronizer(MdgaApp app) {
         this.app = app;
     }
 
-    /**
-     * Updates the notification synchronizer by processing notifications from the game logic.
-     * Handles different types of notifications based on the current application state.
-     */
+    public void addTestNotification(Notification n) {
+        notifications.add(n);
+        handleGame(n);
+    }
+
     public void update() {
-        while (timer.getTimeInSeconds() >= delay) {
-            if (waitForAnimation) {
-                return;
-            }
+        Notification n = app.getGameLogic().getNotification();
 
-            Notification n = app.getGameLogic().getNotification();
-
-            if (n == null) {
-                return;
-            }
-
-            System.out.println("receive notification:" + n.getClass().getName());
-
-            timer.reset();
-            delay = 0;
-
-            if (n instanceof InfoNotification infoNotification) {
-                app.getView().showInfo(infoNotification.getMessage(), infoNotification.isError());
-                return;
-            }
-
-            if (n != null) {
-                switch (app.getState()) {
-                    case MAIN:
-                        handleMain(n);
-                        break;
-                    case LOBBY:
-                        handleLobby(n);
-                        break;
-                    case GAME:
-                        handleGame(n);
-                        break;
-                    case CEREMONY:
-                        handleCeremony(n);
-                        break;
-                    case NONE:
-                        throw new RuntimeException("no notification expected: " + n.getClass().getName());
-                }
-
-                if (0 == MdgaApp.DEBUG_MULTIPLIER) {
-                    delay = 0;
-                }
+        if(n != null) {
+            switch (app.getState()) {
+                case MAIN:
+                    handleMain(n);
+                    break;
+                case LOBBY:
+                    handleLobby(n);
+                    break;
+                case GAME:
+                    handleGame(n);
+                    break;
+                case CEREMONY:
+                    handleCeremony(n);
+                    break;
+                case NONE:
+                    throw new RuntimeException("no notification expected: " + n.toString());
             }
         }
     }
 
-    /**
-     * Handles notifications when the application is in the MAIN state.
-     *
-     * @param notification the notification to handle
-     */
     private void handleMain(Notification notification) {
         if (notification instanceof LobbyDialogNotification) {
             app.enter(MdgaState.LOBBY);
-        } else if (notification instanceof StartDialogNotification) {
-            //nothing
         } else {
-            throw new RuntimeException("notification not expected in main: " + notification.getClass().getName());
+            throw new RuntimeException("notification not expected: ");
         }
     }
 
-    /**
-     * Handles notifications when the application is in the LOBBY state.
-     *
-     * @param notification the notification to handle
-     */
     private void handleLobby(Notification notification) {
         LobbyView lobbyView = (LobbyView) app.getView();
 
         if (notification instanceof TskSelectNotification n) {
             lobbyView.setTaken(n.getColor(), true, n.isSelf(), n.getName());
         } else if (notification instanceof StartDialogNotification) {
-            app.afterGameCleanup();
             app.enter(MdgaState.MAIN);
         } else if (notification instanceof TskUnselectNotification n) {
             lobbyView.setTaken(n.getColor(), false, false, null);
-        } else if (notification instanceof LobbyReadyNotification lobbyReadyNotification) {
+            } else if(notification instanceof LobbyReadyNotification lobbyReadyNotification) {
             lobbyView.setReady(lobbyReadyNotification.getColor(), lobbyReadyNotification.isReady());
         } else if (notification instanceof GameNotification n) {
-            app.getGameView().setOwnColor(n.getOwnColor());
             app.enter(MdgaState.GAME);
+            ((GameView) app.getView()).setOwnColor(n.getOwnColor());
         } else {
-            throw new RuntimeException("notification not expected in lobby: " + notification.getClass().getName());
+            throw new RuntimeException("notification not expected: " + notification.toString());
         }
     }
 
-    /**
-     * Handles notifications when the application is in the GAME state.
-     *
-     * @param notification the notification to handle
-     */
     private void handleGame(Notification notification) {
         GameView gameView = (GameView) app.getView();
         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());
-            app.getAcousticHandler().playSound(MdgaSound.BONUS);
-            delay = STANDARD_DELAY;
-        } else if (notification instanceof RankingResponceNotification n) {
-            guiHandler.hideText();
-            n.getRankingResults().forEach((c, i) -> {
-                guiHandler.rollRankingResult(c, i);
-            });
-            delay = STANDARD_DELAY;
+            guiHandler.addCard(n.getBonusCard());
         } else if (notification instanceof ActivePlayerNotification n) {
-            guiHandler.hideText();
-            boardHandler.hideDice();
             gameView.getGuiHandler().setActivePlayer(n.getColor());
-            if (n.getColor() != ownColor) boardHandler.showDice(n.getColor());
-            app.getAcousticHandler().playSound(MdgaSound.UI90);
-            delay = STANDARD_DELAY;
+            boardHandler.showDice(n.getColor());
         } else if (notification instanceof CeremonyNotification ceremonyNotification) {
-            CeremonyView ceremonyView = app.getCeremonyView();
+            app.enter(MdgaState.CEREMONY);
+            CeremonyView ceremonyView = (CeremonyView) app.getView();
             int size = ceremonyNotification.getNames().size();
 
             if (ceremonyNotification.getPiecesThrown().size() != size ||
-                    ceremonyNotification.getPiecesLost().size() != size ||
-                    ceremonyNotification.getBonusCardsPlayed().size() != size ||
-                    ceremonyNotification.getSixes().size() != size ||
-                    ceremonyNotification.getNodesMoved().size() != size ||
-                    ceremonyNotification.getBonusNodes().size() != size) {
+                ceremonyNotification.getPiecesLost().size() != size ||
+                ceremonyNotification.getBonusCardsPlayed().size() != size ||
+                ceremonyNotification.getSixes().size() != size ||
+                ceremonyNotification.getNodesMoved().size() != size ||
+                ceremonyNotification.getBonusNodes().size() != size) {
                 throw new IllegalArgumentException("All data lists in CeremonyNotification must have the same size.");
             }
 
@@ -183,118 +109,90 @@ private void handleGame(Notification notification) {
                 int v5 = ceremonyNotification.getNodesMoved().get(i);
                 int v6 = ceremonyNotification.getBonusNodes().get(i);
 
-                if(i < size - 1) {
-                    ceremonyView.addCeremonyParticipant(color, i + 1, name);
-                }
-
+                ceremonyView.addCeremonyParticipant(color, i, name);
                 ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
             }
-            app.enter(MdgaState.CEREMONY);
         } else if (notification instanceof DiceNowNotification) {
-            guiHandler.hideText();
             guiHandler.showDice();
         } else if (notification instanceof DrawCardNotification n) {
-            app.getAcousticHandler().playSound(MdgaSound.BONUS);
             guiHandler.drawCard(n.getColor());
-            delay = STANDARD_DELAY;
         } else if (notification instanceof HomeMoveNotification home) {
             boardHandler.movePieceHomeAnim(home.getPieceId(), home.getHomeIndex());
             guiHandler.hideText();
-            waitForAnimation = true;
-        } else if (notification instanceof InterruptNotification notification1) {
-            gameView.enterInterrupt(notification1.getColor());
+        } else if (notification instanceof InterruptNotification) {
+            app.enter(MdgaState.LOBBY);
         } else if (notification instanceof MovePieceNotification n) {
-            if (n.isMoveStart()) {
+            if(n.isMoveStart()) {
                 //StartMove
                 boardHandler.movePieceStartAnim(n.getPiece(), n.getMoveIndex());
-                waitForAnimation = true;
-            } else {
+            }
+            else {
                 //InfieldMove
                 boardHandler.movePieceAnim(n.getPiece(), n.getStartIndex(), n.getMoveIndex());
-                waitForAnimation = true;
             }
             guiHandler.hideText();
         } else if (notification instanceof ThrowPieceNotification n) {
-            boardHandler.throwPiece(n.getPieceId(), n.getThrowColor());
-            waitForAnimation = true;
-        } else if (notification instanceof RemoveShieldNotification n) {
-            boardHandler.unshieldPiece(n.getPieceUuid());
+            boardHandler.throwPieceAnim(n.getPieceId());
+        } else if (notification instanceof NoShieldNotification n) {
+            boardHandler.unshieldPiece(n.getPieceId());
         } else if (notification instanceof PlayCardNotification n) {
-            if (n.getCard() == BonusCard.TURBO) {
-                app.getAcousticHandler().playSound(MdgaSound.TURBO);
-                guiHandler.turbo();
-            } else if (n.getCard() == BonusCard.SHIELD) {
-                app.getAcousticHandler().playSound(MdgaSound.SHIELD);
-            } else if (n.getCard() == BonusCard.SWAP) {
-                app.getAcousticHandler().playSound(MdgaSound.SWAP);
+            switch(n.getCard()){
+                case SWAP -> guiHandler.swap();
+                case TURBO -> guiHandler.turbo();
+                case SHIELD -> guiHandler.shield();
+                default -> throw new RuntimeException("invalid card");
             }
-            if (n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard());
-            else guiHandler.playCardEnemy(n.getColor(), n.getCard());
-
-            new Timer().schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    app.getModelSynchronize().animationEnd();
-                }
-            }, 2200 * MdgaApp.DEBUG_MULTIPLIER);
         } else if (notification instanceof PlayerInGameNotification n) {
-            boardHandler.addPlayer(n.getColor(), n.getPiecesList());
-            guiHandler.addPlayer(n.getColor(), n.getName());
+            boardHandler.addPlayer(n.getColor(),n.getPiecesList());
+            guiHandler.addPlayer(n.getColor(),n.getName());
         } else if (notification instanceof ResumeNotification) {
-            gameView.leaveInterrupt();
+            //TODO
         } else if (notification instanceof RollDiceNotification n) {
             gameView.getGuiHandler().hideText();
-            if (n.getColor() == ownColor) {
+            if(n.getColor() == gameView.getOwnColor()){
                 guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1);
-                waitForAnimation = true;
-            } else {
+            }
+            else {
+                boardHandler.hideDice();
                 if (n.isTurbo()) guiHandler.showRolledDiceMult(n.getEyes(), n.getMultiplier(), n.getColor());
                 else guiHandler.showRolledDice(n.getEyes(), n.getColor());
             }
         } else if (notification instanceof SelectableCardsNotification n) {
             guiHandler.setSelectableCards(n.getCards());
-            gameView.showNoPower();
         } else if (notification instanceof ShieldActiveNotification n) {
             boardHandler.shieldPiece(n.getPieceId());
         } else if (notification instanceof ShieldSuppressedNotification n) {
             boardHandler.suppressShield(n.getPieceId());
         } else if (notification instanceof StartDialogNotification) {
-            app.afterGameCleanup();
             app.enter(MdgaState.MAIN);
         } else if (notification instanceof SwapPieceNotification n) {
-            boardHandler.swapPieceAnim(n.getFirstPiece(), n.getSecondPiece());
+//            boardHandler.swapPieces(n.getFirstPiece(), n.getSecondPiece());
             guiHandler.swap();
         } else if (notification instanceof WaitMoveNotification) {
-            //nothing
+            //TODO ???
         } else if (notification instanceof SelectableMoveNotification n) {
             boardHandler.outlineMove(n.getPieces(), n.getMoveIndices(), n.getHomeMoves());
             modelSynchronizer.setSwap(false);
         } else if (notification instanceof SelectableSwapNotification n) {
             boardHandler.outlineSwap(n.getOwnPieces(), n.getEnemyPieces());
             modelSynchronizer.setSwap(true);
-        } else if (notification instanceof SelectableShieldNotification n) {
+       } else if (notification instanceof SelectableShieldNotification n) {
             boardHandler.outlineShield(n.getPieces());
             modelSynchronizer.setSwap(false);
-        } else if (notification instanceof TurboActiveNotification) {
-            //nothing
-        } else if (notification instanceof FinishNotification n) {
+        } else if (notification instanceof TurboActiveNotification){
+            guiHandler.turbo();
+        } else if (notification instanceof FinishNotification n){
             guiHandler.finish(n.getColorFinished());
         } else {
-            throw new RuntimeException("notification not expected in game: " + notification.getClass().getName());
+            throw new RuntimeException("notification not expected: " + notification.toString());
         }
     }
 
-    /**
-     * Handles notifications when the application is in the CEREMONY state.
-     *
-     * @param notification the notification to handle
-     */
     private void handleCeremony(Notification notification) {
         if (notification instanceof StartDialogNotification) {
-            app.afterGameCleanup();
             app.enter(MdgaState.MAIN);
         } else {
-            throw new RuntimeException("notification not expected in ceremony: " + notification.getClass().getName());
+            throw new RuntimeException("notification not expected: " + notification.toString());
         }
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/Util.java

@@ -1,48 +0,0 @@
-package pp.mdga.client;
-
-import com.jme3.math.Vector3f;
-
-public class Util {
-    private Util() {
-    }
-
-    /**
-     * Performs linear interpolation between two values.
-     *
-     * @param start The starting value.
-     * @param end   The ending value.
-     * @param t     A parameter between 0 and 1 representing the interpolation progress.
-     * @return The interpolated value.
-     */
-    public static float linInt(float start, float end, float t) {
-        return start + t * (end - start);
-    }
-
-    /**
-     * Performs quadratic interpolation between three points.
-     *
-     * @param p1 The initial point.
-     * @param p2 The middle point.
-     * @param p3 The final point.
-     * @param t  The interpolation parameter (0 <= t <= 1).
-     * @return The interpolated point.
-     */
-    public static Vector3f quadInt(Vector3f p1, Vector3f p2, Vector3f p3, float t) {
-        // Quadratic interpolation: (1-t)^2 * p1 + 2 * (1-t) * t * p2 + t^2 * p3
-        float oneMinusT = 1 - t;
-        return p1.mult(oneMinusT * oneMinusT)
-                .add(p2.mult(2 * oneMinusT * t))
-                .add(p3.mult(t * t));
-    }
-
-    /**
-     * A smooth ease-in-out function for interpolation.
-     * It accelerates and decelerates the interpolation for a smoother effect.
-     *
-     * @param x The interpolation parameter (0 <= x <= 1).
-     * @return The adjusted interpolation value.
-     */
-    public static float easeInOut(float x) {
-        return x < 0.5 ? 4 * x * x * x : (float) (1 - Math.pow(-2 * x + 2, 3) / 2);
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java

@@ -4,10 +4,7 @@
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.MdgaState;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Random;
+import java.util.*;
 import java.util.prefs.Preferences;
 
 public class AcousticHandler {
@@ -21,14 +18,12 @@ public class AcousticHandler {
 
     private boolean fading = false; // Indicates if a fade is in progress
     private NanoTimer fadeTimer = new NanoTimer(); // Timer to track fade progress
-    private static final float FADE_DURATION = 2.0f; // Duration for outfade
+    private static final float FADE_DURATION = 3.0f; // Duration for outfade
     private static final float CROSSFADE_DURATION = 1.5f; // Duration for infade
     private GameMusic playing = null; // Currently playing track
     private GameMusic scheduled = null; // Scheduled track to play next
     private GameMusic old = null; // Old track being faded out
 
-    private GameMusic birds;
-
     private float mainVolume = 0.0f;
     private float musicVolume = 1.0f;
     private float soundVolume = 1.0f;
@@ -43,8 +38,6 @@ public AcousticHandler(MdgaApp app) {
         mainVolume = prefs.getFloat("mainVolume", 1.0f);
         musicVolume = prefs.getFloat("musicVolume", 1.0f);
         soundVolume = prefs.getFloat("soundVolume", 1.0f);
-
-        birds = new GameMusic(app, MusicAsset.BIRDS, getSoundVolumeTotal(), MusicAsset.BIRDS.getSubVolume(), MusicAsset.BIRDS.getLoop(), 0.0f);
     }
 
     /**
@@ -67,8 +60,6 @@ public void update() {
                 iterator.remove();
             }
         }
-
-        birds.update(Math.min(getSoundVolumeTotal(), getMusicVolumeTotal() > 0 ? 0 : 1));
     }
 
     /**
@@ -118,48 +109,6 @@ public void playSound(MdgaSound sound) {
             case LEAVE:
                 assets.add(new SoundAssetDelayVolume(SoundAsset.UI_SOUND2, 0.6f, 0.0f));
                 break;
-            case JET:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.JET, 1.0f, 0.0f));
-                break;
-            case EXPLOSION:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_1, 1.0f, 0f));
-                assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_2, 1.0f, 0f));
-                assets.add(new SoundAssetDelayVolume(SoundAsset.THUNDER, 1.0f, 0f));
-                break;
-            case LOSE:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.LOSE, 1.0f, 0.0f));
-                break;
-            case BONUS:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.BONUS, 1.0f, 0.0f));
-                break;
-            case UI90:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.UI90, 1.0f, 0.0f));
-                break;
-            case MISSILE:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.MISSILE, 1.0f, 0.0f));
-                break;
-            case MATRIX:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.MATRIX, 1.0f, 0.0f));
-                break;
-            case TURRET_ROTATE:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.TURRET_ROTATE, 0.7f, 0f));
-                break;
-            case TANK_SHOOT:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.TANK_SHOOT, 0.7f, 0f));
-                break;
-            case TANK_EXPLOSION:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_1, 1.0f, 0f));
-                break;
-            case SHIELD:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.SHIELD, 1.0f, 0f));
-                break;
-            case TURBO:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.SPEED, 1.0f, 0.1f));
-                assets.add(new SoundAssetDelayVolume(SoundAsset.SPEED, 1.0f, 1.3f));
-                break;
-            case SWAP:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.SWAP, 1.0f, 0f));
-                break;
             default:
                 break;
         }
@@ -181,10 +130,6 @@ public void playState(MdgaState state) {
         }
         MusicAsset asset = null;
 
-        birds.pause();
-
-        float pause = 0.0f;
-
         switch (state) {
             case MAIN:
                 playGame = false;
@@ -195,12 +140,10 @@ public void playState(MdgaState state) {
                 asset = MusicAsset.LOBBY;
                 break;
             case GAME:
-                birds.play();
                 addGameTracks();
                 playGame = true;
                 assert (!gameTracks.isEmpty()) : "no more game music available";
                 asset = gameTracks.remove(0);
-                pause = 2.0f;
                 break;
             case CEREMONY:
                 playGame = false;
@@ -212,7 +155,7 @@ public void playState(MdgaState state) {
 
         assert (null != asset) : "music sceduling went wrong";
 
-        scheduled = new GameMusic(app, asset, getMusicVolumeTotal(), asset.getSubVolume(), asset.getLoop(), pause);
+        scheduled = new GameMusic(app, asset, getMusicVolumeTotal(), asset.getSubVolume(), asset.getLoop(), 0.0f);
     }
 
     /**
@@ -229,20 +172,20 @@ private float lerp(float start, float end, float t) {
 
     /**
      * Updates the state of audio playback, handling track transitions and volume adjustments.
-     * <p>
+     *
      * This method ensures smooth transitions between tracks using fade-in and fade-out effects.
      * It also handles cases where no track is playing, starting a scheduled track immediately at full volume.
      * The method prioritizes the latest scheduled track if multiple scheduling occurs quickly.
-     * <p>
+     *
      * Behavior:
      * 1. If nothing is scheduled and no track is playing, it exits early.
      * 2. If a scheduled track exists and no track is playing, the scheduled track starts immediately at full volume.
      * 3. If a scheduled track exists while a track is playing, it initiates a fade-out for the currently playing track
-     * and prepares for the new track to fade in.
+     *    and prepares for the new track to fade in.
      * 4. If a track transition is in progress (fading), it processes the fade-out and fade-in states.
-     * If a new track is scheduled during this process, it interrupts the current transition and prioritizes the new track.
+     *    If a new track is scheduled during this process, it interrupts the current transition and prioritizes the new track.
      * 5. If no fading is needed and a track is playing, it ensures the track's volume is updated.
-     * <p>
+     *
      * Special cases:
      * - If no track is playing and a new track is scheduled, it starts the track immediately without fading.
      * - If a new track is scheduled during fading, it resets the transition to prioritize the new track.
@@ -294,23 +237,23 @@ private void updateVolumeAndTrack() {
 
     /**
      * Manages the fading process during audio track transitions.
-     * <p>
+     *
      * This method handles the fade-out of the currently playing (old) track, manages any pause between the fade-out
      * and fade-in, and initiates the fade-in for the new track if applicable. It ensures smooth transitions between
      * tracks while maintaining the correct volume adjustments.
-     * <p>
+     *
      * Behavior:
      * 1. **Outfade:** Gradually decreases the volume of the `old` track over the duration of `FADE_DURATION`.
-     * Once the outfade completes, the `old` track is paused and cleared.
+     *    Once the outfade completes, the `old` track is paused and cleared.
      * 2. **Pause Handling:** Waits for a defined pause (if applicable) before initiating the infade for the next track.
      * 3. **Infade:** If a `scheduled` track exists and the outfade and pause are complete, it begins playing
-     * the new track (`playing`) and initiates the infade process.
-     * <p>
+     *    the new track (`playing`) and initiates the infade process.
+     *
      * Key Details:
      * - The outfade volume adjustment is interpolated linearly from full volume to zero using the `lerp` function.
      * - The pause duration is retrieved from the scheduled track if it is specified.
      * - If a new track is scheduled during the fade process, it is handled by external logic to prioritize transitions.
-     * <p>
+     *
      * Preconditions:
      * - `fading` is expected to be `true` when this method is called.
      * - The method is invoked as part of the `updateVolumeAndTrack` process.
@@ -346,23 +289,23 @@ private void handleFadeProcess() {
 
     /**
      * Manages the fade-in process for the currently playing track.
-     * <p>
+     *
      * This method gradually increases the volume of the `playing` track from zero to full volume
      * over the duration of `CROSSFADE_DURATION`. It ensures a smooth transition into the new track.
-     * <p>
+     *
      * Behavior:
      * 1. If no track is set as `playing`, the method exits early, as there is nothing to fade in.
      * 2. Linearly interpolates the volume of the `playing` track from 0.0 to 1.0 based on the elapsed
-     * `infadeTime` and the specified `CROSSFADE_DURATION`.
+     *    `infadeTime` and the specified `CROSSFADE_DURATION`.
      * 3. Once the fade-in is complete (when `infadeTime` exceeds `CROSSFADE_DURATION`), the method:
-     * - Marks the fade process (`fading`) as complete.
-     * - Ensures the `playing` track is updated to its full volume.
-     * <p>
+     *    - Marks the fade process (`fading`) as complete.
+     *    - Ensures the `playing` track is updated to its full volume.
+     *
      * Key Details:
      * - Uses the `lerp` function to calculate the volume level for the `playing` track during the fade-in.
      * - Ensures the volume is always a value between 0.0 and 1.0.
      * - The `infadeTime` parameter should be relative to the start of the fade-in process.
-     * <p>
+     *
      * Preconditions:
      * - The `playing` track must be initialized and actively fading in for this method to have an effect.
      * - The method is invoked as part of the `updateVolumeAndTrack` process.
@@ -405,7 +348,7 @@ private void addGameTracks() {
      * a new track will be scheduled to play. If the list of game tracks is empty, it will be refreshed.
      */
     private void updateGameTracks() {
-        if (null == playing) {
+        if(null == playing) {
             return;
         }
 
@@ -488,7 +431,7 @@ public void setSoundVolume(float soundVolume) {
      */
     float getMusicVolumeTotal() {
 
-        return getMusicVolume() * getMainVolume() / 2;
+        return getMusicVolume() * getMainVolume();
     }
 
     /**

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java

@@ -31,17 +31,4 @@ public enum MdgaSound {
     OTHER_CONNECTED,
     NOT_READY,
     LEAVE,
-    JET,
-    EXPLOSION,
-    LOSE,
-    BONUS,
-    UI90,
-    MISSILE,
-    MATRIX,
-    TURRET_ROTATE,
-    TANK_SHOOT,
-    TANK_EXPLOSION,
-    SHIELD,
-    TURBO,
-    SWAP,
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MusicAsset.java

@@ -10,13 +10,12 @@ enum MusicAsset {
     MAIN_MENU("Spaceship.wav", true, 1.0f),
     LOBBY("DeadPlanet.wav", true, 1.0f),
     CEREMONY("80s,Disco,Life.wav", true, 1.0f),
-    GAME_1("NeonRoadTrip.wav", 0.5f),
-    GAME_2("NoPressureTrance.wav", 0.5f),
-    GAME_3("TheSynthRave.wav", 0.5f),
-    GAME_4("LaserParty.wav", 0.5f),
-    GAME_5("RetroNoir.wav", 0.5f),
-    GAME_6("SpaceInvaders.wav", 0.5f),
-    BIRDS("nature-ambience.ogg", true, 1.0f);
+    GAME_1("NeonRoadTrip.wav", 1.0f),
+    GAME_2("NoPressureTrance.wav", 1.0f),
+    GAME_3("TheSynthRave.wav", 1.0f),
+    GAME_4("LaserParty.wav", 1.0f),
+    GAME_5("RetroNoir.wav", 1.0f),
+    GAME_6("SpaceInvaders.wav", 1.0f);
 
     private final String path;
     private final boolean loop;

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java

@@ -28,23 +28,7 @@ enum SoundAsset {
     POWERUP("powerup.wav"),
     ROBOT_READY("robotReady.wav"),
     UNIT_READY("unitReady.wav"),
-    JET("jet-overhead.wav"),
-    EXPLOSION_1("exp.ogg"),
-    EXPLOSION_2("exp2.ogg"),
-    THUNDER("thunder.ogg"),
-    UI90("ui90.ogg"),
-    BONUS("bonus.ogg"),
-    LOSE("lose.ogg"),
-    MISSILE("missile.ogg"),
-    MATRIX("matrix.wav"),
-    CONNECTED("connected.wav"),
-    TURRET_ROTATE("turret_rotate.ogg"),
-    TANK_SHOOT("tank_shoot.ogg"),
-    SHIELD("shield.ogg"),
-    SPEED("speed.ogg"),
-    SWAP("swap.ogg"),
-    ;
-
+    CONNECTED("connected.wav");
 
     private final String path;
 

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAssetDelayVolume.java

@@ -4,5 +4,4 @@
  * A record that encapsulates a sound asset along with its playback settings:
  * the relative volume (subVolume) and a delay before it starts playing.
  */
-record SoundAssetDelayVolume(SoundAsset asset, float subVolume, float delay) {
-}
+record SoundAssetDelayVolume(SoundAsset asset, float subVolume, float delay) {}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ActionControl.java

@@ -1,25 +0,0 @@
-package pp.mdga.client.animation;
-
-import pp.mdga.client.InitControl;
-
-public class ActionControl extends InitControl {
-    private final Runnable runnable;
-
-    /**
-     * Constructs a new ActionControl object with the specified action.
-     *
-     * @param runnable The action to be performed.
-     */
-    public ActionControl(Runnable runnable) {
-        this.runnable = runnable;
-    }
-
-    /**
-     * Performs the action associated with this control.
-     */
-    protected void action() {
-        if (null != runnable) {
-            runnable.run();
-        }
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/Explosion.java

@@ -1,136 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh.Type;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import com.jme3.scene.control.AbstractControl;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.client.acoustic.MdgaSound;
-
-/**
- * The {@code Explosion} class represents an explosion effect in a 3D environment.
- * It manages the creation, configuration, and triggering of particle emitters for fire and smoke effects.
- */
-public class Explosion {
-
-    private final Node rootNode;
-    private final MdgaApp app;
-    private final Vector3f location;
-    private ParticleEmitter fire;
-    private ParticleEmitter smoke;
-
-    private boolean triggered = false;
-
-    private final Material mat;
-
-    /**
-     * Constructor for the {@code Explosion} class.
-     *
-     * @param app      The main application managing the explosion.
-     * @param rootNode The root node to which the explosion effects will be attached.
-     * @param location The location of the explosion in world coordinates.
-     */
-    public Explosion(MdgaApp app, Node rootNode, Vector3f location) {
-        this.app = app;
-        this.rootNode = rootNode;
-        this.location = location;
-
-        this.mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
-        mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/flame.png"));
-    }
-
-    /**
-     * Initializes the particle emitters for the explosion effect.
-     * Configures the fire and smoke emitters with appearance, behavior, and lifespan.
-     */
-    private void initializeEmitter() {
-        fire = new ParticleEmitter("Effect", Type.Triangle, 50);
-        fire.setMaterial(mat);
-        fire.setImagesX(2);
-        fire.setImagesY(2);
-        fire.setStartColor(ColorRGBA.Yellow);
-        fire.setEndColor(ColorRGBA.Red);
-        fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0.2f, 0.2f, 4f));
-        fire.getParticleInfluencer().setVelocityVariation(0.4f);
-        fire.setStartSize(0.7f);
-        fire.setEndSize(1.8f);
-        fire.setGravity(0, 0, -0.1f);
-        fire.setLowLife(0.5f);
-        fire.setHighLife(2.2f);
-        fire.setParticlesPerSec(0);
-
-        fire.setLocalTranslation(location);
-
-        smoke = new ParticleEmitter("Effect2", Type.Triangle, 40);
-        smoke.setMaterial(mat);
-        smoke.setImagesX(3);
-        smoke.setImagesY(3);
-        smoke.setStartColor(ColorRGBA.DarkGray);
-        smoke.setEndColor(new ColorRGBA(0.05f, 0.05f, 0.05f, 1));
-        smoke.getParticleInfluencer().setInitialVelocity(new Vector3f(0.0f, 0.0f, 0.7f));
-        smoke.getParticleInfluencer().setVelocityVariation(0.5f);
-        smoke.setStartSize(0.8f);
-        smoke.setEndSize(1.5f);
-        smoke.setGravity(0, 0, -0.3f);
-        smoke.setLowLife(1.2f);
-        smoke.setHighLife(5.5f);
-        smoke.setParticlesPerSec(0);
-
-        smoke.setLocalTranslation(location);
-
-        app.getAcousticHandler().playSound(MdgaSound.EXPLOSION);
-    }
-
-    /**
-     * Triggers the explosion effect by attaching and activating the particle emitters for fire and smoke.
-     * Both emitters are automatically detached after a predefined duration.
-     */
-    public void trigger() {
-        if (!triggered) {
-            triggered = true;
-            initializeEmitter();
-        }
-
-        rootNode.attachChild(fire);
-        fire.emitAllParticles();
-        fire.addControl(new AbstractControl() {
-            private float elapsedTime = 0;
-
-            @Override
-            protected void controlUpdate(float tpf) {
-                elapsedTime += tpf;
-                if (elapsedTime > 10f) {
-                    rootNode.detachChild(fire);
-                    fire.removeControl(this);
-                }
-            }
-
-            @Override
-            protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {
-            }
-        });
-
-        rootNode.attachChild(smoke);
-        smoke.emitAllParticles();
-        smoke.addControl(new AbstractControl() {
-            private float elapsedTime = 0;
-
-            @Override
-            protected void controlUpdate(float tpf) {
-                elapsedTime += tpf;
-                if (elapsedTime > 10f) {
-                    rootNode.detachChild(smoke);
-                    smoke.removeControl(this);
-                }
-            }
-
-            @Override
-            protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {
-            }
-        });
-    }
-}
-

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/FadeControl.java

@@ -1,69 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.renderer.queue.RenderQueue;
-import com.jme3.scene.Geometry;
-
-import static pp.mdga.client.Util.linInt;
-
-public class FadeControl extends ActionControl {
-    private float duration; // Duration of the fade effect
-    private float timeElapsed = 0;
-    private boolean init = false;
-    private float startAlpha;
-    private float endAlpha;
-
-    public FadeControl(float duration, float startAlpha, float endAlpha, Runnable actionAfter) {
-        super(actionAfter);
-        this.duration = duration;
-        this.startAlpha = startAlpha;
-        this.endAlpha = endAlpha;
-    }
-
-    public FadeControl(float duration, float startAlpha, float endAlpha) {
-        this(duration, startAlpha, endAlpha, null);
-    }
-
-    @Override
-    protected void initSpatial() {
-        init = true;
-    }
-
-    @Override
-    protected void controlUpdate(float tpf) {
-        if (!init) return;
-
-        timeElapsed += tpf;
-        float t = timeElapsed / duration; // Calculate progress (0 to 1)
-
-        if (t >= 1) {
-            // Fade complete
-            t = 1;
-            init = false;
-            spatial.removeControl(this);
-            action();
-        }
-
-        float alpha = linInt(startAlpha, endAlpha, t); // Interpolate alpha
-
-        // Update the material's alpha
-        if (spatial instanceof Geometry geometry) {
-            Material mat = geometry.getMaterial();
-            if (mat != null) {
-                ColorRGBA diffuse = (ColorRGBA) mat.getParam("Diffuse").getValue();
-                mat.setColor("Diffuse", new ColorRGBA(diffuse.r, diffuse.g, diffuse.b, alpha));
-
-                ColorRGBA ambient = (ColorRGBA) mat.getParam("Ambient").getValue();
-                mat.setColor("Ambient", new ColorRGBA(ambient.r, ambient.g, ambient.b, alpha));
-
-                // Disable shadows when the object is nearly invisible
-                if (alpha <= 0.1f) {
-                    geometry.setShadowMode(RenderQueue.ShadowMode.Off);
-                } else {
-                    geometry.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
-                }
-            } else throw new RuntimeException("Material is null");
-        } else throw new RuntimeException("Spatial is not instance of Geometry");
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/JetAnimation.java

@@ -1,195 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.material.Material;
-import com.jme3.math.FastMath;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
-import com.jme3.renderer.queue.RenderQueue;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.control.AbstractControl;
-import pp.mdga.client.Asset;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.client.acoustic.MdgaSound;
-
-/**
- * The {@code JetAnimation} class handles the animation of a jet model in a 3D environment.
- * It creates a jet model, animates its movement along a curved path, triggers an explosion at a target point,
- * and performs additional actions upon animation completion.
- */
-public class JetAnimation {
-
-    private final MdgaApp app;
-    private final Node rootNode;
-    private Spatial jetModel;
-    private final Vector3f spawnPoint;
-    private final Vector3f nodePoint;
-    private final Vector3f despawnPoint;
-    private final float curveHeight;
-    private final float animationDuration;
-    private Explosion explosion;
-    private Runnable actionAfter;
-
-    /**
-     * Constructor for the {@code JetAnimation} class.
-     *
-     * @param app               The main application managing the jet animation.
-     * @param rootNode          The root node to which the jet model will be attached.
-     * @param targetPoint       The target point where the explosion will occur.
-     * @param curveHeight       The height of the curve for the jet's flight path.
-     * @param animationDuration The total duration of the jet animation.
-     */
-    public JetAnimation(MdgaApp app, Node rootNode, Vector3f targetPoint, float curveHeight, float animationDuration, Runnable actionAfter) {
-        Vector3f spawnPoint = targetPoint.add(170, 50, 50);
-
-        Vector3f controlPoint = targetPoint.add(new Vector3f(0, 0, -45));
-
-        Vector3f despawnPoint = targetPoint.add(-100, -100, 40);
-
-        this.app = app;
-        this.rootNode = rootNode;
-        this.spawnPoint = spawnPoint;
-        this.nodePoint = controlPoint;
-        this.despawnPoint = despawnPoint;
-        this.curveHeight = curveHeight;
-        this.animationDuration = animationDuration;
-
-        explosion = new Explosion(app, rootNode, targetPoint);
-        this.actionAfter = actionAfter;
-    }
-
-    /**
-     * Starts the jet animation by spawning the jet model and initiating its movement along the predefined path.
-     */
-    public void start() {
-        app.getAcousticHandler().playSound(MdgaSound.JET);
-        spawnJet();
-        animateJet();
-    }
-
-    /**
-     * Spawns the jet model at the designated spawn point, applying material, scaling, and rotation.
-     */
-    private void spawnJet() {
-        jetModel = app.getAssetManager().loadModel(Asset.jet_noGear.getModelPath());
-        jetModel.setLocalTranslation(spawnPoint);
-        jetModel.scale(Asset.jet_noGear.getSize());
-        jetModel.rotate(FastMath.HALF_PI, 0, 0);
-        jetModel.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
-        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
-        mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(Asset.jet_noGear.getDiffPath()));
-        jetModel.setMaterial(mat);
-
-        rootNode.attachChild(jetModel);
-    }
-
-    /**
-     * actionAfter
-     * Animates the jet along a Bezier curve path, triggers the explosion effect at the appropriate time,
-     * and performs cleanup operations after the animation completes.
-     */
-    private void animateJet() {
-        Vector3f controlPoint1 = spawnPoint.add(0, curveHeight, 0);
-        Vector3f controlPoint2 = nodePoint.add(0, curveHeight, 0);
-
-        BezierCurve3f curve = new BezierCurve3f(spawnPoint, controlPoint1, controlPoint2, despawnPoint);
-
-        app.getRootNode().addControl(new AbstractControl() {
-            private float elapsedTime = 0;
-
-            @Override
-            protected void controlUpdate(float tpf) {
-                elapsedTime += tpf;
-                float progress = elapsedTime / animationDuration;
-
-                if (elapsedTime > 4.2f) {
-                    explosion.trigger();
-                }
-
-                if (progress > 1) {
-                    rootNode.detachChild(jetModel);
-                    this.spatial.removeControl(this);
-                } else {
-                    Vector3f currentPos = curve.interpolate(progress);
-                    Vector3f direction = curve.interpolateDerivative(progress).normalizeLocal();
-                    jetModel.setLocalTranslation(currentPos);
-                    jetModel.lookAt(currentPos.add(direction), Vector3f.UNIT_Z);
-                    jetModel.rotate(-FastMath.HALF_PI, 0, (float) Math.toRadians(-25));
-                }
-
-                if (elapsedTime > 6.0f) {
-                    endAnim();
-                }
-            }
-
-            @Override
-            protected void controlRender(RenderManager rm, ViewPort vp) {
-            }
-        });
-    }
-
-    private void endAnim() {
-        actionAfter.run();
-    }
-
-    /**
-     * The {@code BezierCurve3f} class represents a 3D cubic Bezier curve.
-     * It provides methods to interpolate positions and derivatives along the curve.
-     */
-    private static class BezierCurve3f {
-        private final Vector3f p0, p1, p2, p3;
-
-        /**
-         * Constructor for the {@code BezierCurve3f} class.
-         *
-         * @param p0 The starting point of the curve.
-         * @param p1 The first control point influencing the curve's shape.
-         * @param p2 The second control point influencing the curve's shape.
-         * @param p3 The endpoint of the curve.
-         */
-        public BezierCurve3f(Vector3f p0, Vector3f p1, Vector3f p2, Vector3f p3) {
-            this.p0 = p0;
-            this.p1 = p1;
-            this.p2 = p2;
-            this.p3 = p3;
-        }
-
-        /**
-         * Interpolates a position along the curve at a given progress value {@code t}.
-         *
-         * @param t The progress value (0.0 to 1.0) along the curve.
-         * @return The interpolated position on the curve.
-         */
-        public Vector3f interpolate(float t) {
-            float u = 1 - t;
-            float tt = t * t;
-            float uu = u * u;
-            float uuu = uu * u;
-            float ttt = tt * t;
-
-            Vector3f point = p0.mult(uuu);
-            point = point.add(p1.mult(3 * uu * t));
-            point = point.add(p2.mult(3 * u * tt));
-            point = point.add(p3.mult(ttt));
-            return point;
-        }
-
-        /**
-         * Computes the derivative at a given progress value {@code t}, representing the direction along the curve.
-         *
-         * @param t The progress value (0.0 to 1.0) along the curve.
-         * @return The derivative (direction vector) at the specified progress.
-         */
-        public Vector3f interpolateDerivative(float t) {
-            float u = 1 - t;
-            float tt = t * t;
-
-            Vector3f derivative = p0.mult(-3 * u * u);
-            derivative = derivative.add(p1.mult(3 * u * u - 6 * u * t));
-            derivative = derivative.add(p2.mult(6 * u * t - 3 * tt));
-            derivative = derivative.add(p3.mult(3 * tt));
-            return derivative;
-        }
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MatrixAnimation.java

@@ -1,253 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh.Type;
-import com.jme3.material.Material;
-import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import pp.mdga.client.MdgaApp;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-/**
- * MatrixAnimation class handles the animation of radar and matrix particle effects.
- */
-public class MatrixAnimation extends ActionControl {
-    private MdgaApp app;
-    private static final Random RANDOM = new Random();
-    private Vector3f radarPos;
-    private Runnable runnable;
-    private boolean init = false;
-    private List<ParticleEmitter> activeEmitter = new ArrayList<>();
-    private ParticleEmitter radarEmitter = null;
-    private float timeElapsed = 0f;
-
-    /**
-     * Enum representing the states of the matrix animation.
-     */
-    private enum MatrixState {
-        RADAR_ON,
-        RADAR_OFF,
-        MATRIX_ON,
-        MATRIX_OFF
-    }
-
-    private MatrixState state;
-
-    /**
-     * Constructor for MatrixAnimation.
-     *
-     * @param app       the application instance
-     * @param radarPos  the position of the radar
-     * @param runnable  the runnable action to be executed
-     */
-    public MatrixAnimation(MdgaApp app, Vector3f radarPos, Runnable runnable) {
-        super(runnable);
-        this.app = app;
-        this.radarPos = radarPos;
-    }
-
-    /**
-     * Initializes the spatial and sets the initial state to RADAR_ON.
-     */
-    @Override
-    protected void initSpatial() {
-        state = MatrixState.RADAR_ON;
-        timeElapsed = 0;
-        init = true;
-        radar();
-    }
-
-    /**
-     * Updates the control based on the time per frame (tpf).
-     *
-     * @param tpf the time per frame
-     */
-    @Override
-    protected void controlUpdate(float tpf) {
-        if (!init) return;
-
-        timeElapsed += tpf;
-
-        switch (state) {
-            case RADAR_ON -> {
-                if (timeElapsed >= 2f) {
-                    state = MatrixState.RADAR_OFF;
-                    timeElapsed = 0;
-                    radarEmitter.setParticlesPerSec(0);
-                    app.getTimerManager().addTask(3f, () -> app.enqueue(() -> {
-                        app.getRootNode().detachChild(radarEmitter);
-                        System.out.println("delete radar");
-                        return null;
-                    }));
-                }
-            }
-            case RADAR_OFF -> {
-                if (timeElapsed >= 0.1f) {
-                    state = MatrixState.MATRIX_ON;
-                    timeElapsed = 0;
-                    matrix();
-                }
-            }
-            case MATRIX_ON -> {
-                if (timeElapsed >= 3f) {
-                    state = MatrixState.MATRIX_OFF;
-                    timeElapsed = 0;
-                    turnOff();
-                    app.getTimerManager().addTask(3f, () -> app.enqueue(() -> {
-                        for (ParticleEmitter particleEmitter : activeEmitter) {
-                            app.getRootNode().detachChild(particleEmitter);
-                        }
-                        System.out.println("delete particle");
-                        return null;
-                    }));
-                }
-            }
-            case MATRIX_OFF -> {
-                if (timeElapsed >= 0.5f) {
-                    init = false;
-                    spatial.removeControl(this);
-                    action();
-                }
-            }
-        }
-    }
-
-    /**
-     * Turns off all active particle emitters.
-     */
-    private void turnOff() {
-        for (ParticleEmitter particleEmitter : activeEmitter) {
-            particleEmitter.setParticlesPerSec(0f);
-        }
-    }
-
-    /**
-     * Initializes the radar particle emitter.
-     */
-    private void radar() {
-        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
-        mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/radar_beam.png"));
-        ParticleEmitter emitter = new ParticleEmitter("Effect", Type.Triangle, 50);
-        emitter.setMaterial(mat);
-        emitter.setImagesX(1); // columns
-        emitter.setImagesY(1); // rows
-        emitter.setSelectRandomImage(true);
-        emitter.setStartColor(ColorRGBA.White);
-        emitter.setEndColor(ColorRGBA.Black);
-        emitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0f, 0f, 2));
-        emitter.getParticleInfluencer().setVelocityVariation(0f);
-        emitter.setStartSize(0.1f);
-        emitter.setEndSize(10);
-        emitter.setGravity(0, 0, 0);
-        float life = 2.6f;
-        emitter.setLowLife(life);
-        emitter.setHighLife(life);
-        emitter.setLocalTranslation(radarPos.add(new Vector3f(0, 0, 5)));
-        emitter.setParticlesPerSec(1.8f);
-        app.getRootNode().attachChild(emitter);
-        radarEmitter = emitter;
-    }
-
-    /**
-     * Initializes multiple matrix particle streams.
-     */
-    private void matrix() {
-        for (int i = 0; i < 5; i++) {
-            particleStream(
-                    generateMatrixColor(),
-                    generateMatrixColor(),
-                    getRandomFloat(0, 1f),
-                    getRandomPosition(),
-                    getRandomFloat(1, 2)
-            );
-        }
-    }
-
-    /**
-     * Creates a particle stream with the specified parameters.
-     *
-     * @param start     the start color of the particles
-     * @param end       the end color of the particles
-     * @param speedVar  the speed variation of the particles
-     * @param pos       the position of the particles
-     * @param spawnVar  the spawn rate variation of the particles
-     */
-    private void particleStream(ColorRGBA start, ColorRGBA end, float speedVar, Vector3f pos, float spawnVar) {
-        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
-        mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
-        mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/particle_cir.png"));
-        ParticleEmitter matrix = new ParticleEmitter("Effect", Type.Triangle, 50);
-        matrix.setMaterial(mat);
-        matrix.setImagesX(2); // columns
-        matrix.setImagesY(1); // rows
-        matrix.setSelectRandomImage(true);
-        matrix.setStartColor(start);
-        matrix.setEndColor(end);
-        matrix.getParticleInfluencer().setInitialVelocity(new Vector3f(0f, 0f, -6f - speedVar));
-        matrix.getParticleInfluencer().setVelocityVariation(0f);
-        matrix.setStartSize(0.4f);
-        matrix.setEndSize(0.6f);
-        matrix.setGravity(0, 0, 2f);
-        matrix.setLowLife(3f);
-        matrix.setHighLife(3f);
-        matrix.setLocalTranslation(spatial.getLocalTranslation().add(pos).add(new Vector3f(0, 0, 15)));
-        matrix.setParticlesPerSec(spawnVar);
-        app.getRootNode().attachChild(matrix);
-        activeEmitter.add(matrix);
-    }
-
-    /**
-     * Generates a random position vector.
-     *
-     * @return a random position vector
-     */
-    public static Vector3f getRandomPosition() {
-        // Generate a random angle in radians (0 to 2π)
-        float angle = (float) (2 * Math.PI * RANDOM.nextDouble());
-
-        // Generate a random radius with uniform distribution
-        float radius = (float) Math.sqrt(RANDOM.nextDouble());
-        radius *= 1f;
-
-        // Convert polar coordinates to Cartesian
-        float x = radius * (float) Math.cos(angle);
-        float y = radius * (float) Math.sin(angle);
-
-        return new Vector3f(x, y, 0);
-    }
-
-    /**
-     * Generates a random float between the specified start and end values.
-     *
-     * @param start the start value
-     * @param end   the end value
-     * @return a random float between start and end
-     */
-    public static float getRandomFloat(float start, float end) {
-        if (start > end) {
-            throw new IllegalArgumentException("Start must be less than or equal to end.");
-        }
-        return start + RANDOM.nextFloat() * (end - start);
-    }
-
-    /**
-     * Generates a random color for the matrix particles.
-     *
-     * @return a random ColorRGBA object
-     */
-    public static ColorRGBA generateMatrixColor() {
-        // Red is dominant
-        float red = 0.8f + RANDOM.nextFloat() * 0.2f;  // Red channel: 0.8 to 1.0
-        // Green is moderately high
-        float green = 0.4f + RANDOM.nextFloat() * 0.3f;  // Green channel: 0.4 to 0.7
-        // Blue is minimal
-        float blue = RANDOM.nextFloat() * 0.2f;  // Blue channel: 0.0 to 0.2
-        float alpha = 1.0f;  // Fully opaque
-
-        return new ColorRGBA(red, green, blue, alpha);
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MissileAnimation.java

@@ -1,183 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
-import com.jme3.renderer.queue.RenderQueue;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.control.AbstractControl;
-import pp.mdga.client.Asset;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.client.acoustic.MdgaSound;
-import pp.mdga.client.board.BoardHandler;
-
-/**
- * The {@code MissileAnimation} class handles the animation of a missile moving along a parabolic path
- * towards a target point in a 3D environment. It also triggers an explosion at the target upon impact.
- */
-public class MissileAnimation {
-
-    private final Node rootNode;
-    private final MdgaApp app;
-    private final Vector3f start;
-    private final Vector3f target;
-    private final float flightTime;
-    private Explosion explosion;
-    private Spatial missileModel;
-    private Runnable actionAfter;
-    private ParticleEmitter smoke;
-
-    private Node missileNode = new Node();
-
-    private final Material mat;
-
-    /**
-     * Constructor for the {@code MissileAnimation} class.
-     *
-     * @param app        The main application managing the missile animation.
-     * @param rootNode   The root node to which the missile model will be attached.
-     * @param target     The target point where the missile will explode.
-     * @param flightTime The total flight time of the missile.
-     */
-    public MissileAnimation(MdgaApp app, Node rootNode, Vector3f target, float flightTime, Runnable actionAfter) {
-        this.app = app;
-        this.rootNode = rootNode;
-        this.flightTime = flightTime;
-        this.actionAfter = actionAfter;
-
-        explosion = new Explosion(app, rootNode, target);
-
-        this.target = target.add(new Vector3f(1.5f, -1, 0));
-
-
-        start = BoardHandler.gridToWorld(12, 0);
-        start.add(new Vector3f(0, 0, 0));
-
-        this.mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
-        mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/vapor_cloud.png"));
-
-        smoke = new ParticleEmitter("Effect2", ParticleMesh.Type.Triangle, 400);
-        smoke.setMaterial(mat);
-        smoke.setImagesX(3);
-        smoke.setImagesY(3);
-        smoke.setStartColor(ColorRGBA.DarkGray);
-        smoke.setEndColor(new ColorRGBA(0.05f, 0.05f, 0.05f, 1));
-        smoke.getParticleInfluencer().setInitialVelocity(new Vector3f(0.0f, 0.0f, 0.0f));
-        smoke.getParticleInfluencer().setVelocityVariation(0.1f);
-        smoke.setStartSize(0.8f);
-        smoke.setEndSize(1.5f);
-        smoke.setGravity(0, 0, -0.3f);
-        smoke.setLowLife(1.2f);
-        smoke.setHighLife(3.5f);
-        smoke.setParticlesPerSec(100);
-        missileNode.attachChild(smoke);
-        smoke.move(1, 0.85f, 1.0f);
-    }
-
-    /**
-     * Starts the missile animation by loading the missile model and initiating its parabolic movement.
-     */
-    public void start() {
-        Smoke s = new Smoke(app, rootNode, start);
-        s.trigger();
-        loadMissile();
-        app.getAcousticHandler().playSound(MdgaSound.MISSILE);
-        animateMissile();
-    }
-
-    /**
-     * Loads the missile model into the scene, applies scaling, material, and sets its initial position.
-     */
-    private void loadMissile() {
-        missileModel = app.getAssetManager().loadModel(Asset.missile.getModelPath());
-        missileModel.scale(Asset.missile.getSize());
-        missileModel.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
-        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
-        mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(Asset.missile.getDiffPath()));
-        missileModel.setMaterial(mat);
-
-        missileNode.setLocalTranslation(start);
-        missileNode.attachChild(missileModel);
-
-        rootNode.attachChild(missileNode);
-    }
-
-    /**
-     * Animates the missile along a parabolic path, triggers the explosion near the target,
-     * and removes the missile model after the animation completes.
-     */
-    private void animateMissile() {
-        missileNode.addControl(new AbstractControl() {
-            private float elapsedTime = 0;
-
-            @Override
-            protected void controlUpdate(float tpf) {
-                if (elapsedTime > 6) {
-                    endAnim();
-                    rootNode.detachChild(missileNode);
-                    this.spatial.removeControl(this);
-                }
-
-                elapsedTime += tpf;
-                float progress = elapsedTime / flightTime;
-
-                if (progress >= 0.55) {
-                    smoke.setParticlesPerSec(30);
-                }
-
-                if (progress >= 0.7) {
-                    smoke.setParticlesPerSec(0);
-                }
-
-                if (progress >= 0.95f) {
-                    explosion.trigger();
-                }
-
-                if (progress >= 1) {
-                    explosion.trigger();
-                    missileNode.detachChild(missileModel);
-                }
-
-                Vector3f currentPosition = computeParabolicPath(start, target, progress);
-                missileNode.setLocalTranslation(currentPosition);
-
-                Vector3f direction = computeParabolicPath(start, target, progress + 0.01f)
-                        .subtract(currentPosition)
-                        .normalizeLocal();
-                missileModel.lookAt(currentPosition.add(direction), Vector3f.UNIT_Y);
-                missileModel.rotate(0, FastMath.HALF_PI, 0);
-            }
-
-            @Override
-            protected void controlRender(RenderManager rm, ViewPort vp) {
-            }
-        });
-    }
-
-    private void endAnim() {
-        actionAfter.run();
-    }
-
-    /**
-     * Computes a position along a parabolic path at a given progress value {@code t}.
-     *
-     * @param start  The starting point of the missile's flight.
-     * @param target The target point of the missile's flight.
-     * @param t      The progress value (0.0 to 1.0) along the flight path.
-     * @return The interpolated position along the parabolic path.
-     */
-    private Vector3f computeParabolicPath(Vector3f start, Vector3f target, float t) {
-        Vector3f midPoint = start.add(target).multLocal(0.5f);
-        midPoint.addLocal(0, 0, 20);
-
-        Vector3f startToMid = FastMath.interpolateLinear(t, start, midPoint);
-        Vector3f midToTarget = FastMath.interpolateLinear(t, midPoint, target);
-        return FastMath.interpolateLinear(t, startToMid, midToTarget);
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MoveControl.java

@@ -1,9 +1,7 @@
 package pp.mdga.client.animation;
 
 import com.jme3.math.Vector3f;
-
-import static pp.mdga.client.Util.easeInOut;
-import static pp.mdga.client.Util.quadInt;
+import pp.mdga.client.InitControl;
 
 /**
  * A control that smoothly moves a spatial from an initial position to an end position
@@ -14,42 +12,35 @@
  * an ease-in-out curve to create a smooth start and stop effect.
  * </p>
  */
-public class MoveControl extends ActionControl {
+public class MoveControl extends InitControl {
 
     private boolean moving;
     private final Vector3f initPos;
     private final Vector3f endPos;
     private final Vector3f middlePos;
-    private final float height;
-    private final float duration;
-    private float timer = 0;
-    private boolean easing;
+    private final static float HEIGHT = 2;
+    private final static float MOVE_SPEED = 1f;
+    private float progress = 0;
+    private final Runnable actionAfter;
 
     /**
      * Creates a new MoveControl with specified initial and end positions, and an action to run after the movement.
      * The movement follows a path with a midpoint at a fixed height.
      *
-     * @param initPos     The starting position of the spatial.
-     * @param endPos      The target position of the spatial.
+     * @param initPos The starting position of the spatial.
+     * @param endPos The target position of the spatial.
      * @param actionAfter A Runnable that will be executed after the movement finishes.
      */
-    public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter) {
-        this(initPos, endPos, actionAfter, 2, 1, true);
-    }
-
-    public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter, float height, float duration, boolean easing) {
-        super(actionAfter);
+    public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter){
         moving = false;
         this.initPos = initPos;
         this.endPos = endPos;
-        this.height = height;
-        this.duration = duration;
-        this.easing = easing;
         middlePos = new Vector3f(
-                (initPos.x + endPos.x) / 2,
-                (initPos.y + endPos.y) / 2,
-                height
+            (initPos.x + endPos.x) / 2,
+            (initPos.y + endPos.y) / 2,
+            HEIGHT
         );
+        this.actionAfter = actionAfter;
     }
 
     /**
@@ -59,7 +50,7 @@ public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter, floa
     @Override
     protected void initSpatial() {
         moving = true;
-        timer = 0;
+        progress = 0;
     }
 
     /**
@@ -71,28 +62,48 @@ protected void initSpatial() {
      */
     @Override
     protected void controlUpdate(float tpf) {
-        if (!moving) return;
-        timer += tpf;
-
-        float t = timer / duration;
-        if (t >= 1) t = 1;
-
-        float interpolated = easing ? easeInOut(t) : t;
-
-        spatial.setLocalTranslation(quadInt(initPos, middlePos, endPos, interpolated));
-
-        if (t >= 1) end();
+        if(!moving) return;
+        progress += tpf * MOVE_SPEED;
+        if(progress > 1) progress = 1;
+        spatial.setLocalTranslation(quadInt(initPos,middlePos,endPos, easeInOut(progress)));
+        if(progress == 1) end();
     }
 
     /**
      * Ends the movement by stopping the interpolation, running the action after the movement,
      * and removing this control from the spatial.
      */
-    private void end() {
+    private void end(){
         moving = false;
+        actionAfter.run();
         spatial.removeControl(this);
-        action();
     }
 
+    /**
+     * Performs quadratic interpolation between three points.
+     *
+     * @param p1 The initial point.
+     * @param p2 The middle point.
+     * @param p3 The final point.
+     * @param t The interpolation parameter (0 <= t <= 1).
+     * @return The interpolated point.
+     */
+    private Vector3f quadInt(Vector3f p1, Vector3f p2, Vector3f p3, float t) {
+        // Quadratic interpolation: (1-t)^2 * p1 + 2 * (1-t) * t * p2 + t^2 * p3
+        float oneMinusT = 1 - t;
+        return p1.mult(oneMinusT * oneMinusT)
+                 .add(p2.mult(2 * oneMinusT * t))
+                 .add(p3.mult(t * t));
+    }
 
+    /**
+     * A smooth ease-in-out function for interpolation.
+     * It accelerates and decelerates the interpolation for a smoother effect.
+     *
+     * @param x The interpolation parameter (0 <= x <= 1).
+     * @return The adjusted interpolation value.
+     */
+    private float easeInOut(float x){
+            return x < 0.5 ? 4 * x * x * x : (float) (1 - Math.pow(-2 * x + 2, 3) / 2);
+    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ShellAnimation.java

@@ -1,199 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Spatial;
-import pp.mdga.client.Asset;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.client.acoustic.MdgaSound;
-import pp.mdga.client.board.TankTopControl;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import static com.jme3.material.Materials.LIGHTING;
-
-/**
- * ShellAnimation class handles the animation of a shell being fired from a tank.
- */
-public class ShellAnimation extends ActionControl {
-    private static final float FLYING_DURATION = 1.25f;
-    private static final float FLYING_HEIGHT = 12f;
-    private TankTopControl tankTopControl;
-    private MdgaApp app;
-
-    /**
-     * Constructor for ShellAnimation.
-     *
-     * @param tankTopControl the control for the tank top
-     * @param app the application instance
-     * @param actionAfter the action to perform after the animation
-     */
-    public ShellAnimation(TankTopControl tankTopControl, MdgaApp app, Runnable actionAfter) {
-        super(actionAfter);
-        this.tankTopControl = tankTopControl;
-        this.app = app;
-    }
-
-    /**
-     * Initializes the spatial for the animation.
-     */
-    @Override
-    protected void initSpatial() {
-        tankTopControl.rotate(spatial.getLocalTranslation(), this::shoot);
-        app.getAcousticHandler().playSound(MdgaSound.TURRET_ROTATE);
-        //app.getRootNode().attachChild(createShell());
-    }
-
-    /**
-     * Calculates the shooting position based on the tank's turret rotation.
-     *
-     * @return the shooting position as a Vector3f
-     */
-    private Vector3f getShootPos() {
-        Vector3f localOffset = new Vector3f(0, -5.4f, 2.9f);
-        Quaternion turretRotation = tankTopControl.getSpatial().getLocalRotation();
-        Vector3f transformedOffset = turretRotation.mult(localOffset);
-        return tankTopControl.getSpatial().getLocalTranslation().add(transformedOffset);
-    }
-
-    /**
-     * Handles the shooting action, including sound and visual effects.
-     */
-    private void shoot() {
-        app.getAcousticHandler().playSound(MdgaSound.TANK_SHOOT);
-        Vector3f shootPos = getShootPos();
-        createEffect(
-                shootPos,
-                "Images/particle/flame.png",
-                2, 2,
-                1, 3,
-                1f,
-                0.3f, 0.7f,
-                new ColorRGBA(1f, 0.8f, 0.4f, 0.5f),
-                new ColorRGBA(1f, 0f, 0f, 0f)
-        );
-        createEffect(
-                shootPos,
-                "Images/particle/vapor_cloud.png",
-                3, 3,
-                0.3f, 0.8f,
-                10,
-                0.1f, 0.35f,
-                new ColorRGBA(0.5f, 0.5f, 0.5f, 0.5f),
-                ColorRGBA.Black
-        );
-
-        Spatial shell = createShell();
-        app.getRootNode().attachChild(shell);
-        shell.addControl(new ShellControl(this::hitExplosion, shootPos, spatial.getLocalTranslation(), FLYING_HEIGHT, FLYING_DURATION, app.getAssetManager()));
-    }
-
-    /**
-     * Creates the shell model and sets its initial properties.
-     *
-     * @return the created shell as a Spatial
-     */
-    private Spatial createShell() {
-        Spatial model = app.getAssetManager().loadModel(Asset.shell.getModelPath());
-        model.scale(.16f);
-        model.setLocalTranslation(tankTopControl.getSpatial().getLocalTranslation());
-
-        Vector3f shootPos = tankTopControl.getSpatial().getLocalTranslation();
-        Vector3f targetPos = spatial.getLocalTranslation();
-        Vector3f direction = targetPos.subtract(shootPos).normalize();
-
-        Quaternion rotation = new Quaternion();
-        rotation.lookAt(direction, new Vector3f(1, 0, 0)); // Assuming UNIT_Y is the up vector
-
-        model.setLocalRotation(rotation);
-        model.rotate(FastMath.HALF_PI, 0, 0);
-
-        Material mat = new Material(app.getAssetManager(), LIGHTING);
-        mat.setBoolean("UseMaterialColors", true);
-        ColorRGBA color = ColorRGBA.fromRGBA255(143, 117, 0, 255);
-        mat.setColor("Diffuse", color);
-        mat.setColor("Ambient", color);
-        model.setMaterial(mat);
-        return model;
-    }
-
-    /**
-     * Handles the explosion effect when the shell hits a target.
-     */
-    private void hitExplosion() {
-        app.getAcousticHandler().playSound(MdgaSound.TANK_EXPLOSION);
-        createEffect(
-                spatial.getLocalTranslation().setZ(1),
-                "Images/particle/flame.png",
-                2, 2,
-                1, 5,
-                2f,
-                0.3f, 0.7f,
-                new ColorRGBA(1f, 0.8f, 0.4f, 0.5f),
-                new ColorRGBA(1f, 0f, 0f, 0f)
-        );
-        app.getTimerManager().addTask(0.8f, super::action);
-    }
-
-    /**
-     * Creates a particle effect at the specified position.
-     *
-     * @param shootPos the position to create the effect
-     * @param image the image to use for the particles
-     * @param x the number of columns in the texture
-     * @param y the number of rows in the texture
-     * @param startSize the initial size of the particles
-     * @param endSize the final size of the particles
-     * @param velocity the initial velocity of the particles
-     * @param lowLife the minimum lifetime of the particles
-     * @param highLife the maximum lifetime of the particles
-     * @param start the starting color of the particles
-     * @param end the ending color of the particles
-     */
-    private void createEffect(Vector3f shootPos,
-                              String image,
-                              int x, int y,
-                              float startSize, float endSize,
-                              float velocity,
-                              float lowLife, float highLife,
-                              ColorRGBA start, ColorRGBA end) {
-        // Create a particle emitter for the explosion
-        ParticleEmitter explosionEmitter = new ParticleEmitter("Explosion", ParticleMesh.Type.Triangle, 100);
-        Material explosionMat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
-        explosionMat.setTexture("Texture", app.getAssetManager().loadTexture(image));
-        explosionEmitter.setMaterial(explosionMat);
-
-        // Particle properties
-        explosionEmitter.setImagesX(x); // Columns in the texture
-        explosionEmitter.setImagesY(y); // Rows in the texture
-        explosionEmitter.setSelectRandomImage(true); // Randomize images for variety
-
-        explosionEmitter.setStartColor(start); // Bright yellowish orange
-        explosionEmitter.setEndColor(end); // Fade to transparent red
-
-        explosionEmitter.setStartSize(startSize); // Initial size
-        explosionEmitter.setEndSize(endSize); // Final size
-        explosionEmitter.setLowLife(lowLife); // Minimum lifetime of particles
-        explosionEmitter.setHighLife(highLife); // Maximum lifetime of particles
-        explosionEmitter.setGravity(0, 0, 1); // Gravity to pull particles down
-        explosionEmitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 0, velocity));
-        explosionEmitter.getParticleInfluencer().setVelocityVariation(1f); // Adds randomness to the initial velocity
-        explosionEmitter.setFacingVelocity(true); // Particles face their velocity direction
-        explosionEmitter.setLocalTranslation(shootPos);
-        explosionEmitter.setParticlesPerSec(0);
-        explosionEmitter.emitAllParticles();
-        app.getRootNode().attachChild(explosionEmitter);
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                app.getRootNode().detachChild(explosionEmitter);
-            }
-        }, 1000);
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ShellControl.java

@@ -1,112 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.asset.AssetManager;
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Vector3f;
-
-/**
- * ShellControl is responsible for controlling the movement and visual effects of a shell.
- */
-public class ShellControl extends ActionControl {
-    private final Vector3f shootPos;
-    private final Vector3f endPos;
-    private final float height;
-    private final float duration;
-    private Vector3f oldPos;
-    private ParticleEmitter emitter;
-    private AssetManager assetManager;
-
-    /**
-     * Constructs a new ShellControl.
-     *
-     * @param runnable the action to perform when the shell reaches its destination
-     * @param shootPos the starting position of the shell
-     * @param endPos the ending position of the shell
-     * @param height the height of the shell's trajectory
-     * @param duration the duration of the shell's flight
-     * @param assetManager the asset manager to load resources
-     */
-    public ShellControl(Runnable runnable, Vector3f shootPos, Vector3f endPos, float height, float duration, AssetManager assetManager) {
-        super(runnable);
-        this.shootPos = shootPos;
-        this.endPos = endPos;
-        this.height = height;
-        this.duration = duration;
-        this.assetManager = assetManager;
-    }
-
-    /**
-     * Initializes the spatial with the necessary controls and particle emitter.
-     */
-    @Override
-    protected void initSpatial() {
-        spatial.addControl(new MoveControl(
-                shootPos,
-                endPos,
-                () -> {
-                    emitter.killAllParticles();
-                    emitter.setParticlesPerSec(0);
-                    emitter.removeFromParent();
-                    spatial.removeControl(this);
-                    spatial.removeFromParent();
-                    action();
-                },
-                height,
-                duration,
-                false
-        ));
-        oldPos = spatial.getLocalTranslation().clone();
-        createEmitter();
-    }
-
-    /**
-     * Creates and configures the particle emitter for the shell trail.
-     */
-    private void createEmitter() {
-        emitter = new ParticleEmitter("ShellTrail", ParticleMesh.Type.Triangle, 200);
-        Material mat = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
-        mat.setTexture("Texture", assetManager.loadTexture("Images/particle/line.png")); // Nutze eine schmale, linienartige Textur
-        emitter.setMaterial(mat);
-
-        // Comic-Style Farben
-        emitter.setStartColor(new ColorRGBA(1f, 1f, 1f, 1f)); // Reinweiß
-        emitter.setEndColor(new ColorRGBA(1f, 1f, 1f, 0f)); // Transparent
-
-        // Partikelgröße und Lebensdauer
-        emitter.setStartSize(0.15f); // Startgröße
-        emitter.setEndSize(0.1f); // Endgröße
-        emitter.setLowLife(0.14f); // Sehr kurze Lebensdauer
-        emitter.setHighLife(0.14f);
-
-        emitter.setGravity(0, 0, 0); // Keine Gravitation
-        emitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 0, 0));
-        emitter.getParticleInfluencer().setVelocityVariation(0f); // Kein Variationsspielraum
-
-        // Hohe Dichte für eine glatte Spur
-        emitter.setParticlesPerSec(500);
-
-        // Zur Shell hinzufügen
-        spatial.getParent().attachChild(emitter);
-    }
-
-    /**
-     * Updates the control, adjusting the shell's rotation and emitter position.
-     *
-     * @param tpf time per frame
-     */
-    @Override
-    protected void controlUpdate(float tpf) {
-        Vector3f direction = spatial.getLocalTranslation().subtract(oldPos).normalize();
-        if (direction.lengthSquared() > 0) {
-            spatial.getLocalRotation().lookAt(direction, Vector3f.UNIT_X);
-            spatial.rotate(FastMath.HALF_PI, 0, 0);
-        }
-        oldPos = spatial.getLocalTranslation().clone();
-
-        emitter.setLocalTranslation(spatial.getLocalTranslation().clone());
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/Smoke.java

@@ -1,129 +0,0 @@
-package pp.mdga.client.animation;
-
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import com.jme3.scene.control.AbstractControl;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.client.acoustic.MdgaSound;
-
-public class Smoke {
-
-    private final Node rootNode;
-    private final MdgaApp app;
-    private final Vector3f location;
-    private ParticleEmitter fire;
-    private ParticleEmitter smoke;
-
-    private boolean triggered = false;
-
-    private final Material mat;
-
-    /**
-     * Constructor for the {@code Explosion} class.
-     *
-     * @param app      The main application managing the explosion.
-     * @param rootNode The root node to which the explosion effects will be attached.
-     * @param location The location of the explosion in world coordinates.
-     */
-    public Smoke(MdgaApp app, Node rootNode, Vector3f location) {
-        this.app = app;
-        this.rootNode = rootNode;
-        this.location = location;
-
-        this.mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
-        mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/vapor_cloud.png"));
-    }
-
-    /**
-     * Initializes the particle emitters for the explosion effect.
-     * Configures the fire and smoke emitters with appearance, behavior, and lifespan.
-     */
-    private void initializeEmitter() {
-        fire = new ParticleEmitter("Effect", ParticleMesh.Type.Triangle, 50);
-        fire.setMaterial(mat);
-        fire.setStartColor(ColorRGBA.DarkGray);
-        fire.setEndColor(ColorRGBA.DarkGray);
-        fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0.2f, 0.2f, 4f));
-        fire.getParticleInfluencer().setVelocityVariation(0.4f);
-        fire.setStartSize(0.7f);
-        fire.setEndSize(3.8f);
-        fire.setGravity(0, 0, -0.1f);
-        fire.setLowLife(0.5f);
-        fire.setHighLife(1.2f);
-        fire.setParticlesPerSec(0);
-
-        fire.setLocalTranslation(location);
-
-        smoke = new ParticleEmitter("Effect2", ParticleMesh.Type.Triangle, 40);
-        smoke.setMaterial(mat);
-        smoke.setImagesX(2);
-        smoke.setImagesY(2);
-        smoke.setStartColor(ColorRGBA.DarkGray);
-        smoke.setEndColor(new ColorRGBA(0.05f, 0.05f, 0.05f, 1));
-        smoke.getParticleInfluencer().setInitialVelocity(new Vector3f(0.0f, 0.0f, 2f));
-        smoke.getParticleInfluencer().setVelocityVariation(0.5f);
-        smoke.setStartSize(0.5f);
-        smoke.setEndSize(1.5f);
-        smoke.setGravity(0, 0, -0.3f);
-        smoke.setLowLife(1.2f);
-        smoke.setHighLife(2.5f);
-        smoke.setParticlesPerSec(0);
-
-        smoke.setLocalTranslation(location);
-
-        app.getAcousticHandler().playSound(MdgaSound.EXPLOSION);
-    }
-
-    /**
-     * Triggers the explosion effect by attaching and activating the particle emitters for fire and smoke.
-     * Both emitters are automatically detached after a predefined duration.
-     */
-    public void trigger() {
-        if (!triggered) {
-            triggered = true;
-            initializeEmitter();
-        }
-
-        rootNode.attachChild(fire);
-        fire.emitAllParticles();
-        fire.addControl(new AbstractControl() {
-            private float elapsedTime = 0;
-
-            @Override
-            protected void controlUpdate(float tpf) {
-                elapsedTime += tpf;
-                if (elapsedTime > 10f) {
-                    rootNode.detachChild(fire);
-                    fire.removeControl(this);
-                }
-            }
-
-            @Override
-            protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {
-            }
-        });
-
-        rootNode.attachChild(smoke);
-        smoke.emitAllParticles();
-        smoke.addControl(new AbstractControl() {
-            private float elapsedTime = 0;
-
-            @Override
-            protected void controlUpdate(float tpf) {
-                elapsedTime += tpf;
-                if (elapsedTime > 10f) {
-                    rootNode.detachChild(smoke);
-                    smoke.removeControl(this);
-                }
-            }
-
-            @Override
-            protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {
-            }
-        });
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/SymbolControl.java

@@ -172,8 +172,8 @@ public void turbo() {
      * Performs linear interpolation between two values.
      *
      * @param start The starting value.
-     * @param end   The target value.
-     * @param t     The interpolation parameter (0 <= t <= 1).
+     * @param end The target value.
+     * @param t The interpolation parameter (0 <= t <= 1).
      * @return The interpolated value.
      */
     private static float lerp(float start, float end, float t) {

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/TimerManager.java

@@ -1,79 +0,0 @@
-package pp.mdga.client.animation;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class TimerManager {
-    private final List<TimedTask> tasks = new ArrayList<>();
-
-    /**
-     * Add a timed task that will execute after the specified delay.
-     *
-     * @param delaySeconds The delay in seconds.
-     * @param task         The Runnable task to execute after the delay.
-     */
-    public void addTask(float delaySeconds, Runnable task) {
-        tasks.add(new TimedTask(delaySeconds, task));
-    }
-
-    /**
-     * Update the timer manager to process and execute tasks when their delay has elapsed.
-     * This should be called in the `controlUpdate` method or a similar update loop.
-     *
-     * @param tpf Time per frame (delta time) provided by the update loop.
-     */
-    public void update(float tpf) {
-        Iterator<TimedTask> iterator = tasks.iterator();
-        while (iterator.hasNext()) {
-            TimedTask task = iterator.next();
-            task.update(tpf);
-            if (task.isReady()) {
-                task.run();
-                iterator.remove();
-            }
-        }
-    }
-
-    /**
-     * Clears all pending tasks from the manager.
-     */
-    public void clearTasks() {
-        tasks.clear();
-    }
-
-    /**
-     * Checks if the manager has any pending tasks.
-     *
-     * @return True if there are pending tasks, otherwise false.
-     */
-    public boolean hasPendingTasks() {
-        return !tasks.isEmpty();
-    }
-
-    /**
-     * Internal class representing a single timed task.
-     */
-    private static class TimedTask {
-        private float remainingTime;
-        private final Runnable task;
-
-        public TimedTask(float delaySeconds, Runnable task) {
-            this.remainingTime = delaySeconds;
-            this.task = task;
-        }
-
-        public void update(float tpf) {
-            remainingTime -= tpf;
-        }
-
-        public boolean isReady() {
-            return remainingTime <= 0;
-        }
-
-        public void run() {
-            task.run();
-        }
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ZoomControl.java

@@ -17,8 +17,8 @@ public class ZoomControl extends InitControl {
     private float zoomFactor = 1f;
 
     /**
-     * Constructs a new ZoomControl with the default zoom speed.
-     */
+      * Constructs a new ZoomControl with the default zoom speed.
+      */
     public ZoomControl() {
     }
 
@@ -78,8 +78,8 @@ private void end() {
      * Performs linear interpolation between two values.
      *
      * @param start The starting value.
-     * @param end   The target value.
-     * @param t     The interpolation parameter (0 <= t <= 1).
+     * @param end The target value.
+     * @param t The interpolation parameter (0 <= t <= 1).
      * @return The interpolated value.
      */
     private static float lerp(float start, float end, float t) {

Projekte/mdga/client/src/main/java/pp/mdga/client/board/AssetOnMap.java

@@ -5,5 +5,4 @@
 /**
  * Record for holding Asset information
  */
-record AssetOnMap(Asset asset, int x, int y, float rot) {
-}
+record AssetOnMap(Asset asset, int x, int y, float rot) {}

Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java

@@ -1,8 +1,6 @@
 package pp.mdga.client.board;
 
 import com.jme3.material.Material;
-import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.renderer.queue.RenderQueue;
@@ -11,8 +9,7 @@
 import com.jme3.scene.control.AbstractControl;
 import pp.mdga.client.Asset;
 import pp.mdga.client.MdgaApp;
-import pp.mdga.client.acoustic.MdgaSound;
-import pp.mdga.client.animation.*;
+import pp.mdga.client.animation.MoveControl;
 import pp.mdga.client.gui.DiceControl;
 import pp.mdga.game.Color;
 import pp.mdga.game.Piece;
@@ -53,26 +50,21 @@ public class BoardHandler {
     // Flags and lists for handling piece selection and movement
     private List<PieceControl> selectableOwnPieces;
     private List<PieceControl> selectableEnemyPieces;
-    private Map<PieceControl, NodeControl> selectedPieceNodeMap;
     private List<NodeControl> outlineNodes;
     private PieceControl selectedOwnPiece;
     private PieceControl selectedEnemyPiece;
     private DiceControl diceControl;
-    //Radar Position for Matrix animation
-    private Vector3f radarPos;
-    //TankTop for shellAnimation
-    private TankTopControl tankTop;
 
     /**
      * Creates a new BoardHandler.
      *
-     * @param app      The main application instance
+     * @param app The main application instance
      * @param rootNode The root node where the board will be attached
-     * @param fpp      The post-processor for effects like shadows or filters
+     * @param fpp The post-processor for effects like shadows or filters
      * @throws RuntimeException if the app is null
      */
     public BoardHandler(MdgaApp app, Node rootNode, FilterPostProcessor fpp) {
-        if (app == null) throw new RuntimeException("app is null");
+        if(app == null) throw new RuntimeException("app is null");
 
         this.app = app;
         this.fpp = fpp;
@@ -88,7 +80,6 @@ public void init() {
         isInitialised = true;
         selectableOwnPieces = new ArrayList<>();
         selectableEnemyPieces = new ArrayList<>();
-        selectedPieceNodeMap = new HashMap<>();
         outlineNodes = new ArrayList<>();
         selectedOwnPiece = null;
         selectedEnemyPiece = null;
@@ -99,7 +90,7 @@ public void init() {
     /**
      * Shuts down the board handler by detaching all board-related nodes and clearing selected pieces.
      */
-    public void shutdown() {
+    public void shutdown(){
         clearSelectable();
         isInitialised = false;
         rootNode.detachChild(rootNodeBoard);
@@ -108,7 +99,7 @@ public void shutdown() {
     /**
      * Adds an asset to the map of player assets, ensuring that the player does not have too many assets.
      *
-     * @param col        The color of the player
+     * @param col The color of the player
      * @param assetOnMap The asset to be added
      * @throws RuntimeException if there are too many assets for the player
      */
@@ -129,7 +120,7 @@ private void initMap() {
         waitingPiecesMap = new HashMap<>();
         pieceColor = new HashMap<>();
         diceControl = new DiceControl(app.getAssetManager());
-        diceControl.create(new Vector3f(0, 0, 0), 0.7f, true);
+        diceControl.create(new Vector3f(0,0,0), 0.7f, true);
         waitingNodes = new HashMap<>();
         waitingNodes.put(Color.AIRFORCE, new HashMap<>());
         waitingNodes.put(Color.ARMY, new HashMap<>());
@@ -146,7 +137,7 @@ private void initMap() {
                 case cir -> addFigureToPlayerMap(assetToColor(Asset.cir), assetOnMap);
                 case marine -> addFigureToPlayerMap(assetToColor(Asset.marine), assetOnMap);
                 case node_normal, node_bonus, node_start ->
-                        infield.add(displayAndControl(assetOnMap, new NodeControl(app, fpp)));
+                    infield.add(displayAndControl(assetOnMap, new NodeControl(app, fpp)));
                 case node_home_black -> addHomeNode(homeNodesMap, Color.AIRFORCE, assetOnMap);
                 case node_home_blue -> addHomeNode(homeNodesMap, Color.NAVY, assetOnMap);
                 case node_home_green -> addHomeNode(homeNodesMap, Color.ARMY, assetOnMap);
@@ -155,24 +146,12 @@ private void initMap() {
                 case node_wait_blue -> addHomeNode(waitingNodesMap, Color.NAVY, assetOnMap);
                 case node_wait_green -> addHomeNode(waitingNodesMap, Color.ARMY, assetOnMap);
                 case node_wait_yellow -> addHomeNode(waitingNodesMap, Color.CYBER, assetOnMap);
-                case radar -> addRadar(assetOnMap);
-                case tankShoot -> addTankShoot(assetOnMap);
 
                 default -> displayAsset(assetOnMap);
             }
         }
     }
 
-    private void addTankShoot(AssetOnMap assetOnMap) {
-        displayAsset(assetOnMap);
-        tankTop = displayAndControl(new AssetOnMap(Asset.tankShootTop, assetOnMap.x(), assetOnMap.y(), assetOnMap.rot()), new TankTopControl());
-    }
-
-    private void addRadar(AssetOnMap assetOnMap) {
-        radarPos = gridToWorld(assetOnMap.x(), assetOnMap.y());
-        displayAsset(assetOnMap);
-    }
-
     /**
      * Converts an asset to its corresponding color.
      *
@@ -194,8 +173,8 @@ private Color assetToColor(Asset asset) {
      * Creates a 3D model of an asset and adds it to the board.
      *
      * @param asset The asset to be displayed
-     * @param pos   The position of the asset on the board
-     * @param rot   The rotation of the asset
+     * @param pos The position of the asset on the board
+     * @param rot The rotation of the asset
      * @return The Spatial representation of the asset
      */
     private Spatial createModel(Asset asset, Vector3f pos, float rot) {
@@ -206,16 +185,11 @@ private Spatial createModel(Asset asset, Vector3f pos, float rot) {
         model.rotate((float) Math.toRadians(0), 0, (float) Math.toRadians(rot));
         model.setLocalTranslation(pos);
         model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
-
         Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
         mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(texName));
-        mat.setBoolean("UseMaterialColors", true); // Required for Material Colors
-        mat.setColor("Diffuse", new ColorRGBA(1, 1, 1, 1)); // White color with full alpha
-        mat.setColor("Ambient", new ColorRGBA(1, 1, 1, 1)); // Ambient color with full alpha
-        mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
         model.setMaterial(mat);
-
         rootNodeBoard.attachChild(model);
+
         return model;
     }
 
@@ -226,7 +200,7 @@ private Spatial createModel(Asset asset, Vector3f pos, float rot) {
      * @param y The y-coordinate on the grid
      * @return The corresponding world position
      */
-    public static Vector3f gridToWorld(int x, int y) {
+    private static Vector3f gridToWorld(int x, int y) {
         return new Vector3f(GRID_SIZE * x, GRID_SIZE * y, GRID_ELEVATION);
     }
 
@@ -242,39 +216,17 @@ private Spatial displayAsset(AssetOnMap assetOnMap) {
         return createModel(assetOnMap.asset(), gridToWorld(x, y), assetOnMap.rot());
     }
 
-    /**
-     * Adds a visual representation of an asset to the scene, attaches a control to it, and returns the control.
-     *
-     * @param assetOnMap The asset to be displayed in the 3D environment.
-     * @param control    The control to be added to the spatial representing the asset.
-     * @param <T>        The type of control, extending {@code AbstractControl}.
-     * @return The control that was added to the spatial.
-     */
     private <T extends AbstractControl> T displayAndControl(AssetOnMap assetOnMap, T control) {
         Spatial spatial = displayAsset(assetOnMap);
         spatial.addControl(control);
         return control;
     }
 
-    /**
-     * Moves a piece in the 3D environment to the location of a specified node.
-     *
-     * @param pieceControl The control managing the piece to be moved.
-     * @param nodeControl  The control managing the target node to which the piece will move.
-     */
-    private void movePieceToNode(PieceControl pieceControl, NodeControl nodeControl) {
+    private void movePieceToNode(PieceControl pieceControl, NodeControl nodeControl){
         pieceControl.setLocation(nodeControl.getLocation());
     }
 
-    /**
-     * Adds a home node for a specific player color, attaching it to the map of home nodes.
-     *
-     * @param map        The map storing lists of home nodes by player color.
-     * @param color      The color associated with the home nodes to be added.
-     * @param assetOnMap The asset representing the home node in the 3D environment.
-     * @throws RuntimeException if more than 4 home nodes are added for a single color.
-     */
-    private void addHomeNode(Map<Color, List<NodeControl>> map, Color color, AssetOnMap assetOnMap) {
+    private void addHomeNode(Map<Color, List<NodeControl>> map, Color color, AssetOnMap assetOnMap){
         List<NodeControl> homeNodes = addItemToMapList(map, color, displayAndControl(assetOnMap, new NodeControl(app, fpp)));
         if (homeNodes.size() > 4) throw new RuntimeException("too many homeNodes for " + color);
     }
@@ -290,74 +242,47 @@ private float getRotationMove(Vector3f prev, Vector3f next) {
         Vector3f direction = next.subtract(prev).normalizeLocal();
         //I had to reverse dir.y, because then it worked.
         float newRot = (float) Math.toDegrees(Math.atan2(direction.x, -direction.y));
-        if (newRot < 0) newRot += 360;
+        if(newRot < 0) newRot += 360;
         return newRot;
     }
 
     /**
-     * Recursively moves a piece from its current index to the destination index,
-     * to keep track of the piece rotation.
-     *
-     * @param uuid      The UUID of the piece to move.
-     * @param curIndex  The current index of the piece.
-     * @param moveIndex The target index to move the piece to.
+        * Recursively moves a piece from its current index to the destination index,
+        * to keep track of the piece rotation.
+        *
+        * @param uuid The UUID of the piece to move.
+        * @param curIndex The current index of the piece.
+        * @param moveIndex The target index to move the piece to.
      */
-    private void movePieceRek(UUID uuid, int curIndex, int moveIndex) {
+    private void movePieceRek(UUID uuid, int curIndex, int moveIndex){
         if (curIndex == moveIndex) return;
 
-        int nextIndex = (curIndex + 1) % infield.size();
+        curIndex = (curIndex + 1) % infield.size();
 
         PieceControl pieceControl = pieces.get(uuid);
-        NodeControl nodeCur = infield.get(curIndex);
-        NodeControl nodeMove = infield.get(nextIndex);
+        NodeControl nodeControl = infield.get(curIndex);
 
-        pieceControl.setRotation(getRotationMove(nodeCur.getLocation(), nodeMove.getLocation()));
+        pieceControl.setRotation(getRotationMove(pieceControl.getLocation(),nodeControl.getLocation()));
 
-        movePieceToNode(pieceControl, nodeMove);
+        movePieceToNode(pieceControl, nodeControl);
 
-
-        movePieceRek(uuid, nextIndex, moveIndex);
+        movePieceRek(uuid, curIndex, moveIndex);
     }
 
-    /**
-     * Adds an item to a list in a map. If the key does not exist in the map, a new list is created.
-     *
-     * @param map  The map containing lists of items.
-     * @param key  The key associated with the list in the map.
-     * @param item The item to be added to the list.
-     * @param <T>  The type of items in the list.
-     * @param <E>  The type of the key in the map.
-     * @return The updated list associated with the specified key.
-     */
-    private <T, E> List<T> addItemToMapList(Map<E, List<T>> map, E key, T item) {
+    private <T, E> List<T> addItemToMapList(Map<E,List<T>> map, E key, T item){
         List<T> list = map.getOrDefault(key, new ArrayList<>());
         list.add(item);
         map.put(key, list);
         return list;
     }
 
-    /**
-     * Removes an item from a list in a map. If the key does not exist in the map, a new list is created.
-     *
-     * @param map  The map containing lists of items.
-     * @param key  The key associated with the list in the map.
-     * @param item The item to be removed from the list.
-     * @param <T>  The type of items in the list.
-     * @param <E>  The type of the key in the map.
-     */
-    private <T, E> void removeItemFromMapList(Map<E, List<T>> map, E key, T item) {
+    private <T, E> void removeItemFromMapList(Map<E,List<T>> map, E key, T item){
         List<T> list = map.getOrDefault(key, new ArrayList<>());
         list.remove(item);
         map.put(key, list);
     }
 
-    /**
-     * Calculates the mean position of the waiting nodes for a specific color.
-     *
-     * @param color The color associated with the waiting nodes.
-     * @return The mean position of the waiting nodes as a {@code Vector3f}.
-     */
-    private Vector3f getWaitingPos(Color color) {
+    private Vector3f getWaitingPos(Color color){
         return getMeanPosition(waitingNodesMap.get(color).stream().map(NodeControl::getLocation).toList());
     }
 
@@ -381,22 +306,20 @@ public static Vector3f getMeanPosition(List<Vector3f> vectors) {
      * Adds a player to the game by associating a color and a list of UUIDs to corresponding assets and waiting nodes.
      *
      * @param color the color of the player
-     * @param uuid  the list of UUIDs representing the player's assets
+     * @param uuid the list of UUIDs representing the player's assets
      * @throws RuntimeException if the number of assets or waiting nodes does not match the provided UUIDs
      */
     public void addPlayer(Color color, List<UUID> uuid) {
 
         List<AssetOnMap> playerAssets = colorAssetsMap.get(color);
         if (playerAssets == null) throw new RuntimeException("Assets for Player color are not defined");
-        if (uuid.size() != playerAssets.size())
-            throw new RuntimeException("UUID array and playerAssets are not the same size");
+        if (uuid.size() != playerAssets.size()) throw new RuntimeException("UUID array and playerAssets are not the same size");
 
         List<NodeControl> waitNodes = waitingNodesMap.get(color);
-        if (waitNodes.size() != playerAssets.size())
-            throw new RuntimeException("waitNodes size does not match playerAssets size");
+        if (waitNodes.size() != playerAssets.size()) throw new RuntimeException("waitNodes size does not match playerAssets size");
 
 
-        for (int i = 0; i < playerAssets.size(); i++) {
+        for (int i = 0; i < playerAssets.size(); i++){
             AssetOnMap assetOnMap = playerAssets.get(i);
             UUID pieceUuid = uuid.get(i);
 
@@ -421,18 +344,18 @@ public void addPlayer(Color color, List<UUID> uuid) {
     /**
      * Moves a piece to its corresponding home node based on the given index.
      *
-     * @param uuid  the UUID of the piece to move
+     * @param uuid the UUID of the piece to move
      * @param index the index of the home node to move the piece to
      * @throws RuntimeException if the UUID is not mapped to a color or if the home nodes are not properly defined
      */
-    private void moveHomePiece(UUID uuid, int index) {
+    private void moveHomePiece(UUID uuid, int index){
 
         Color color = pieceColor.get(uuid);
-        if (color == null) throw new RuntimeException("uuid is not mapped to a color");
+        if(color == null) throw new RuntimeException("uuid is not mapped to a color");
 
         List<NodeControl> homeNodes = homeNodesMap.get(color);
 
-        if (homeNodesMap.size() != 4) throw new RuntimeException("HomeNodes for" + color + " are not properly defined");
+        if(homeNodesMap.size() != 4) throw new RuntimeException("HomeNodes for" + color + " are not properly defined");
 
         PieceControl pieceControl = pieces.get(uuid);
         NodeControl nodeControl = homeNodes.get(index);
@@ -440,22 +363,21 @@ private void moveHomePiece(UUID uuid, int index) {
 
         //rotate piece in direction of homeNodes
         NodeControl firstHomeNode = homeNodes.get(0);
-        NodeControl lastHomeNode = homeNodes.get(homeNodes.size() - 1);
+        NodeControl lastHomeNode = homeNodes.get(homeNodes.size()-1);
 
         pieceControl.setRotation(getRotationMove(firstHomeNode.getLocation(), lastHomeNode.getLocation()));
         app.getModelSynchronize().animationEnd();
-        app.getModelSynchronize().animationEnd();
     }
 
     /**
      * Starts the movement of a piece to a target node based on the given index.
      *
-     * @param uuid      the UUID of the piece to move
+     * @param uuid the UUID of the piece to move
      * @param nodeIndex the index of the target node to move the piece to
-     * @throws RuntimeException         if the UUID is not mapped to a color or the piece control is not found
+     * @throws RuntimeException if the UUID is not mapped to a color or the piece control is not found
      * @throws IllegalArgumentException if the node index is invalid
      */
-    private void movePieceStart(UUID uuid, int nodeIndex) {
+    private void movePieceStart(UUID uuid, int nodeIndex){
 
         // Farbe des Pieces abrufen
         Color color = pieceColor.get(uuid);
@@ -476,21 +398,19 @@ private void movePieceStart(UUID uuid, int nodeIndex) {
         removeItemFromMapList(waitingPiecesMap, color, pieceControl);
         waitingNodes.get(color).remove(uuid);
         app.getModelSynchronize().animationEnd();
-        app.getModelSynchronize().animationEnd();
     }
 
     /**
      * Moves a piece from its current position to the target position based on the given indexes.
      *
-     * @param uuid      the UUID of the piece to move
-     * @param curIndex  the current index of the piece
+     * @param uuid the UUID of the piece to move
+     * @param curIndex the current index of the piece
      * @param moveIndex the target index of the move
      */
-    private void movePiece(UUID uuid, int curIndex, int moveIndex) {
+    private void movePiece(UUID uuid, int curIndex, int moveIndex){
 
         movePieceRek(uuid, curIndex, moveIndex);
         app.getModelSynchronize().animationEnd();
-        app.getModelSynchronize().animationEnd();
     }
 
     /**
@@ -499,7 +419,7 @@ private void movePiece(UUID uuid, int curIndex, int moveIndex) {
      * @param uuid the UUID of the piece to throw
      * @throws RuntimeException if the UUID is not mapped to a color or if no available waiting nodes are found
      */
-    private void throwPiece(UUID uuid) {
+    private void throwPiece(UUID uuid){
 
         // Farbe des Pieces abrufen
         Color color = pieceColor.get(uuid);
@@ -523,7 +443,6 @@ private void throwPiece(UUID uuid) {
 
         // Synchronisation oder Animation
         pieceControl.rotateInit();
-        app.getAcousticHandler().playSound(MdgaSound.LOSE);
         app.getModelSynchronize().animationEnd();
     }
 
@@ -533,7 +452,8 @@ private void throwPiece(UUID uuid) {
      *
      * @param uuid the UUID of the piece to shield
      */
-    public void shieldPiece(UUID uuid) {
+    public void shieldPiece(UUID uuid){
+
         pieces.get(uuid).activateShield();
     }
 
@@ -542,7 +462,8 @@ public void shieldPiece(UUID uuid) {
      *
      * @param uuid the UUID of the piece to unshield
      */
-    public void unshieldPiece(UUID uuid) {
+    public void unshieldPiece(UUID uuid){
+
         pieces.get(uuid).deactivateShield();
     }
 
@@ -551,7 +472,7 @@ public void unshieldPiece(UUID uuid) {
      *
      * @param uuid the UUID of the piece to suppress the shield
      */
-    public void suppressShield(UUID uuid) {
+    public void suppressShield(UUID uuid){
 
         pieces.get(uuid).suppressShield();
     }
@@ -559,14 +480,14 @@ public void suppressShield(UUID uuid) {
     /**
      * Swaps the positions and rotations of two pieces.
      *
-     * @param p1   the first piece to swap
-     * @param p2   the second piece to swap
+     * @param p1 the first piece to swap
+     * @param p2 the second piece to swap
      * @param loc1 the original location of the first piece
      * @param rot1 the original rotation of the first piece
      * @param loc2 the original location of the second piece
      * @param rot2 the original rotation of the second piece
      */
-    private void swapPieces(PieceControl p1, PieceControl p2, Vector3f loc1, float rot1, Vector3f loc2, float rot2) {
+    private void swapPieces(PieceControl p1, PieceControl p2, Vector3f loc1, float rot1, Vector3f loc2, float rot2){
         p1.setLocation(loc2);
         p2.setLocation(loc1);
 
@@ -579,14 +500,13 @@ private void swapPieces(PieceControl p1, PieceControl p2, Vector3f loc1, float r
     /**
      * Outlines the possible move nodes for a list of pieces based on the move indices and whether it's a home move.
      *
-     * @param pieces     the list of UUIDs representing the pieces to outline
+     * @param pieces the list of UUIDs representing the pieces to outline
      * @param moveIndexe the list of indices for the target move nodes
-     * @param homeMoves  the list indicating whether the move is a home move
+     * @param homeMoves the list indicating whether the move is a home move
      * @throws RuntimeException if the sizes of the input lists do not match
      */
     public void outlineMove(List<UUID> pieces, List<Integer> moveIndexe, List<Boolean> homeMoves) {
-        if (pieces.size() != moveIndexe.size() || pieces.size() != homeMoves.size())
-            throw new RuntimeException("arrays are not the same size");
+        if(pieces.size() != moveIndexe.size() || pieces.size() != homeMoves.size()) throw new RuntimeException("arrays are not the same size");
 
         selectableEnemyPieces.clear();
         selectableOwnPieces.clear();
@@ -601,38 +521,44 @@ public void outlineMove(List<UUID> pieces, List<Integer> moveIndexe, List<Boolea
             if (homeMoves.get(i)) {
                 Color color = pieceColor.get(uuid);
                 nodeControl = homeNodesMap.get(color).get(moveIndexe.get(i));
-            } else {
+            }
+            else {
                 nodeControl = infield.get(moveIndexe.get(i));
             }
-            pieceControl.selectableOwn();
-            nodeControl.selectableOwn();
+            nodeControl.highlight();
+            pieceControl.highlight(false);
+            pieceControl.setHoverable(true);
+            pieceControl.setSelectable(true);
             outlineNodes.add(nodeControl);
             selectableOwnPieces.add(pieceControl);
-            selectedPieceNodeMap.put(pieceControl, nodeControl);
         }
     }
 
     /**
      * Outlines the pieces that can be swapped based on the provided own and enemy pieces.
      *
-     * @param ownPieces   the list of UUIDs representing the player's pieces
+     * @param ownPieces the list of UUIDs representing the player's pieces
      * @param enemyPieces the list of UUIDs representing the enemy's pieces
      */
-    public void outlineSwap(List<UUID> ownPieces, List<UUID> enemyPieces) {
+    public void outlineSwap(List<UUID> ownPieces, List<UUID> enemyPieces){
 
         selectableEnemyPieces.clear();
         selectableOwnPieces.clear();
         selectedOwnPiece = null;
         selectedEnemyPiece = null;
 
-        for (UUID uuid : ownPieces) {
+        for(UUID uuid : ownPieces) {
             PieceControl p = pieces.get(uuid);
-            p.selectableOwn();
+            p.highlight(false);
+            p.setHoverable(true);
+            p.setSelectable(true);
             selectableOwnPieces.add(p);
         }
-        for (UUID uuid : enemyPieces) {
+        for(UUID uuid : enemyPieces) {
             PieceControl p = pieces.get(uuid);
-            p.selectableEnemy();
+            p.highlight(true);
+            p.setHoverable(true);
+            p.setSelectable(true);
             selectableEnemyPieces.add(p);
         }
     }
@@ -642,15 +568,17 @@ public void outlineSwap(List<UUID> ownPieces, List<UUID> enemyPieces) {
      *
      * @param pieces the list of UUIDs representing the pieces to be shielded
      */
-    public void outlineShield(List<UUID> pieces) {
+    public void outlineShield(List<UUID> pieces){
         selectableOwnPieces.clear();
         selectableEnemyPieces.clear();
         selectedOwnPiece = null;
         selectedEnemyPiece = null;
 
-        for (UUID uuid : pieces) {
+        for (UUID uuid : pieces){
             PieceControl p = this.pieces.get(uuid);
-            p.selectableOwn();
+            p.highlight(false);
+            p.setHoverable(true);
+            p.setSelectable(true);
             selectableOwnPieces.add(p);
         }
     }
@@ -660,87 +588,59 @@ public void outlineShield(List<UUID> pieces) {
      *
      * @param pieceSelected the PieceControl instance representing the piece selected by the user
      */
-    public void pieceSelect(OutlineOEControl selected) {
-        PieceControl piece = getPieceByOE(selected);
-        NodeControl node = selectedPieceNodeMap.get(piece);
-
-        boolean isSelected = piece.isSelected();
-        if (selectableOwnPieces.contains(piece)) {
-            for (PieceControl p : selectableOwnPieces) {
-                p.selectOff();
-                NodeControl n = selectedPieceNodeMap.get(p);
-                if (n != null) n.selectOff();
+    public void pieceSelect(PieceControl pieceSelected) {
+        boolean isSelected = pieceSelected.isSelected();
+        if(selectableOwnPieces.contains(pieceSelected)){
+            for(PieceControl p : selectableOwnPieces) {
+                p.unSelect();
             }
             if (!isSelected) {
-                piece.selectOn();
-                if (node != null) node.selectOn();
-                selectedOwnPiece = piece;
-            } else {
-                piece.selectOff();
-                if (node != null) node.selectOff();;
+                pieceSelected.select();
+                selectedOwnPiece = pieceSelected;
+            }
+            else {
+                pieceSelected.unSelect();
                 selectedOwnPiece = null;
             }
-        } else if (selectableEnemyPieces.contains(piece)) {
-            for (PieceControl p : selectableEnemyPieces) {
-                p.selectOff();
+        }
+        else if(selectableEnemyPieces.contains(pieceSelected)) {
+            for(PieceControl p : selectableEnemyPieces) {
+                p.unSelect();
             }
             if (!isSelected) {
-                piece.selectOn();
-                selectedEnemyPiece = piece;
-            } else {
-                piece.selectOff();
+                pieceSelected.select();
+                selectedEnemyPiece = pieceSelected;
+            }
+            else {
+                pieceSelected.unSelect();
                 selectedEnemyPiece = null;
             }
-        } else throw new RuntimeException("pieceSelected is not in own/enemySelectablePieces");
+        }
+        else throw new RuntimeException("pieceSelected is not in own/enemySelectablePieces");
 
         app.getModelSynchronize().select(getKeyByValue(pieces, selectedOwnPiece), getKeyByValue(pieces, selectedEnemyPiece));
     }
 
-    public void hoverOn(OutlineOEControl hover) {
-        PieceControl piece = getPieceByOE(hover);
-        NodeControl node = selectedPieceNodeMap.get(piece);
-
-        piece.hoverOn();
-        if(node != null) node.hoverOn();
-    }
-
-    public void hoverOff(OutlineOEControl hover) {
-        PieceControl piece = getPieceByOE(hover);
-        NodeControl node = selectedPieceNodeMap.get(piece);
-
-        piece.hoverOff();
-        if(node != null) node.hoverOff();
-    }
-
-    private PieceControl getPieceByOE(OutlineOEControl control){
-        PieceControl piece;
-        if (control instanceof PieceControl p){
-            piece = p;
-        }
-        else if (control instanceof NodeControl n){
-            piece = getKeyByValue(selectedPieceNodeMap, n);
-        }
-        else throw new RuntimeException("selected is not instanceof piece or node");
-        return piece;
-    }
-
     /**
      * Clears all highlighted, selectable, and selected pieces and nodes.
      */
-    public void clearSelectable() {
-        for (PieceControl p : selectableOwnPieces) {
-            p.selectableOff();
-            NodeControl n = selectedPieceNodeMap.get(p);
-            if(n != null) n.selectableOff();
+    public void clearSelectable(){
+        for(PieceControl p : selectableEnemyPieces) {
+            p.unSelect();
+            p.unHighlight();
+            p.setSelectable(false);
         }
-        for (PieceControl p : selectableEnemyPieces) {
-            p.selectableOff();
+        for(PieceControl p : selectableOwnPieces) {
+            p.unSelect();
+            p.unHighlight();
+            p.setSelectable(false);
+        }
+        for(NodeControl n : outlineNodes){
+            n.deOutline();
         }
-
         outlineNodes.clear();
         selectableEnemyPieces.clear();
         selectableOwnPieces.clear();
-        selectedPieceNodeMap.clear();
         selectedEnemyPiece = null;
         selectedOwnPiece = null;
     }
@@ -750,16 +650,16 @@ public void clearSelectable() {
      *
      * @param color the color of the player whose dice should be displayed
      */
-    public void showDice(Color color) {
+    public void showDice(Color color){
         rootNodeBoard.attachChild(diceControl.getSpatial());
-        diceControl.setPos(getWaitingPos(color).add(new Vector3f(0, 0, 4)));
+        diceControl.setPos(getWaitingPos(color).add(new Vector3f(0,0,4)));
         diceControl.spin();
     }
 
     /**
      * Hides the dice from the view.
      */
-    public void hideDice() {
+    public void hideDice(){
         diceControl.hide();
     }
 
@@ -775,42 +675,41 @@ private <K, V> K getKeyByValue(Map<K, V> map, V value) {
     /**
      * Animates the movement of a piece from its current index to a target index.
      *
-     * @param uuid      the UUID of the piece to animate
-     * @param curIndex  the current index of the piece
+     * @param uuid the UUID of the piece to animate
+     * @param curIndex the current index of the piece
      * @param moveIndex the target index to animate the piece to
      */
-    public void movePieceAnim(UUID uuid, int curIndex, int moveIndex) {
-
+    public void movePieceAnim(UUID uuid, int curIndex, int moveIndex){
         pieces.get(uuid).getSpatial().addControl(new MoveControl(
-                infield.get(curIndex).getLocation(),
-                infield.get(moveIndex).getLocation(),
-                () -> movePiece(uuid, curIndex, moveIndex)));
+            infield.get(curIndex).getLocation(),
+            infield.get(moveIndex).getLocation(),
+            ()->movePiece(uuid,curIndex,moveIndex)));
     }
 
     /**
      * Animates the movement of a piece to its home position based on the given home index.
      *
-     * @param uuid      the UUID of the piece to animate
+     * @param uuid the UUID of the piece to animate
      * @param homeIndex the index of the home node to move the piece to
      */
-    public void movePieceHomeAnim(UUID uuid, int homeIndex) {
+    public void movePieceHomeAnim(UUID uuid, int homeIndex){
         pieces.get(uuid).getSpatial().addControl(new MoveControl(
-                pieces.get(uuid).getLocation(),
-                homeNodesMap.get(pieceColor.get(uuid)).get(homeIndex).getLocation(),
-                () -> moveHomePiece(uuid, homeIndex)));
+            pieces.get(uuid).getLocation(),
+            homeNodesMap.get(pieceColor.get(uuid)).get(homeIndex).getLocation(),
+            ()->moveHomePiece(uuid,homeIndex)));
     }
 
     /**
      * Animates the start of the movement of a piece to a target index.
      *
-     * @param uuid      the UUID of the piece to animate
+     * @param uuid the UUID of the piece to animate
      * @param moveIndex the target index to animate the piece to
      */
-    public void movePieceStartAnim(UUID uuid, int moveIndex) {
+    public void movePieceStartAnim(UUID uuid, int moveIndex){
         pieces.get(uuid).getSpatial().addControl(new MoveControl(
-                pieces.get(uuid).getLocation(),
-                infield.get(moveIndex).getLocation(),
-                () -> movePieceStart(uuid, moveIndex)
+            pieces.get(uuid).getLocation(),
+            infield.get(moveIndex).getLocation(),
+            ()->movePieceStart(uuid, moveIndex)
         ));
     }
 
@@ -819,52 +718,12 @@ public void movePieceStartAnim(UUID uuid, int moveIndex) {
      *
      * @param uuid the UUID of the piece to animate
      */
-    public void throwPieceAnim(UUID uuid) {
+    public void throwPieceAnim(UUID uuid){
         pieces.get(uuid).getSpatial().addControl(new MoveControl(
-                pieces.get(uuid).getLocation(), getNextWaitingNode(pieceColor.get(uuid)).getLocation(),
-                () -> throwPiece(uuid))
-        );
-    }
-
-    public void throwPiece(UUID uuid, Color throwColor) {
-        switch (throwColor) {
-            case ARMY -> throwShell(uuid);
-            case NAVY -> throwMissile(uuid);
-            case CYBER -> throwMatrix(uuid);
-            case AIRFORCE -> throwBomb(uuid);
-            default -> throw new RuntimeException("invalid color");
-        }
-    }
-
-    /**
-     * Animates the throwing of a piece to the next available waiting node.
-     *
-     * @param uuid the UUID of the piece to animate
-     */
-    private void throwBomb(UUID uuid) {
-        Vector3f targetPoint = pieces.get(uuid).getLocation();
-
-        JetAnimation anim = new JetAnimation(app, rootNode, targetPoint, 40, 6, () -> throwPieceAnim(uuid));
-        anim.start();
-    }
-
-    private void throwMatrix(UUID uuid) {
-        app.getAcousticHandler().playSound(MdgaSound.MATRIX);
-        Spatial piece = pieces.get(uuid).getSpatial();
-        piece.addControl(new MatrixAnimation(app, radarPos, () -> {
-            throwPieceAnim(uuid);
-        }));
-    }
-
-    private void throwMissile(UUID uuid) {
-        Vector3f targetPoint = pieces.get(uuid).getLocation();
-
-        MissileAnimation anim = new MissileAnimation(app, rootNode, targetPoint, 2f, () -> throwPieceAnim(uuid));
-        anim.start();
-    }
-
-    private void throwShell(UUID uuid) {
-        pieces.get(uuid).getSpatial().addControl(new ShellAnimation(tankTop, app, () -> throwPieceAnim(uuid)));
+            pieces.get(uuid).getLocation(),
+            getNextWaitingNode(pieceColor.get(uuid)).getLocation(),
+            ()->throwPiece(uuid)
+        ));
     }
 
     /**
@@ -873,7 +732,7 @@ private void throwShell(UUID uuid) {
      * @param piece1 the UUID of the first piece
      * @param piece2 the UUID of the second piece
      */
-    public void swapPieceAnim(UUID piece1, UUID piece2) {
+    public void swapPieceAnim(UUID piece1, UUID piece2){
         PieceControl piece1Control = pieces.get(piece1);
         PieceControl piece2Control = pieces.get(piece2);
 
@@ -883,15 +742,14 @@ public void swapPieceAnim(UUID piece1, UUID piece2) {
         float rot2 = piece2Control.getRotation();
 
         piece1Control.getSpatial().addControl(new MoveControl(
-                piece1Control.getLocation().clone(),
-                piece2Control.getLocation().clone(),
-                () -> {
-                }
+            piece1Control.getLocation().clone(),
+            piece2Control.getLocation().clone(),
+            ()->{}
         ));
         piece2Control.getSpatial().addControl(new MoveControl(
-                piece2Control.getLocation().clone(),
-                piece1Control.getLocation().clone(),
-                () -> swapPieces(piece1Control, piece2Control, loc1, rot1, loc2, rot2)
+            piece2Control.getLocation().clone(),
+            piece1Control.getLocation().clone(),
+            ()->swapPieces(piece1Control,piece2Control,loc1,rot1,loc2,rot2)
         ));
     }
 

Projekte/mdga/client/src/main/java/pp/mdga/client/board/CameraHandler.java

@@ -7,8 +7,6 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
-import com.jme3.post.filters.FXAAFilter;
-import com.jme3.post.ssao.SSAOFilter;
 import com.jme3.scene.Spatial;
 import com.jme3.shadow.DirectionalLightShadowFilter;
 import com.jme3.shadow.EdgeFilteringMode;
@@ -39,8 +37,6 @@ public class CameraHandler {
     private Color ownColor;
     private boolean init;
     private boolean initRot;
-    private SSAOFilter ssaoFilter;
-    private FXAAFilter fxaaFilter;
 
     /**
      * Constructor for the CameraHandler. Initializes the camera settings and lighting.
@@ -69,11 +65,8 @@ public CameraHandler(MdgaApp app, FilterPostProcessor fpp) {
         dlsf.setEnabled(true);
         dlsf.setEdgeFilteringMode(EdgeFilteringMode.PCFPOISSON);
         dlsf.setShadowIntensity(0.7f);
-        ssaoFilter = new SSAOFilter(6, 10f, 0.33f, 0.61f);
-//        ssaoFilter = new SSAOFilter();
-        fxaaFilter = new FXAAFilter();
 
-        sky = SkyFactory.createSky(app.getAssetManager(), "Images/sky/sky.dds", EnvMapType.EquirectMap).rotate(FastMath.HALF_PI * 1, 0, FastMath.HALF_PI * 0.2f);
+        sky = SkyFactory.createSky(app.getAssetManager(), "Images/sky/sky.dds", EnvMapType.EquirectMap).rotate(FastMath.HALF_PI*1,0,FastMath.HALF_PI*0.2f);
 
 
     }
@@ -89,12 +82,10 @@ public void init(Color ownColor) {
         app.getRootNode().addLight(ambient);
         app.getRootNode().attachChild(sky);
         fpp.addFilter(dlsf);
-        fpp.addFilter(ssaoFilter);
-        fpp.addFilter(fxaaFilter);
         init = true;
         initRot = true;
         this.ownColor = ownColor;
-        app.getInputSynchronize().setRotation(getInitAngleByColor(ownColor) * 2);
+        app.getInputSynchronize().setRotation(getInitAngleByColor(ownColor)*2);
     }
 
     /**
@@ -102,29 +93,26 @@ public void init(Color ownColor) {
      * and resets the camera position and rotation to its default state.
      */
     public void shutdown() {
-        init = false;
-        fpp.removeFilter(fxaaFilter);
-        fpp.removeFilter(ssaoFilter);
-        fpp.removeFilter(dlsf);
-        app.getRootNode().detachChild(sky);
-        app.getRootNode().removeLight(ambient);
         app.getRootNode().removeLight(sun);
-
+        app.getRootNode().removeLight(ambient);
+        app.getRootNode().detachChild(sky);
 
         // Reset the camera to its default state
         app.getCamera().setLocation(defaultCameraPosition);
         app.getCamera().setRotation(defaultCameraRotation);
+
+        fpp.removeFilter(dlsf);
     }
 
     /**
      * Updates the camera position and rotation based on user input (scroll and rotation).
      * Adjusts the vertical angle and radius based on zoom and rotation values.
      *
-     * @param scroll   The scroll input, determining zoom level.
+     * @param scroll The scroll input, determining zoom level.
      * @param rotation The rotation input, determining camera orientation.
      */
     public void update(float scroll, float rotation) {
-        if (!init) return;
+        if(!init) return;
         float scrollValue = Math.max(0, Math.min(scroll, 100));
 
         float rotationValue = rotation % 360;
@@ -162,8 +150,8 @@ public void update(float scroll, float rotation) {
      * @param color The color used to determine the camera angle.
      * @return The camera angle in degrees.
      */
-    private float getAngleByColor(Color color) {
-        return switch (color) {
+    private float getAngleByColor(Color color){
+        return switch (color){
             case ARMY -> 0;
             case AIRFORCE -> 90;
             case NAVY -> 270;
@@ -178,7 +166,7 @@ private float getAngleByColor(Color color) {
      * @param color The color used to determine the camera angle.
      * @return The initial camera angle in degrees.
      */
-    private float getInitAngleByColor(Color color) {
+    private float getInitAngleByColor(Color color){
         return (getAngleByColor(color) + 180) % 360;
     }
 

Projekte/mdga/client/src/main/java/pp/mdga/client/board/MapLoader.java

@@ -28,15 +28,15 @@ private MapLoader() {
      *
      * @param mapName The name of the map file to load. The file is expected to be located in the resources directory.
      * @return A list of {@link AssetOnMap} objects representing the assets placed on the map.
-     * @throws IOException              If an error occurs while reading the map file.
+     * @throws IOException If an error occurs while reading the map file.
      * @throws IllegalArgumentException If the map file contains invalid data.
      */
     public static List<AssetOnMap> loadMap(String mapName) {
         List<AssetOnMap> assetsOnMap = new ArrayList<>();
 
         try (
-                InputStream inputStream = MapLoader.class.getClassLoader().getResourceAsStream(mapName);
-                BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))
+            InputStream inputStream = MapLoader.class.getClassLoader().getResourceAsStream(mapName);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))
         ) {
 
             while (true) {
@@ -65,9 +65,11 @@ public static List<AssetOnMap> loadMap(String mapName) {
                 Asset asset = getLoadedAsset(assetName);
                 assetsOnMap.add(new AssetOnMap(asset, x, y, rot));
             }
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             e.printStackTrace();
-        } catch (IllegalArgumentException e) {
+        }
+        catch (IllegalArgumentException e) {
             e.printStackTrace();
         }
 
@@ -105,11 +107,8 @@ private static Asset getLoadedAsset(String assetName) {
             case "radar" -> Asset.radar;
             case "ship" -> Asset.ship;
             case "tank" -> Asset.tank;
-            case "treeSmall" -> Asset.treeSmall;
-            case "treeBig" -> Asset.treeBig;
-            case "tank_shoot" -> Asset.tankShoot;
-            case "treesBigBackground" -> Asset.treesBigBackground;
-            case "treesSmallBackground" -> Asset.treesSmallBackground;
+            case "tree_small" -> Asset.treeSmall;
+            case "tree_big" -> Asset.treeBig;
             default -> throw new IllegalStateException("Unexpected value: " + assetName);
         };
     }

Projekte/mdga/client/src/main/java/pp/mdga/client/board/NodeControl.java

@@ -3,13 +3,19 @@
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.control.AbstractControl;
 import pp.mdga.client.MdgaApp;
 
 /**
  * A control that adds highlighting functionality to a node in the game.
  * This class extends {@link OutlineControl} to add an outline effect when the node is highlighted.
  */
-public class NodeControl extends OutlineOEControl {
+public class NodeControl extends OutlineControl {
+
+    private static final ColorRGBA OUTLINE_HIGHLIGHT_COLOR = ColorRGBA.White;
+    private static final int OUTLINE_HIGHLIGHT_WIDTH = 6;
 
     /**
      * Constructs a {@link NodeControl} with the specified application and post processor.
@@ -19,7 +25,7 @@ public class NodeControl extends OutlineOEControl {
      * @param fpp The {@link FilterPostProcessor} to apply post-processing effects.
      */
     public NodeControl(MdgaApp app, FilterPostProcessor fpp) {
-        super(app, fpp, app.getCamera());
+        super(app, fpp);
     }
 
     /**
@@ -28,7 +34,15 @@ public NodeControl(MdgaApp app, FilterPostProcessor fpp) {
      *
      * @return The {@link Vector3f} representing the node's location.
      */
-    public Vector3f getLocation() {
+    public Vector3f getLocation(){
         return this.getSpatial().getLocalTranslation();
     }
+
+    /**
+     * Highlights the node by applying an outline effect.
+     * The outline color and width are predefined as white and 6, respectively.
+     */
+    public void highlight() {
+        super.outline(OUTLINE_HIGHLIGHT_COLOR, OUTLINE_HIGHLIGHT_WIDTH);
+    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/board/OutlineControl.java

@@ -3,8 +3,8 @@
 import com.jme3.math.ColorRGBA;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.renderer.Camera;
-import pp.mdga.client.InitControl;
 import pp.mdga.client.MdgaApp;
+import pp.mdga.client.InitControl;
 import pp.mdga.client.outline.SelectObjectOutliner;
 
 /**
@@ -13,52 +13,35 @@
  * object, allowing it to be highlighted or deselected.
  */
 public class OutlineControl extends InitControl {
-    /**
-     * The {@link SelectObjectOutliner} responsible for managing the outline effect.
-     */
-    private final SelectObjectOutliner selectObjectOutliner;
-    private final MdgaApp app;
-    private boolean hoverable = false;
-    private boolean highlight = false;
-    private boolean selectable = false;
-    private boolean select = false;
-    private ColorRGBA highlightColor;
-    private int highlightWidth;
-    private ColorRGBA hoverColor;
-    private int hoverWidth;
-    private ColorRGBA selectColor;
-    private int selectWidth;
+    /** The {@link SelectObjectOutliner} responsible for managing the outline effect. */
+    private final SelectObjectOutliner outlineOwn;
+    private static final int THICKNESS_DEFAULT = 6;
+    private MdgaApp app;
 
-    /**
-     * Constructs an {@code OutlineControl} with default thickness for the object outline.
-     *
-     * @param app The main application managing the outline control.
-     * @param fpp The {@code FilterPostProcessor} used for post-processing effects.
-     */
-    public OutlineControl(MdgaApp app, FilterPostProcessor fpp, Camera cam,
-                          ColorRGBA highlightColor, int highlightWidth,
-                          ColorRGBA hoverColor, int hoverWidth,
-                          ColorRGBA selectColor, int selectWidth
-    ) {
+
+    public OutlineControl(MdgaApp app, FilterPostProcessor fpp){
         this.app = app;
-        this.highlightColor = highlightColor;
-        this.highlightWidth = highlightWidth;
-        this.hoverColor = hoverColor;
-        this.hoverWidth = hoverWidth;
-        this.selectColor = selectColor;
-        this.selectWidth = selectWidth;
-        selectObjectOutliner = new SelectObjectOutliner(fpp, app.getRenderManager(), app.getAssetManager(), cam, app);
+        outlineOwn = new SelectObjectOutliner(THICKNESS_DEFAULT, fpp, app.getRenderManager(), app.getAssetManager(), app.getCamera(), app);
     }
 
+    public OutlineControl(MdgaApp app, FilterPostProcessor fpp, Camera cam){
+        this.app = app;
+        outlineOwn = new SelectObjectOutliner(THICKNESS_DEFAULT, fpp, app.getRenderManager(), app.getAssetManager(), cam, app);
+    }
+
+    public OutlineControl(MdgaApp app, FilterPostProcessor fpp, Camera cam, int thickness){
+        this.app = app;
+        outlineOwn = new SelectObjectOutliner(thickness, fpp, app.getRenderManager(), app.getAssetManager(), cam, app);
+    }
 
     /**
      * Applies an outline to the spatial object with the given color.
      *
      * @param color The {@link ColorRGBA} representing the color of the outline.
      */
-//    public void outline(ColorRGBA color) {
-//        selectObjectOutliner.select(spatial, color);
-//    }
+    public void outline(ColorRGBA color){
+        outlineOwn.select(spatial, color);
+    }
 
     /**
      * Applies an outline to the spatial object with the given color and width.
@@ -66,117 +49,19 @@ public OutlineControl(MdgaApp app, FilterPostProcessor fpp, Camera cam,
      * @param color The {@link ColorRGBA} representing the color of the outline.
      * @param width The width of the outline.
      */
-    public void outline(ColorRGBA color, int width) {
-        outlineOff();
-        selectObjectOutliner.select(spatial, color, width);
+    public void outline(ColorRGBA color, int width){
+        deOutline();
+        outlineOwn.select(spatial, color, width);
     }
 
     /**
      * Removes the outline effect from the spatial object.
      */
-    public void outlineOff() {
-        selectObjectOutliner.deselect(spatial);
+    public void deOutline(){
+        outlineOwn.deselect(spatial);
     }
 
-    /**
-     * Retrieves the instance of the {@code MdgaApp} associated with this control.
-     *
-     * @return The {@code MdgaApp} instance.
-     */
     public MdgaApp getApp() {
         return app;
     }
-
-    public void highlightOn() {
-        highlight = true;
-        outline(highlightColor, highlightWidth);
-    }
-
-    public void highlightOff() {
-        highlight = false;
-        outlineOff();
-    }
-
-    public void hoverOn() {
-        if (!hoverable) return;
-        outline(hoverColor, hoverWidth);
-    }
-
-    public void hoverOff() {
-        if (!hoverable) return;
-
-        if (select) selectOn();
-        else if (highlight) highlightOn();
-        else outlineOff();
-    }
-
-    public void selectOn() {
-        if (!selectable) return;
-        select = true;
-        outline(selectColor, selectWidth);
-    }
-
-    public void selectOff() {
-        select = false;
-        if (highlight) highlightOn();
-        else outlineOff();
-    }
-
-    public void selectableOn(){
-        setSelectable(true);
-        setHoverable(true);
-        highlightOn();
-        select = false;
-    }
-
-    public void selectableOff(){
-        setSelectable(false);
-        setHoverable(false);
-        highlightOff();
-        select = false;
-    }
-
-    private void setSelectable(boolean selectable) {
-        this.selectable = selectable;
-    }
-
-    public boolean isSelected() {
-        return select;
-    }
-
-    public boolean isSelectable() {
-        return selectable;
-    }
-
-    public boolean isHoverable() {
-        return hoverable;
-    }
-
-    private void setHoverable(boolean hoverable) {
-        this.hoverable = hoverable;
-    }
-
-    public void setHighlightColor(ColorRGBA color){
-        highlightColor = color;
-    }
-
-    public void setHighlightWidth(int width){
-        highlightWidth = width;
-    }
-
-    public void setHoverColor(ColorRGBA color){
-        hoverColor = color;
-    }
-
-    public void setHoverWidth(int width){
-        hoverWidth = width;
-    }
-
-    public void setSelectColor(ColorRGBA color){
-        selectColor = color;
-    }
-
-    public void setSelectWidth(int width){
-        selectWidth = width;
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/board/OutlineOEControl.java

@@ -1,57 +0,0 @@
-package pp.mdga.client.board;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.post.FilterPostProcessor;
-import com.jme3.renderer.Camera;
-import pp.mdga.client.MdgaApp;
-
-/**
- * OutlineOEControl class extends OutlineControl to manage outline colors and widths
- * for own and enemy objects, including hover and select states.
- */
-public class OutlineOEControl extends OutlineControl{
-    private static final ColorRGBA OUTLINE_OWN_COLOR = ColorRGBA.White;
-    private static final ColorRGBA OUTLINE_ENEMY_COLOR = ColorRGBA.Red;
-    private static final ColorRGBA OUTLINE_OWN_HOVER_COLOR = ColorRGBA.Yellow;
-    private static final ColorRGBA OUTLINE_ENEMY_HOVER_COLOR = ColorRGBA.Green;
-    private static final ColorRGBA OUTLINE_OWN_SELECT_COLOR = ColorRGBA.Cyan;
-    private static final ColorRGBA OUTLINE_ENEMY_SELECT_COLOR = ColorRGBA.Orange;
-    private static final int OUTLINE_HIGHLIGHT_WIDTH = 8;
-    private static final int OUTLINE_HOVER_WIDTH = 8;
-    private static final int OUTLINE_SELECT_WIDTH = 10;
-
-    /**
-     * Constructor for OutlineOEControl.
-     *
-     * @param app the MdgaApp instance
-     * @param fpp the FilterPostProcessor instance
-     * @param cam the Camera instance
-     */
-    public OutlineOEControl(MdgaApp app, FilterPostProcessor fpp, Camera cam){
-        super(app, fpp, cam,
-          OUTLINE_OWN_COLOR, OUTLINE_HIGHLIGHT_WIDTH,
-          OUTLINE_OWN_HOVER_COLOR, OUTLINE_HOVER_WIDTH,
-          OUTLINE_OWN_SELECT_COLOR, OUTLINE_SELECT_WIDTH
-        );
-    }
-
-    /**
-     * Sets the outline colors and enables selection for own objects.
-     */
-    public void selectableOwn(){
-        setHighlightColor(OUTLINE_OWN_COLOR);
-        setHoverColor(OUTLINE_OWN_HOVER_COLOR);
-        setSelectColor(OUTLINE_OWN_SELECT_COLOR);
-        selectableOn();
-    }
-
-    /**
-     * Sets the outline colors and enables selection for enemy objects.
-     */
-    public void selectableEnemy(){
-        setHighlightColor(OUTLINE_ENEMY_COLOR);
-        setHoverColor(OUTLINE_ENEMY_HOVER_COLOR);
-        setSelectColor(OUTLINE_ENEMY_SELECT_COLOR);
-        selectableOn();
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java

@@ -20,7 +20,7 @@
  * to provide outline functionality and includes additional features like shield effects,
  * hover states, and selection states.
  */
-public class PieceControl extends OutlineOEControl {
+public class PieceControl extends OutlineControl {
     private final float initRotation;
     private final AssetManager assetManager;
     private Spatial shieldRing;
@@ -32,6 +32,16 @@ public class PieceControl extends OutlineOEControl {
     private static final ColorRGBA SHIELD_SUPPRESSED_COLOR = new ColorRGBA(1f, 0.5f, 0, SHIELD_TRANSPARENCY);
     private static final float SHIELD_Z = 0f;
 
+    private static final ColorRGBA OUTLINE_OWN_COLOR = ColorRGBA.White;
+    private static final ColorRGBA OUTLINE_ENEMY_COLOR = ColorRGBA.Red;
+    private static final ColorRGBA OUTLINE_OWN_HOVER_COLOR = ColorRGBA.Yellow;
+    private static final ColorRGBA OUTLINE_ENEMY_HOVER_COLOR = ColorRGBA.Green;
+    private static final ColorRGBA OUTLINE_OWN_SELECT_COLOR = ColorRGBA.Cyan;
+    private static final ColorRGBA OUTLINE_ENEMY_SELECT_COLOR = ColorRGBA.Orange;
+    private static final int OUTLINE_HIGHLIGHT_WIDTH = 8;
+    private static final int OUTLINE_HOVER_WIDTH = 8;
+    private static final int OUTLINE_SELECT_WIDTH = 10;
+
     private final Node parentNode;
     private boolean enemy;
     private boolean hoverable;
@@ -45,17 +55,22 @@ public class PieceControl extends OutlineOEControl {
      *
      * @param initRotation The initial rotation of the piece in degrees.
      * @param assetManager The {@link AssetManager} used for loading models and materials.
-     * @param app          The {@link MdgaApp} instance to use for the application context.
-     * @param fpp          The {@link FilterPostProcessor} to apply post-processing effects.
+     * @param app The {@link MdgaApp} instance to use for the application context.
+     * @param fpp The {@link FilterPostProcessor} to apply post-processing effects.
      */
-    public PieceControl(float initRotation, AssetManager assetManager, MdgaApp app, FilterPostProcessor fpp) {
-        super(app, fpp, app.getCamera());
+    public PieceControl(float initRotation, AssetManager assetManager, MdgaApp app, FilterPostProcessor fpp){
+        super(app, fpp);
         this.parentNode = new Node();
         this.initRotation = initRotation;
         this.assetManager = assetManager;
         this.shieldRing = null;
         this.shieldMat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
         this.shieldMat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
+        enemy = false;
+        hoverable = false;
+        highlight = false;
+        selectable = false;
+        select = false;
     }
 
     /**
@@ -64,7 +79,7 @@ public PieceControl(float initRotation, AssetManager assetManager, MdgaApp app,
      * @return The rotation of the piece in degrees.
      */
     public float getRotation() {
-        return (float) Math.toDegrees(spatial.getLocalRotation().toAngleAxis(new Vector3f(0, 0, 1)));
+        return (float) Math.toDegrees(spatial.getLocalRotation().toAngleAxis(new Vector3f(0,0,1)));
     }
 
     /**
@@ -72,11 +87,11 @@ public float getRotation() {
      *
      * @param rot The rotation in degrees to set.
      */
-    public void setRotation(float rot) {
-        if (rot < 0) rot = -360;
+    public void setRotation(float rot){
+        if(rot < 0) rot =- 360;
 
         Quaternion quaternion = new Quaternion();
-        quaternion.fromAngleAxis((float) Math.toRadians(rot), new Vector3f(0, 0, 1));
+        quaternion.fromAngleAxis((float) Math.toRadians(rot), new Vector3f(0,0,1));
         spatial.setLocalRotation(quaternion);
     }
 
@@ -85,7 +100,7 @@ public void setRotation(float rot) {
      *
      * @return The location of the piece as a {@link Vector3f}.
      */
-    public Vector3f getLocation() {
+    public Vector3f getLocation(){
         return spatial.getLocalTranslation();
     }
 
@@ -96,9 +111,8 @@ public Vector3f getLocation() {
      */
     @Override
     protected void controlUpdate(float delta) {
-        if (shieldRing != null) {
+        if(shieldRing != null){
             shieldRing.rotate(0, 0, delta * SHIELD_SPEED);
-            shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0, 0, SHIELD_Z)));
         }
     }
 
@@ -107,7 +121,7 @@ protected void controlUpdate(float delta) {
      *
      * @param loc The location to set as a {@link Vector3f}.
      */
-    public void setLocation(Vector3f loc) {
+    public void setLocation(Vector3f loc){
         this.spatial.setLocalTranslation(loc);
     }
 
@@ -116,7 +130,7 @@ public void setLocation(Vector3f loc) {
      * This also moves the spatial to a new parent node for organizational purposes.
      */
     @Override
-    public void initSpatial() {
+    public void initSpatial(){
         setRotation(this.initRotation);
 
         Node oldParent = spatial.getParent();
@@ -127,21 +141,18 @@ public void initSpatial() {
     }
 
     public void rotateInit() {
-        setRotation(initRotation);
+//        rotate(rotation - initRotation);
     }
 
     /**
      * Activates the shield around the piece.
      * This adds a visual shield effect in the form of a rotating ring.
      */
-    public void activateShield() {
-        if (shieldRing != null) {
-            deactivateShield();
-        }
+    public void activateShield(){
         shieldRing = assetManager.loadModel(Asset.shieldRing.getModelPath());
         shieldRing.scale(1f);
         shieldRing.rotate((float) Math.toRadians(0), 0, (float) Math.toRadians(0));
-        shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0, 0, SHIELD_Z)));
+        shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0,0,SHIELD_Z)));
 
 
         shieldRing.setQueueBucket(RenderQueue.Bucket.Transparent); // Render in the transparent bucket
@@ -155,7 +166,7 @@ public void activateShield() {
      * Deactivates the shield by removing the shield ring from the scene.
      */
 
-    public void deactivateShield() {
+    public void deactivateShield(){
         parentNode.detachChild(shieldRing);
         shieldRing = null;
     }
@@ -163,16 +174,108 @@ public void deactivateShield() {
     /**
      * Suppresses the shield, changing its color to a suppressed state.
      */
-    public void suppressShield() {
-        assert (shieldRing != null) : "PieceControl: shieldRing is not set";
+    public void suppressShield(){
+        assert(shieldRing != null) : "PieceControl: shieldRing is not set";
         shieldMat.setColor("Color", SHIELD_SUPPRESSED_COLOR);
     }
 
-    public void setMaterial(Material mat) {
+    public void setMaterial(Material mat){
         spatial.setMaterial(mat);
     }
 
-    public Material getMaterial() {
+    public Material getMaterial(){
         return ((Geometry) getSpatial()).getMaterial();
     }
+
+    /**
+     * Highlights the piece with the appropriate outline color based on whether it is an enemy or not.
+     *
+     * @param enemy True if the piece is an enemy, false if it is owned by the player.
+     */
+    public void highlight(boolean enemy) {
+        this.enemy = enemy;
+        highlight = true;
+        super.outline(enemy ? OUTLINE_ENEMY_COLOR : OUTLINE_OWN_COLOR, OUTLINE_HIGHLIGHT_WIDTH);
+    }
+
+    /**
+     * Removes the highlight effect from the piece.
+     */
+    public void unHighlight(){
+        highlight = false;
+        deOutline();
+    }
+
+    /**
+     * Applies a hover effect on the piece if it is hoverable.
+     */
+    public void hover(){
+        if(!hoverable) return;
+        super.outline(enemy ? OUTLINE_ENEMY_HOVER_COLOR : OUTLINE_OWN_HOVER_COLOR, OUTLINE_HOVER_WIDTH);
+    }
+
+    /**
+     * Removes the hover effect from the piece.
+     */
+    public void hoverOff(){
+        if(!hoverable) return;
+
+        if(select) select();
+        else if(highlight) highlight(enemy);
+        else deOutline();
+    }
+
+    /**
+     * Deselects the piece and removes the selection outline. If the piece was highlighted,
+     * it will be re-highlighted. Otherwise, the outline is removed.
+     */
+    public void unSelect(){
+        select = false;
+        if(highlight) highlight(enemy);
+        else deOutline();
+    }
+
+    /**
+     * Selects the piece and applies the selection outline. If the piece is an enemy, it will
+     * be outlined with the enemy selection color; otherwise, the own selection color will be used.
+     */
+    public void select(){
+        if(!selectable) return;
+        select = true;
+        super.outline(enemy ? OUTLINE_ENEMY_SELECT_COLOR : OUTLINE_OWN_SELECT_COLOR, OUTLINE_SELECT_WIDTH);
+    }
+
+    /**
+     * Sets whether the piece is selectable.
+     *
+     * @param selectable True if the piece can be selected, false otherwise.
+     */
+    public void setSelectable(boolean selectable){
+        this.selectable = selectable;
+    }
+
+    /**
+     * Checks if the piece is selected.
+     *
+     * @return True if the piece is selected, false otherwise.
+     */
+    public boolean isSelected() { return select; }
+
+    /**
+     * Checks if the piece is selectable.
+     *
+     * @return True if the piece is selectable, false otherwise.
+     */
+    public boolean isSelectable() {
+        return selectable;
+    }
+
+    /**
+     * Sets whether the piece is hoverable.
+     *
+     * @param hoverable True if the piece can be hovered over, false otherwise.
+     */
+    public void setHoverable(boolean hoverable) {
+        this.hoverable = hoverable;
+    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/board/TankTopControl.java

@@ -1,130 +0,0 @@
-package pp.mdga.client.board;
-
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
-import pp.mdga.client.InitControl;
-
-import static pp.mdga.client.Util.linInt;
-
-/**
- * Controls the rotation of the tank's top part to face an enemy position.
- */
-public class TankTopControl extends InitControl {
-
-    private float timer = 0; // Time elapsed
-    private final static float DURATION = 1.5f; // Total rotation duration in seconds
-    private boolean rotating = false; // Flag to track if rotation is active
-    private float startAngle = 0;
-    private float endAngle = 0;
-    private Runnable actionAfter = null;
-
-    /**
-     * Updates the control each frame.
-     *
-     * @param tpf Time per frame
-     */
-    @Override
-    protected void controlUpdate(float tpf) {
-        if (!rotating) return;
-
-        // Update the timer
-        timer += tpf;
-
-        // Calculate interpolation factor (0 to 1)
-        float t = timer / DURATION;
-
-        if (t >= 1) t = 1;
-
-        float curAngle = linInt(startAngle, endAngle, t);
-
-        // Interpolate the rotation
-        Quaternion interpolatedRotation = new Quaternion();
-        interpolatedRotation.fromAngleAxis((float) Math.toRadians(curAngle), Vector3f.UNIT_Z);
-
-        // Apply the interpolated rotation to the spatial
-        spatial.setLocalRotation(interpolatedRotation);
-
-        if (t >= 1) {
-            rotating = false;
-            if (actionAfter != null) actionAfter.run();
-        }
-    }
-
-    /**
-     * Initiates the rotation of the tank's top part to face the enemy position.
-     *
-     * @param enemyPos The position of the enemy
-     * @param actionAfter The action to execute after the rotation is complete
-     */
-    public void rotate(Vector3f enemyPos, Runnable actionAfter) {
-        if (spatial == null) throw new RuntimeException("spatial is null");
-
-        startAngle = getOwnAngle();
-        endAngle = getEnemyAngle(enemyPos);
-
-        // Adjust endAngle to ensure the shortest path
-        float deltaAngle = endAngle - startAngle;
-        if (deltaAngle > 180) {
-            endAngle -= 360; // Rotate counterclockwise
-        } else if (deltaAngle < -180) {
-            endAngle += 360; // Rotate clockwise
-        }
-
-        timer = 0;
-        rotating = true;
-        this.actionAfter = actionAfter; // Store the action to execute after rotation
-    }
-
-    /**
-     * Calculates the angle to the enemy position.
-     *
-     * @param enemyPos The position of the enemy
-     * @return The angle to the enemy in degrees
-     */
-    private float getEnemyAngle(Vector3f enemyPos) {
-        // Direction to the enemy in the XY plane
-        Vector3f direction = enemyPos.subtract(spatial.getLocalTranslation());
-        direction.z = 0; // Project to XY plane
-        direction.normalizeLocal();
-
-        Vector3f reference = Vector3f.UNIT_Y.mult(-1);
-
-        // Calculate the angle between the direction vector and the reference vector
-        float angle = FastMath.acos(reference.dot(direction));
-
-        // Determine rotation direction using the cross product
-        Vector3f cross = reference.cross(direction);
-        if (cross.z < 0) {
-            angle = -angle;
-        }
-
-        return (float) Math.toDegrees(angle); // Return the absolute angle in degrees
-    }
-
-    /**
-     * Calculates the tank's current angle.
-     *
-     * @return The tank's current angle in degrees
-     */
-    private float getOwnAngle() {
-        // Tank's forward direction in the XY plane
-        Vector3f forward = spatial.getLocalRotation().mult(Vector3f.UNIT_Y);
-        forward.z = 0; // Project to XY plane
-        forward.normalizeLocal();
-
-        // Reference vector: Positive X-axis
-        Vector3f reference = Vector3f.UNIT_Y;
-
-        // Calculate the angle between the forward vector and the reference vector
-        float angle = FastMath.acos(reference.dot(forward));
-
-        // Determine rotation direction using the cross product
-        Vector3f cross = reference.cross(forward);
-        if (cross.z < 0) { // For Z-up, check the Z component of the cross product
-            angle = -angle;
-        }
-
-        return (float) Math.toDegrees(angle); // Return the absolute angle in radians
-    }
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/button/AbstractButton.java

@@ -115,7 +115,7 @@ public abstract class AbstractButton {
      * Constructs an AbstractButton instance with the specified application context and scene node.
      * Initializes the button's visual elements and font.
      *
-     * @param app  the application instance for accessing resources
+     * @param app the application instance for accessing resources
      * @param node the node in the scene graph to which the button is attached
      */
     public AbstractButton(MdgaApp app, Node node) {

Projekte/mdga/client/src/main/java/pp/mdga/client/button/ButtonLeft.java

@@ -3,6 +3,7 @@
 import com.jme3.math.Vector2f;
 import com.jme3.scene.Node;
 import pp.mdga.client.MdgaApp;
+import com.jme3.ui.Picture;
 
 /**
  * Represents a specific implementation of a clickable button positioned on the left side.

Projekte/mdga/client/src/main/java/pp/mdga/client/button/CeremonyButton.java

@@ -69,16 +69,15 @@ public enum Pos {
      * Constructs a CeremonyButton with specified attributes such as type, position, and label.
      * The button supports both 2D and 3D components for UI and visual effects.
      *
-     * @param app    the application instance for accessing resources and settings
-     * @param node   the node in the scene graph to which the button belongs
+     * @param app   the application instance for accessing resources and settings
+     * @param node  the node in the scene graph to which the button belongs
      * @param node3d the node for 3D scene components associated with this button
-     * @param tsk    the type/color associated with the button
-     * @param pos    the position of the button in the ceremony layout
-     * @param name   the label or name displayed on the button
+     * @param tsk   the type/color associated with the button
+     * @param pos   the position of the button in the ceremony layout
+     * @param name  the label or name displayed on the button
      */
     public CeremonyButton(MdgaApp app, Node node, Node node3d, Color tsk, Pos pos, String name) {
-        super(app, node, () -> {
-        }, "", new Vector2f(WIDTH, 7), new Vector2f(0, 0));
+        super(app, node, () -> {}, "", new Vector2f(WIDTH, 7), new Vector2f(0, 0));
 
         this.node3d = node3d;
 
@@ -218,9 +217,9 @@ public void update(float tpf) {
         }
 
         model.setLocalRotation(new Quaternion().fromAngles(
-                (float) Math.toRadians(90),
-                (float) Math.toRadians(rot),
-                (float) Math.toRadians(180)
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
         ));
     }
 
@@ -237,9 +236,9 @@ private void createModel(Asset asset, Vector3f pos) {
         model = app.getAssetManager().loadModel(modelName);
         model.scale(asset.getSize() / 2);
         model.rotate(
-                (float) Math.toRadians(90),
-                (float) Math.toRadians(rot),
-                (float) Math.toRadians(180)
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
         );
         model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
 

Projekte/mdga/client/src/main/java/pp/mdga/client/button/ClickButton.java

@@ -41,12 +41,12 @@ public abstract class ClickButton extends AbstractButton {
     /**
      * Constructs a ClickButton with the specified properties.
      *
-     * @param app    the application instance for accessing resources
-     * @param node   the node in the scene graph to which the button belongs
+     * @param app   the application instance for accessing resources
+     * @param node  the node in the scene graph to which the button belongs
      * @param action the action to execute on button click
-     * @param label  the text label displayed on the button
-     * @param size   the size of the button
-     * @param pos    the position of the button in relative units
+     * @param label the text label displayed on the button
+     * @param size  the size of the button
+     * @param pos   the position of the button in relative units
      */
     ClickButton(MdgaApp app, Node node, Runnable action, String label, Vector2f size, Vector2f pos) {
         super(app, node);
@@ -203,9 +203,9 @@ protected void setImageRelative(Picture picture) {
         picture.setHeight(instance.getPreferredSize().y + larger);
 
         picture.setLocalTranslation(
-                instance.getLocalTranslation().x - larger / 2,
-                (instance.getLocalTranslation().y - picture.getHeight()) + larger / 2,
-                instance.getLocalTranslation().z + 0.01f
+            instance.getLocalTranslation().x - larger / 2,
+            (instance.getLocalTranslation().y - picture.getHeight()) + larger / 2,
+            instance.getLocalTranslation().z + 0.01f
         );
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/button/LabelButton.java

@@ -38,8 +38,7 @@ public class LabelButton extends ClickButton {
      * @param isButton whether this component acts as a button or a simple label
      */
     public LabelButton(MdgaApp app, Node node, String label, Vector2f size, Vector2f pos, boolean isButton) {
-        super(app, node, () -> {
-        }, label, size, pos);
+        super(app, node, () -> {}, label, size, pos);
 
         this.isButton = isButton;
 

Projekte/mdga/client/src/main/java/pp/mdga/client/button/LobbyButton.java

@@ -1,13 +1,17 @@
 package pp.mdga.client.button;
 
+import com.jme3.light.AmbientLight;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.queue.RenderQueue;
+import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.shape.Quad;
+import com.jme3.texture.Texture;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import pp.mdga.client.Asset;
 import pp.mdga.client.MdgaApp;
@@ -97,11 +101,11 @@ public enum Taken {
     /**
      * Constructs a LobbyButton with specified properties, including a 3D model and label.
      *
-     * @param app    the application instance for accessing resources
-     * @param node   the node in the scene graph to which the button belongs
-     * @param node3d the node for 3D scene components associated with this button
-     * @param action the action to execute when the button is clicked
-     * @param tsk    the type or category of the button (e.g., CYBER, AIRFORCE)
+     * @param app     the application instance for accessing resources
+     * @param node    the node in the scene graph to which the button belongs
+     * @param node3d  the node for 3D scene components associated with this button
+     * @param action  the action to execute when the button is clicked
+     * @param tsk     the type or category of the button (e.g., CYBER, AIRFORCE)
      */
     public LobbyButton(MdgaApp app, Node node, Node node3d, Runnable action, Color tsk) {
         super(app, node, action, "", new Vector2f(WIDTH, 7), new Vector2f(0, 0));
@@ -257,9 +261,9 @@ public void update(float tpf) {
         }
 
         model.setLocalRotation(new Quaternion().fromAngles(
-                (float) Math.toRadians(90),
-                (float) Math.toRadians(rot),
-                (float) Math.toRadians(180)
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
         ));
     }
 
@@ -276,9 +280,9 @@ private void createModel(Asset asset, Vector3f pos) {
         model = app.getAssetManager().loadModel(modelName);
         model.scale(asset.getSize() / 2);
         model.rotate(
-                (float) Math.toRadians(90),
-                (float) Math.toRadians(rot),
-                (float) Math.toRadians(180)
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
         );
         model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
 

Projekte/mdga/client/src/main/java/pp/mdga/client/button/MenuButton.java

@@ -13,10 +13,10 @@ public class MenuButton extends ClickButton {
     /**
      * Constructs a MenuButton with specified properties.
      *
-     * @param app    the application instance for accessing resources
-     * @param node   the node in the scene graph to which the button belongs
-     * @param action the action to execute when the button is clicked
-     * @param label  the text label displayed on the button
+     * @param app     the application instance for accessing resources
+     * @param node    the node in the scene graph to which the button belongs
+     * @param action  the action to execute when the button is clicked
+     * @param label   the text label displayed on the button
      */
     public MenuButton(MdgaApp app, Node node, Runnable action, String label) {
         super(app, node, action, label, new Vector2f(5.5f, 2), new Vector2f(0, 0));

Projekte/mdga/client/src/main/java/pp/mdga/client/button/SettingsButton.java

@@ -2,6 +2,8 @@
 
 import com.jme3.math.Vector2f;
 import com.jme3.scene.Node;
+import com.simsilica.lemur.HAlignment;
+import com.simsilica.lemur.VAlignment;
 import com.simsilica.lemur.component.IconComponent;
 import pp.mdga.client.MdgaApp;
 

Projekte/mdga/client/src/main/java/pp/mdga/client/button/SliderButton.java

@@ -77,17 +77,12 @@ public SliderButton(MdgaApp app, Node node, String label) {
         QuadBackgroundComponent background = new QuadBackgroundComponent(BUTTON_NORMAL);
         slider.setBackground(background);
 
-        // Set label background
-        QuadBackgroundComponent labelBackground = new QuadBackgroundComponent(BUTTON_NORMAL);
-        this.label.setBackground(labelBackground);
-
         // Configure the label font
         this.label.setFont(font);
-        this.label.setTextHAlignment(HAlignment.Center);
 
         // Default position and size
         pos = new Vector2f(0, 0);
-        size = new Vector2f(6f, 1);
+        size = new Vector2f(5.5f, 1);
 
         // Add label and slider to container
         container.addChild(this.label);

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/AudioSettingsDialog.java

@@ -7,11 +7,6 @@
 import pp.mdga.client.button.SliderButton;
 import pp.mdga.client.view.MdgaView;
 
-/**
- * The {@code AudioSettingsDialog} class represents a dialog for adjusting audio settings in the application.
- * It provides controls for managing main volume, music volume, and sound effect volume, and includes
- * a button to return to the previous menu.
- */
 public class AudioSettingsDialog extends Dialog {
     private final MdgaView view;
 
@@ -23,13 +18,6 @@ public class AudioSettingsDialog extends Dialog {
 
     private boolean active = false;
 
-    /**
-     * Constructs an {@code AudioSettingsDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     * @param view The current view, used for navigation and interaction with the dialog.
-     */
     public AudioSettingsDialog(MdgaApp app, Node node, MdgaView view) {
         super(app, node);
 
@@ -54,9 +42,6 @@ public AudioSettingsDialog(MdgaApp app, Node node, MdgaView view) {
         backButton.setPos(new Vector2f(0, 1.8f));
     }
 
-    /**
-     * Called when the dialog is shown. Initializes and displays the volume controls and back button.
-     */
     @Override
     protected void onShow() {
         active = true;
@@ -72,9 +57,6 @@ protected void onShow() {
         soundVolume.show();
     }
 
-    /**
-     * Called when the dialog is hidden. Hides all volume controls and the back button.
-     */
     @Override
     protected void onHide() {
         active = false;
@@ -86,12 +68,8 @@ protected void onHide() {
         soundVolume.hide();
     }
 
-    /**
-     * Updates the application audio settings based on the current values of the sliders.
-     * This method is called continuously while the dialog is active.
-     */
     public void update() {
-        if (!active) {
+        if(!active) {
             return;
         }
 

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/CeremonyDialog.java

@@ -10,30 +10,17 @@
 
 import java.util.ArrayList;
 
-/**
- * The {@code CeremonyDialog} class displays a dialog containing statistical data in a tabular format.
- * It allows adding rows of statistics and manages their visibility when shown or hidden.
- */
 public class CeremonyDialog extends Dialog {
     private ArrayList<ArrayList<LabelButton>> labels;
 
     float offsetX;
 
-    /**
-     * Constructs a {@code CeremonyDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     */
     public CeremonyDialog(MdgaApp app, Node node) {
         super(app, node);
 
         prepare();
     }
 
-    /**
-     * Called when the dialog is shown. Makes all label buttons in the table visible.
-     */
     @Override
     protected void onShow() {
         for (ArrayList<LabelButton> row : labels) {
@@ -43,9 +30,6 @@ protected void onShow() {
         }
     }
 
-    /**
-     * Called when the dialog is hidden. Hides all label buttons in the table.
-     */
     @Override
     protected void onHide() {
         for (ArrayList<LabelButton> row : labels) {
@@ -55,17 +39,6 @@ protected void onHide() {
         }
     }
 
-    /**
-     * Adds a row of statistical data to the dialog.
-     *
-     * @param name The name of the player or category for the row.
-     * @param v1   The value for the first column.
-     * @param v2   The value for the second column.
-     * @param v3   The value for the third column.
-     * @param v4   The value for the fourth column.
-     * @param v5   The value for the fifth column.
-     * @param v6   The value for the sixth column.
-     */
     public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) {
         float offsetYSmall = 0.5f;
 
@@ -88,7 +61,7 @@ public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5
 
         int j = 0;
         for (LabelButton b : row) {
-            if (j > 0) {
+            if(j > 0) {
                 b.setColor(colorText, colorButton);
             }
 
@@ -103,9 +76,6 @@ public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5
         labels.add(row);
     }
 
-    /**
-     * Prepares the initial layout of the dialog, including header labels.
-     */
     public void prepare() {
         offsetX = 0.5f;
 

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/Dialog.java

@@ -1,55 +1,33 @@
 package pp.mdga.client.dialog;
 
 import com.jme3.scene.Node;
+import com.simsilica.lemur.Container;
 import pp.mdga.client.MdgaApp;
 
-/**
- * The {@code Dialog} class serves as an abstract base class for dialogs in the application.
- * It provides functionality for showing and hiding the dialog and defines abstract methods
- * for custom behavior when the dialog is shown or hidden.
- */
 public abstract class Dialog {
     protected final MdgaApp app;
     protected final Node node = new Node();
 
     private final Node root;
 
-    /**
-     * Constructs a {@code Dialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node to which the dialog's node will be attached.
-     */
     Dialog(MdgaApp app, Node node) {
         this.app = app;
         this.root = node;
     }
 
-    /**
-     * Shows the dialog by attaching its node to the root node and invoking the {@code onShow} method.
-     */
     public void show() {
         root.attachChild(node);
 
         onShow();
     }
 
-    /**
-     * Hides the dialog by detaching its node from the root node and invoking the {@code onHide} method.
-     */
     public void hide() {
         root.detachChild(node);
 
         onHide();
     }
 
-    /**
-     * Called when the dialog is shown. Subclasses must implement this method to define custom behavior.
-     */
     protected abstract void onShow();
 
-    /**
-     * Called when the dialog is hidden. Subclasses must implement this method to define custom behavior.
-     */
     protected abstract void onHide();
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/HostDialog.java

@@ -12,11 +12,7 @@
 
 import java.util.prefs.Preferences;
 
-/**
- * The {@code HostDialog} class represents a dialog for hosting a network game session.
- * It allows users to input a port number, start hosting a server, and navigate back to the previous view.
- */
-public class HostDialog extends NetworkDialog {
+public class HostDialog  extends NetworkDialog {
     private InputButton portInput;
 
     private ButtonRight hostButton;
@@ -26,13 +22,6 @@ public class HostDialog extends NetworkDialog {
 
     private Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
 
-    /**
-     * Constructs a {@code HostDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     * @param view The main view used for navigation and interaction with the dialog.
-     */
     public HostDialog(MdgaApp app, Node node, MainView view) {
         super(app, node, (NetworkSupport) app.getNetworkSupport());
 
@@ -50,9 +39,6 @@ public HostDialog(MdgaApp app, Node node, MainView view) {
         offset += 1.5f;
     }
 
-    /**
-     * Called when the dialog is shown. Displays all input fields and buttons.
-     */
     @Override
     protected void onShow() {
         portInput.show();
@@ -60,9 +46,6 @@ protected void onShow() {
         backButton.show();
     }
 
-    /**
-     * Called when the dialog is hidden. Hides all input fields and buttons.
-     */
     @Override
     protected void onHide() {
         portInput.hide();
@@ -70,44 +53,27 @@ protected void onHide() {
         backButton.hide();
     }
 
-    /**
-     * Updates the state of the port input field.
-     * This method is called periodically to synchronize the dialog state.
-     */
     public void update() {
         portInput.update();
     }
 
-    /**
-     * Retrieves the currently entered port number, saves it to preferences, and sets it as the active port.
-     *
-     * @return The port number as a string.
-     */
     public String getPort() {
         prefs.put("hostPort", portInput.getString());
         setPortNumber(Integer.parseInt(portInput.getString()));
         return portInput.getString();
     }
 
-    /**
-     * Resets the port input field to its default value and updates preferences accordingly.
-     */
     public void resetPort() {
         portInput.reset();
         prefs.put("hostPort", "11111");
     }
 
-    /**
-     * Starts the server to host a network game.
-     */
     public void hostServer() {
         startServer();
     }
 
-    /**
-     * Connects to the server as a client.
-     */
     public void connectServerAsClient() {
         connectServer();
     }
+
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/InterruptDialog.java

@@ -1,82 +1,4 @@
 package pp.mdga.client.dialog;
 
-import com.jme3.math.Vector2f;
-import com.jme3.scene.Node;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.client.button.ButtonRight;
-import pp.mdga.client.button.LabelButton;
-import pp.mdga.client.button.MenuButton;
-import pp.mdga.game.Color;
-
-/**
- * The {@code InterruptDialog} class represents a dialog that interrupts the game flow,
- * providing a message and the option to force an action if the user is a host.
- */
-public class InterruptDialog extends Dialog {
-    private ButtonRight forceButton;
-
-    private LabelButton label;
-
-    private String text = "";
-
-    /**
-     * Constructs an {@code InterruptDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     */
-    public InterruptDialog(MdgaApp app, Node node) {
-        super(app, node);
-
-        forceButton = new ButtonRight(app, node, () -> app.getModelSynchronize().force(), "Erzwingen", 1);
-    }
-
-    /**
-     * Called when the dialog is shown. Displays the label and optionally the force button if the user is the host.
-     */
-
-    @Override
-    protected void onShow() {
-        if (app.getGameLogic().isHost()) {
-            forceButton.show();
-        }
-
-        label = new LabelButton(app, node, "Warte auf " + text + "...", new Vector2f(5.5f * 1.5f, 2), new Vector2f(0.5f, 0f), false);
-
-        float offset = 2.8f;
-        label.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
-
-        label.show();
-    }
-
-    /**
-     * Called when the dialog is hidden. Hides the label and the force button.
-     */
-    @Override
-    protected void onHide() {
-        forceButton.hide();
-        label.hide();
-    }
-
-    /**
-     * Sets the displayed text based on the specified color.
-     *
-     * @param color The color used to determine the text (e.g., "Luftwaffe" for AIRFORCE).
-     */
-    public void setColor(Color color) {
-        switch (color) {
-            case AIRFORCE:
-                text = "Luftwaffe";
-                break;
-            case ARMY:
-                text = "Heer";
-                break;
-            case NAVY:
-                text = "Marine";
-                break;
-            case CYBER:
-                text = "CIR";
-                break;
-        }
-    }
+public class InterruptDialog {
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/JoinDialog.java

@@ -4,6 +4,7 @@
 import com.jme3.scene.Node;
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.NetworkSupport;
+import pp.mdga.client.acoustic.AcousticHandler;
 import pp.mdga.client.button.ButtonLeft;
 import pp.mdga.client.button.ButtonRight;
 import pp.mdga.client.button.InputButton;
@@ -12,10 +13,6 @@
 
 import java.util.prefs.Preferences;
 
-/**
- * The {@code JoinDialog} class represents a dialog for joining a network game.
- * It allows users to input an IP address and port number, connect to a server, or navigate back to the previous view.
- */
 public class JoinDialog extends NetworkDialog {
     private InputButton ipInput;
     private InputButton portInput;
@@ -27,13 +24,6 @@ public class JoinDialog extends NetworkDialog {
 
     private Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
 
-    /**
-     * Constructs a {@code JoinDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     * @param view The main view used for navigation and interaction with the dialog.
-     */
     public JoinDialog(MdgaApp app, Node node, MainView view) {
         super(app, node, (NetworkSupport) app.getNetworkSupport());
 
@@ -56,9 +46,6 @@ public JoinDialog(MdgaApp app, Node node, MainView view) {
         offset += 1.5f;
     }
 
-    /**
-     * Called when the dialog is shown. Displays all input fields and buttons.
-     */
     @Override
     protected void onShow() {
         ipInput.show();
@@ -67,9 +54,6 @@ protected void onShow() {
         backButton.show();
     }
 
-    /**
-     * Called when the dialog is hidden. Hides all input fields and buttons.
-     */
     @Override
     protected void onHide() {
         ipInput.hide();
@@ -78,70 +62,34 @@ protected void onHide() {
         backButton.hide();
     }
 
-    /**
-     * Updates the state of the input fields. This method is called periodically to synchronize the dialog state.
-     */
     public void update() {
         ipInput.update();
         portInput.update();
     }
 
-    /**
-     * Retrieves the currently entered IP address, saves it to preferences, and sets it as the hostname.
-     *
-     * @return The IP address as a string.
-     */
     public String getIpt() {
         prefs.put("joinIp", ipInput.getString());
         setHostname(ipInput.getString());
         return ipInput.getString();
     }
 
-    /**
-     * Resets the IP input field to its default value and updates preferences accordingly.
-     */
     public void resetIp() {
         ipInput.reset();
         prefs.put("joinIp", "");
     }
 
-    /**
-     * Retrieves the currently entered port number, saves it to preferences, and sets it as the active port.
-     *
-     * @return The port number as a string.
-     */
     public String getPort() {
         prefs.put("joinPort", portInput.getString());
         setPortNumber(Integer.parseInt(portInput.getString()));
         return portInput.getString();
     }
 
-    /**
-     * Resets the port input field to its default value and updates preferences accordingly.
-     */
     public void resetPort() {
         portInput.reset();
         prefs.put("joinPort", "11111");
     }
 
-    /**
-     * Connects to the server using the current IP address and port number.
-     */
     public void connectToServer() {
         connectServer();
     }
-
-    /**
-     * Disconnects from the server if a network connection exists.
-     */
-    public void disconnect() {
-        NetworkSupport network = getNetwork();
-        if (network != null) {
-            try {
-                network.disconnect();
-            } catch (Exception e) {
-                System.err.println("Error while disconnecting: " + e.getMessage());
-            }
-        }
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/NetworkDialog.java

@@ -8,55 +8,27 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-/**
- * The {@code NetworkDialog} class serves as an abstract base class for dialogs
- * that involve network-related functionalities, such as connecting to a server or hosting a game.
- * It provides methods for initializing, connecting to, and managing a network server.
- */
 public abstract class NetworkDialog extends Dialog {
 
     private NetworkSupport network;
     private String hostname;
     private int portNumber;
     private Future<Object> connectionFuture;
-    private MdgaServer serverInstance;
-    private Thread serverThread;
 
-    /**
-     * Constructs a {@code NetworkDialog}.
-     *
-     * @param app     The main application managing the dialog.
-     * @param node    The root node for attaching UI elements.
-     * @param network The network support instance for managing network interactions.
-     */
     public NetworkDialog(MdgaApp app, Node node, NetworkSupport network) {
         super(app, node);
         this.network = network;
     }
 
-    /**
-     * Sets the hostname for the network connection.
-     *
-     * @param hostname The hostname or IP address of the server.
-     */
     public void setHostname(String hostname) {
         this.hostname = hostname;
     }
 
-    /**
-     * Sets the port number for the network connection.
-     *
-     * @param portNumber The port number to use for the connection.
-     */
     public void setPortNumber(int portNumber) {
         this.portNumber = portNumber;
     }
 
-    /**
-     * Initializes the network connection using the current hostname and port number.
-     *
-     * @return {@code null} if successful, otherwise throws an exception.
-     */
+
     protected Object initNetwork() {
         try {
             this.network.initNetwork(this.hostname, this.portNumber);
@@ -66,73 +38,41 @@ protected Object initNetwork() {
         }
     }
 
-    /**
-     * Starts the process of connecting to a server asynchronously.
-     */
     protected void connectServer() {
+
         try {
             connectionFuture = this.network.getApp().getExecutor().submit(this::initNetwork);
         } catch (NumberFormatException var2) {
             throw new NumberFormatException("Port must be a number");
         }
+
     }
 
-    /**
-     * Starts hosting a server in a separate thread.
-     */
     protected void startServer() {
-        serverThread = new Thread(() -> {
+        (new Thread(() -> {
             try {
-                serverInstance = new MdgaServer(portNumber);
-                serverInstance.run();
+                MdgaServer mdgaServer = new MdgaServer(portNumber);
+                mdgaServer.run();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        });
 
-        serverThread.start();
+        })).start();
     }
 
-    /**
-     * Shuts down the hosted server and cleans up resources.
-     */
-    public void shutdownServer() {
-
-        serverInstance.shutdown();
-
-        // Wait for the server to shut down
-        try {
-            serverThread.join(); // Wait for the server thread to finish
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-
-        System.out.println("Server shutdown successfully.");
-    }
-
-    /**
-     * Updates the state of the connection process.
-     *
-     * @param delta The time elapsed since the last update call.
-     */
     public void update(float delta) {
         if (this.connectionFuture != null && this.connectionFuture.isDone()) {
             try {
                 this.connectionFuture.get();
             } catch (ExecutionException ignored) {
-                // TODO: implement
+                // todo: implement
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
             }
         }
     }
 
-    /**
-     * Retrieves the {@code NetworkSupport} instance associated with this dialog.
-     *
-     * @return The {@code NetworkSupport} instance.
-     */
-    public NetworkSupport getNetwork() {
+    public NetworkSupport getNetwork(){
         return network;
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/SettingsDialog.java

@@ -3,13 +3,11 @@
 import com.jme3.math.Vector2f;
 import com.jme3.scene.Node;
 import pp.mdga.client.MdgaApp;
+import pp.mdga.client.button.InputButton;
 import pp.mdga.client.button.MenuButton;
+import pp.mdga.client.view.MainView;
 import pp.mdga.client.view.MdgaView;
 
-/**
- * The {@code SettingsDialog} class represents a dialog for navigating to various settings sections,
- * such as video and audio settings, or returning to the previous view.
- */
 public class SettingsDialog extends Dialog {
     private MenuButton videoButton;
     private MenuButton audioButton;
@@ -17,13 +15,6 @@ public class SettingsDialog extends Dialog {
 
     private final MdgaView view;
 
-    /**
-     * Constructs a {@code SettingsDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     * @param view The view managing navigation and interaction with the settings dialog.
-     */
     public SettingsDialog(MdgaApp app, Node node, MdgaView view) {
         super(app, node);
 
@@ -43,9 +34,6 @@ public SettingsDialog(MdgaApp app, Node node, MdgaView view) {
         backButton.setPos(new Vector2f(0, 1.8f));
     }
 
-    /**
-     * Called when the dialog is shown. Displays all buttons for video settings, audio settings, and back navigation.
-     */
     @Override
     protected void onShow() {
         videoButton.show();
@@ -53,9 +41,6 @@ protected void onShow() {
         backButton.show();
     }
 
-    /**
-     * Called when the dialog is hidden. Hides all buttons for video settings, audio settings, and back navigation.
-     */
     @Override
     protected void onHide() {
         videoButton.hide();

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java

@@ -1,18 +1,19 @@
 package pp.mdga.client.dialog;
 
+import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.button.InputButton;
 import pp.mdga.client.button.MenuButton;
 import pp.mdga.client.view.MainView;
 
 import java.util.Random;
+import java.util.random.RandomGenerator;
 
-/**
- * The {@code StartDialog} class represents the initial dialog in the application,
- * allowing the user to input their name, host or join a game, or exit the application.
- */
 public class StartDialog extends Dialog {
     private InputButton nameInput;
 
@@ -22,13 +23,6 @@ public class StartDialog extends Dialog {
 
     private final MainView view;
 
-    /**
-     * Constructs a {@code StartDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     * @param view The main view used for navigation and interaction with the dialog.
-     */
     public StartDialog(MdgaApp app, Node node, MainView view) {
         super(app, node);
 
@@ -54,9 +48,6 @@ public StartDialog(MdgaApp app, Node node, MainView view) {
         endButton.setPos(new Vector2f(0, 1.8f));
     }
 
-    /**
-     * Called when the dialog is shown. Displays the name input field and all buttons.
-     */
     @Override
     protected void onShow() {
         nameInput.show();
@@ -66,11 +57,9 @@ protected void onShow() {
         endButton.show();
     }
 
-    /**
-     * Called when the dialog is hidden. Hides the name input field and all buttons.
-     */
     @Override
-    protected void onHide() {
+    protected void onHide ()
+    {
         nameInput.hide();
 
         hostButton.hide();
@@ -78,227 +67,116 @@ protected void onHide() {
         endButton.hide();
     }
 
-    /**
-     * Updates the state of the name input field. This method is called periodically to synchronize the dialog state.
-     */
     public void update() {
         nameInput.update();
     }
 
-    /**
-     * Retrieves the name entered by the user. If no name is provided, a random name is generated.
-     *
-     * @return The user's name or a randomly generated name.
-     */
     public String getName() {
         String name = nameInput.getString();
 
         if (name == null || name.trim().isEmpty()) {
             String[] names = {
-                    "PixelPirat",
-                    "NoobJäger",
-                    "LagMeister",
-                    "KnopfDrücker",
-                    "SpawnCamper",
-                    "AFKHeld",
-                    "RageQuitter",
-                    "GameOverPro",
-                    "Checkpoint",
-                    "RespawnHeld",
-                    "Teebeutel",
-                    "GlitchHexer",
-                    "QuickScope",
-                    "LootSammler",
-                    "EpicLauch",
-                    "KartoffelPro",
-                    "StilleKlinge",
-                    "TastenHeld",
-                    "PixelKrieger",
-                    "HacknSlash",
-                    "JoystickJoe",
-                    "SpawnFalle",
-                    "OneHitWanda",
-                    "CamperKing",
-                    "GameGenie",
-                    "HighPing",
-                    "CheesePro",
-                    "Speedy",
-                    "GigaGamer",
-                    "LevelNoob",
-                    "SkillTobi",
-                    "HeadshotMax",
-                    "PentaPaul",
-                    "CritKarl",
-                    "ManaLeerer",
-                    "Nachlader",
-                    "ClutchKönig",
-                    "FriendlyFe",
-                    "ZonenHeld",
-                    "SchleichKatze",
-                    "ShotgunPro",
-                    "SniperUdo",
-                    "BossHunter",
-                    "HeldenNoob",
-                    "KillFranz",
-                    "FragKarl",
-                    "TeamNiete",
-                    "LootPaul",
-                    "UltraNoob",
-                    "ProfiScout",
-                    "PunkteKlaus",
-                    "KrüppelKill",
-                    "PixelNinja",
-                    "NoobCrusher",
-                    "LagBoss",
-                    "SpawnKing",
-                    "AFKSlayer",
-                    "RespawnPro",
-                    "Killjoy",
-                    "GameBreaker",
-                    "FastFingers",
-                    "LootKing",
-                    "QuickFlick",
-                    "SilentShot",
-                    "HackGod",
-                    "GlitchHero",
-                    "SpeedyBot",
-                    "AimWizard",
-                    "FragMaster",
-                    "OneTapPro",
-                    "KnifeLord",
-                    "MetaHunter",
-                    "PingWarrior",
-                    "KeyBash",
-                    "ClutchPro",
-                    "ScopeBot",
-                    "TrollMage",
-                    "PowerLooter",
-                    "TankHero",
-                    "CampLord",
-                    "SmurfSlayer",
-                    "SkillThief",
-                    "SniperGod",
-                    "LevelHack",
-                    "GhostAim",
-                    "BossTamer",
-                    "ShotgunJoe",
-                    "AimRider",
-                    "KillCount",
-                    "PixelManiac",
-                    "TrollOver",
-                    "SneakPro",
-                    "ReloadKing",
-                    "SpawnTrap",
-                    "LagLover",
-                    "MetaHater",
-                    "BoomMaker",
-                    "WipeLord",
-                    "CarryPro",
-                    "ProBaiter",
-                    "GameWarden",
-                    "KartoffelKönig",
-                    "SaufenderWolf",
-                    "WurstGriller",
-                    "Flitzekacke",
-                    "BratwurstBub",
-                    "Hoppeldoppels",
-                    "BananenMensch",
-                    "KlopapierGuru",
-                    "SchnitzelKing",
-                    "NerdNomade",
-                    "Dönertänzer",
-                    "GlitzerGurke",
-                    "SchinkenShrek",
-                    "KäseKalle",
-                    "SchokoSchnecke",
-                    "KeksKämpfer",
-                    "QuarkPiraten",
-                    "Müslimonster",
-                    "KnuddelNase",
-                    "FantaFighter",
-                    "SchnapsSaurier",
-                    "Wackelpudding",
-                    "ZitronenZock",
-                    "FettWurst",
-                    "PlüschPanda",
-                    "Zuckerschnur",
-                    "FluffiKopf",
-                    "DonutDöner",
-                    "VollpfostenX",
-                    "Waschlappen",
-                    "Witzepumper",
-                    "ToastTraum",
-                    "FroschFighter",
-                    "KrümelTiger",
-                    "RegenWolke",
-                    "PuddingPower",
-                    "KoffeinKrieger",
-                    "SpeckSchlumpf",
-                    "SuperSuppe",
-                    "BierBärchen",
-                    "FischBär",
-                    "Flauschi",
-                    "Schokomonster",
-                    "ChaosKäse",
-                    "FlitzLappen",
-                    "WurstWombat",
-                    "KrümelMensch",
-                    "PuddingBär",
-                    "ZickZack",
-                    "Schwabel",
-                    "Fluffi",
-                    "RülpsFrosch",
-                    "PommesPapa",
-                    "QuarkBär",
-                    "KnusperKönig",
-                    "ToastBrot",
-                    "Ploppster",
-                    "Schleimschwein",
-                    "Äpfelchen",
-                    "Knallbonbon",
-                    "KaffeeKopf",
-                    "WackelWurst",
-                    "RennKeks",
-                    "BröselBub",
-                    "ZockerBrot",
-                    "BierWurm",
-                    "StinkFlummi",
-                    "SchlumpfKing",
-                    "PurzelBär",
-                    "FlinkFluff",
-                    "PloppPudel",
-                    "Schnorchel",
-                    "FliegenKopf",
-                    "PixelPommes",
-                    "SchwipsWürst",
-                    "WutzBär",
-                    "KnuddelKeks",
-                    "FantaFlumm",
-                    "ZockerKäse",
-                    "LachHäufchen",
-                    "GurkenGuru",
-                    "PonySchnitzel",
-                    "NudelNinja",
-                    "VulkanKeks",
-                    "WasserToast",
-                    "MenschSalat",
-                    "KampfKohl",
-                    "SockenZirkus",
-                    "SchwimmBärchen",
-                    "TanzenderPudel",
-                    "PizzamarktMensch",
-                    "ZahnarztZocker",
-                    "RollerRudi",
-                    "PupsPilot",
-                    "WitzigeZwiebel",
-                    "Pillenschlucker",
-                    "ZwiebelReiter",
-                    "HüpfenderKaktus",
-                    "AsteroidenAlf",
-                    "ChaosKarotte",
-                    "WolkenFurz",
-                    "Krümelmonster",
-                    "WackelBiene",
+                "PixelPirat",
+                "NoobJäger",
+                "LagMeister",
+                "KnopfDrücker",
+                "SpawnCamper",
+                "AFKHeld",
+                "RageQuitter",
+                "GameOverPro",
+                "Checkpoint",
+                "RespawnHeld",
+                "Teebeutel",
+                "GlitchHexer",
+                "QuickScope",
+                "LootSammler",
+                "EpicLauch",
+                "KartoffelPro",
+                "StilleKlinge",
+                "TastenHeld",
+                "PixelKrieger",
+                "HacknSlash",
+                "JoystickJoe",
+                "SpawnFalle",
+                "OneHitWanda",
+                "CamperKing",
+                "GameGenie",
+                "HighPing",
+                "CheesePro",
+                "Speedy",
+                "GigaGamer",
+                "LevelNoob",
+                "SkillTobi",
+                "HeadshotMax",
+                "PentaPaul",
+                "CritKarl",
+                "ManaLeerer",
+                "Nachlader",
+                "ClutchKönig",
+                "FriendlyFe",
+                "ZonenHeld",
+                "SchleichKatze",
+                "ShotgunPro",
+                "SniperUdo",
+                "BossHunter",
+                "HeldenNoob",
+                "KillFranz",
+                "FragKarl",
+                "TeamNiete",
+                "LootPaul",
+                "UltraNoob",
+                "ProfiScout",
+                "PunkteKlaus",
+                "KrüppelKill",
+                "PixelNinja",
+                "NoobCrusher",
+                "LagBoss",
+                "SpawnKing",
+                "AFKSlayer",
+                "RespawnPro",
+                "Killjoy",
+                "GameBreaker",
+                "FastFingers",
+                "LootKing",
+                "QuickFlick",
+                "SilentShot",
+                "HackGod",
+                "GlitchHero",
+                "SpeedyBot",
+                "AimWizard",
+                "FragMaster",
+                "OneTapPro",
+                "KnifeLord",
+                "MetaHunter",
+                "PingWarrior",
+                "KeyBash",
+                "ClutchPro",
+                "ScopeBot",
+                "TrollMage",
+                "PowerLooter",
+                "TankHero",
+                "CampLord",
+                "SmurfSlayer",
+                "SkillThief",
+                "SniperGod",
+                "LevelHack",
+                "GhostAim",
+                "BossTamer",
+                "ShotgunJoe",
+                "AimRider",
+                "KillCount",
+                "PixelManiac",
+                "TrollOver",
+                "SneakPro",
+                "ReloadKing",
+                "SpawnTrap",
+                "LagLover",
+                "MetaHater",
+                "BoomMaker",
+                "WipeLord",
+                "CarryPro",
+                "ProBaiter",
+                "GameWarden",
             };
 
             Random random = new Random();

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/VideoSettingsDialog.java

@@ -8,19 +8,8 @@
 import pp.mdga.client.button.MenuButton;
 import pp.mdga.client.view.MdgaView;
 
-import java.util.prefs.Preferences;
-
-/**
- * The {@code VideoSettingsDialog} class represents a dialog for configuring video settings,
- * such as resolution and fullscreen mode. It also provides an option to restart the application
- * when certain settings are changed.
- */
 public class VideoSettingsDialog extends Dialog {
-    private static Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
-
-    private ButtonRight fullscreenButton;
     private MenuButton backButton;
-    private ButtonRight restartButton;
 
     private ButtonLeft hdButton9;
     private ButtonLeft fullHdButton9;
@@ -33,13 +22,6 @@ public class VideoSettingsDialog extends Dialog {
 
     private boolean active = false;
 
-    /**
-     * Constructs a {@code VideoSettingsDialog}.
-     *
-     * @param app  The main application managing the dialog.
-     * @param node The root node for attaching UI elements.
-     * @param view The view managing navigation and interaction with the video settings dialog.
-     */
     public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
         super(app, node);
 
@@ -47,24 +29,20 @@ public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
 
         backButton = new MenuButton(app, node, view::leaveVideoSettings, "Zurück");
 
-        restartButton = new ButtonRight(app, node, MdgaApp::restartApp, "Neustart", 1);
-
-        fullscreenButton = new ButtonRight(app, node, () -> updateResolution(0, 0, 0, true), "Vollbild", 1);
-
-        hdButton9 = new ButtonLeft(app, node, () -> updateResolution(1280, 720, 1.0f, false), "hd 16:9", 10);
-        fullHdButton9 = new ButtonLeft(app, node, () -> updateResolution(1920, 1080, 2.25f, false), "full hd 16:9", 10);
-        wqhdButton9 = new ButtonLeft(app, node, () -> updateResolution(2560, 1440, 4.0f, false), "wqhd 16:9", 10);
+        // MenuButton für verschiedene Auflösungen erstellen
+        hdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(1280, 720, 1.0f), "hd 16:9", 10);
+        fullHdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(1920, 1080, 2.25f), "full hd 16:9", 10);
+        wqhdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(2560, 1440, 4.0f), "wqhd 16:9", 10);
 
 
-        hdButton10 = new ButtonRight(app, node, () -> updateResolution(1280, 800, 1.0f, false), "hd 16:10", 10);
-        fullHdButton10 = new ButtonRight(app, node, () -> updateResolution(1920, 1200, 2.25f, false), "full hd 16:10", 10);
-        wqhdButton10 = new ButtonRight(app, node, () -> updateResolution(2560, 1600, 4.0f, false), "wqhd 16:10", 10);
+        hdButton10 = new ButtonRight(app, node, () -> app.updateResolution(1280, 800, 1.0f), "hd 16:10", 10);
+        fullHdButton10 = new ButtonRight(app, node, () -> app.updateResolution(1920, 1200, 2.25f), "full hd 16:10", 10);
+        wqhdButton10 = new ButtonRight(app, node, () -> app.updateResolution(2560, 1600, 4.0f), "wqhd 16:10", 10);
 
         float offset = 2.8f;
 
         hdButton9.setPos(new Vector2f(hdButton9.getPos().x, MenuButton.VERTICAL - offset));
         hdButton10.setPos(new Vector2f(hdButton10.getPos().x, MenuButton.VERTICAL - offset));
-        fullscreenButton.setPos(new Vector2f(fullscreenButton.getPos().x, MenuButton.VERTICAL - offset));
         offset += 1.5f;
 
         fullHdButton9.setPos(new Vector2f(fullHdButton9.getPos().x, MenuButton.VERTICAL - offset));
@@ -78,9 +56,6 @@ public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
         backButton.setPos(new Vector2f(0, 1.8f));
     }
 
-    /**
-     * Called when the dialog is shown. Displays all buttons and marks the dialog as active.
-     */
     @Override
     protected void onShow() {
         active = true;
@@ -93,13 +68,9 @@ protected void onShow() {
         fullHdButton10.show();
         wqhdButton10.show();
 
-        fullscreenButton.show();
         backButton.show();
     }
 
-    /**
-     * Called when the dialog is hidden. Hides all buttons and marks the dialog as inactive.
-     */
     @Override
     protected void onHide() {
         active = false;
@@ -112,33 +83,12 @@ protected void onHide() {
         fullHdButton10.hide();
         wqhdButton10.hide();
 
-        fullscreenButton.hide();
         backButton.hide();
-        restartButton.hide();
     }
 
-    /**
-     * Updates the dialog's state. This method can be used for periodic updates while the dialog is active.
-     */
     public void update() {
-        if (!active) {
+        if(!active) {
             return;
         }
     }
-
-    /**
-     * Updates the resolution settings and optionally triggers the restart button if changes are detected.
-     *
-     * @param width        The width of the resolution.
-     * @param height       The height of the resolution.
-     * @param imageFactor  The scaling factor for the resolution.
-     * @param isFullscreen {@code true} if fullscreen mode is enabled, {@code false} otherwise.
-     */
-    public void updateResolution(int width, int height, float imageFactor, boolean isFullscreen) {
-        if (width != prefs.getInt("width", 1280) || height != prefs.getInt("height", 720) || isFullscreen != prefs.getBoolean("fullscreen", false)) {
-            restartButton.show();
-        }
-
-        app.updateResolution(width, height, imageFactor, isFullscreen);
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/ActionTextHandler.java

@@ -10,26 +10,13 @@
 import pp.mdga.client.animation.ZoomControl;
 import pp.mdga.game.Color;
 
-/**
- * The {@code ActionTextHandler} class manages the display of animated and stylized text messages in the game's UI.
- * It supports dynamic text creation with spacing, color, and effects, such as dice rolls, player actions, and rankings.
- */
-class ActionTextHandler {
+ class ActionTextHandler {
     private Node root;
     private BitmapFont font;
     private AppSettings appSettings;
     private int ranking;
 
-    float paddingRanked = 100;
-
-    /**
-     * Constructs an {@code ActionTextHandler}.
-     *
-     * @param guiNode      The GUI node where the text messages will be displayed.
-     * @param assetManager The asset manager used to load fonts and other assets.
-     * @param appSettings  The application settings for positioning and sizing.
-     */
-    ActionTextHandler(Node guiNode, AssetManager assetManager, AppSettings appSettings) {
+     ActionTextHandler(Node guiNode, AssetManager assetManager, AppSettings appSettings){
         root = new Node("actionTextRoot");
         guiNode.attachChild(root);
 
@@ -39,23 +26,13 @@ class ActionTextHandler {
         ranking = 0;
     }
 
-    /**
-     * Creates a {@code Node} containing text with specified spacing, size, and colors for each segment of the text.
-     *
-     * @param textArr  An array of strings representing the text to be displayed.
-     * @param spacing  The spacing between individual characters.
-     * @param size     The size of the text.
-     * @param colorArr An array of {@code ColorRGBA} representing the color for each string in {@code textArr}.
-     * @return A {@code Node} containing the styled text with spacing and color applied.
-     * @throws RuntimeException if the lengths of {@code textArr} and {@code colorArr} do not match.
-     */
     private Node createTextWithSpacing(String[] textArr, float spacing, float size, ColorRGBA[] colorArr) {
-        if (textArr.length != colorArr.length) throw new RuntimeException("text and color are not the same length");
+        if(textArr.length != colorArr.length) throw new RuntimeException("text and color are not the same length");
 
         Node textNode = new Node("TextWithSpacing");
         Node center = new Node();
         float xOffset = 0;
-        for (int i = 0; i < textArr.length; i++) {
+        for(int i = 0; i < textArr.length; i++){
             String text = textArr[i];
             ColorRGBA color = colorArr[i];
             for (char c : text.toCharArray()) {
@@ -63,199 +40,90 @@ private Node createTextWithSpacing(String[] textArr, float spacing, float size,
                 letter.setColor(color);
                 letter.setSize(size);
                 letter.setText(Character.toString(c));
-                letter.setLocalTranslation(xOffset, letter.getHeight() / 2, 0);
+                letter.setLocalTranslation(xOffset, letter.getHeight()/2, 0);
                 center.attachChild(letter);
 
                 xOffset += letter.getLineWidth() + spacing;
             }
         }
 
-        center.setLocalTranslation(new Vector3f(-xOffset / 2, 0, 0));
+        center.setLocalTranslation(new Vector3f(-xOffset/2,0,0));
         textNode.attachChild(center);
         return textNode;
     }
 
-    /**
-     * Creates a {@code Node} containing text with specified spacing, size, and a single color.
-     *
-     * @param text    The text to be displayed.
-     * @param spacing The spacing between individual characters.
-     * @param size    The size of the text.
-     * @param color   The color of the text.
-     * @return A {@code Node} containing the styled text.
-     */
     private Node createTextWithSpacing(String text, float spacing, float size, ColorRGBA color) {
         return createTextWithSpacing(new String[]{text}, spacing, size, new ColorRGBA[]{color});
     }
 
-    /**
-     * Calculates the center position of a rectangle given its width, height, and an origin position.
-     *
-     * @param width  The width of the rectangle.
-     * @param height The height of the rectangle.
-     * @param pos    The origin position of the rectangle.
-     * @return A {@code Vector3f} representing the center position.
-     */
-    private Vector3f center(float width, float height, Vector3f pos) {
-        return new Vector3f(pos.x + width / 2, pos.y + height / 2, 0);
+    private Vector3f center(float width, float height, Vector3f pos){
+        return new Vector3f(pos.x+width/2, pos.y+height/2,0);
     }
 
-    /**
-     * Creates and positions a single-line text at the top of the screen with a specified vertical offset.
-     *
-     * @param name    The text to be displayed.
-     * @param spacing The spacing between individual characters.
-     * @param size    The size of the text.
-     * @param color   The color of the text.
-     * @param top     The vertical offset from the top of the screen.
-     * @return A {@code Node} containing the styled text positioned at the top.
-     */
-    private Node createTopText(String name, float spacing, float size, ColorRGBA color, float top) {
+    private Node createTopText(String name, float spacing, float size, ColorRGBA color, float top){
         return createTopText(new String[]{name}, spacing, size, new ColorRGBA[]{color}, top);
     }
 
-    /**
-     * Creates and positions multi-line text at the top of the screen with specified vertical offset, spacing, and colors.
-     *
-     * @param name    An array of strings representing the text to be displayed.
-     * @param spacing The spacing between individual characters.
-     * @param size    The size of the text.
-     * @param color   An array of {@code ColorRGBA} representing the color for each string in {@code name}.
-     * @param top     The vertical offset from the top of the screen.
-     * @return A {@code Node} containing the styled text positioned at the top.
-     */
-    private Node createTopText(String[] name, float spacing, float size, ColorRGBA color[], float top) {
+    private Node createTopText(String[] name, float spacing, float size, ColorRGBA color[], float top){
         Node text = createTextWithSpacing(name, spacing, size, color);
-        text.setLocalTranslation(0, (appSettings.getHeight() / 2f) * 0.8f - top, 0);
+        text.setLocalTranslation(0, (appSettings.getHeight()/2f)*0.8f-top,0);
         root.attachChild(text);
         return text;
     }
 
-    /**
-     * Calculates the center position of a rectangle with negative width offset.
-     *
-     * @param width  The negative width of the rectangle.
-     * @param height The height of the rectangle.
-     * @param pos    The origin position of the rectangle.
-     * @return A {@code Vector3f} representing the center position.
-     */
-    private Vector3f centerText(float width, float height, Vector3f pos) {
+    private Vector3f centerText(float width, float height, Vector3f pos){
         return center(-width, height, pos);
     }
 
-    /**
-     * Displays a message indicating the active player.
-     *
-     * @param name  The name of the active player.
-     * @param color The color representing the player's team.
-     */
-    void activePlayer(String name, Color color) {
-        createTopText(new String[]{name, " ist dran"}, 10, 90, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0).addControl(new ZoomControl());
+     void activePlayer(String name, Color color){
+        createTopText(new String[]{name," ist dran"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
     }
 
-    /**
-     * Displays a message indicating that the current player is active.
-     *
-     * @param color The color representing the player's team.
-     */
-    void ownActive(Color color) {
-        createTopText(new String[]{"Du", " bist dran"}, 10, 90, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0).addControl(new ZoomControl());
+     void ownActive(Color color){
+        createTopText(new String[]{"Du"," bist dran"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
     }
 
-    /**
-     * Displays a dice roll result for a player.
-     *
-     * @param diceNum The number rolled on the dice.
-     * @param name    The name of the player.
-     * @param color   The color representing the player's team.
-     */
-    void diceNum(int diceNum, String name, Color color) {
-        createTopText(new String[]{name, " würfelt:"}, 10, 90, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0);
+     void diceNum(int diceNum, String name, Color color){
+        createTopText(new String[]{name," würfelt:"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0);
 
         createTopText(String.valueOf(diceNum), 10, 100, ColorRGBA.White, 100);
 
     }
 
-    /**
-     * Displays a dice roll result with a multiplier for a player.
-     *
-     * @param diceNum The number rolled on the dice.
-     * @param mult    The multiplier applied to the dice result.
-     * @param name    The name of the player.
-     * @param color   The color representing the player's team.
-     */
-    void diceNumMult(int diceNum, int mult, String name, Color color) {
-        createTopText(new String[]{name, " würfelt:"}, 10, 90, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0);
+     void diceNumMult(int diceNum,int mult, String name, Color color){
+        createTopText(new String[]{name," würfelt:"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0);
 
-        createTopText(new String[]{String.valueOf(diceNum), " x" + mult + " = " + (diceNum * mult)}, 20, 100, new ColorRGBA[]{ColorRGBA.White, ColorRGBA.Red}, 100);
+        createTopText(new String[]{String.valueOf(diceNum), " x" + mult + " = " + (diceNum*mult)}, 20, 100, new ColorRGBA[]{ColorRGBA.White,ColorRGBA.Red}, 100);
     }
 
-    /**
-     * Displays the dice roll result for the current player.
-     *
-     * @param diceNum The number rolled on the dice.
-     */
-    void ownDice(int diceNum) {
+     void ownDice(int diceNum){
         createTopText(String.valueOf(diceNum), 10, 100, ColorRGBA.White, 0);
     }
 
-    /**
-     * Displays the dice roll result with a multiplier for the current player.
-     *
-     * @param diceNum The number rolled on the dice.
-     * @param mult    The multiplier applied to the dice result.
-     */
-    void ownDiceMult(int diceNum, int mult) {
-        createTopText(new String[]{String.valueOf(diceNum), " x" + mult + " = " + (diceNum * mult)}, 20, 100, new ColorRGBA[]{ColorRGBA.White, ColorRGBA.Red}, 0);
+     void ownDiceMult(int diceNum, int mult){
+        createTopText(new String[]{String.valueOf(diceNum), " x" + mult + " = " + (diceNum*mult)}, 20, 100, new ColorRGBA[]{ColorRGBA.White,ColorRGBA.Red}, 0);
     }
 
-    /**
-     * Displays a message indicating that a specified player received a bonus card.
-     *
-     * @param name  The name of the player who received the bonus card.
-     * @param color The color representing the player's team.
-     */
-    void drawCard(String name, Color color) {
-        createTopText(new String[]{name, " erhält eine Bonuskarte"}, 7, 70, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0).addControl(new ZoomControl());
+     void drawCard(String name, Color color){
+        createTopText(new String[]{name," erhält eine Bonuskarte"}, 7,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
     }
 
-    /**
-     * Displays a message indicating that the current player received a bonus card.
-     *
-     * @param color The color representing the player's team.
-     */
-    void drawCardOwn(Color color) {
-        createTopText(new String[]{"Du", "  erhälst eine Bonuskarte"}, 5, 70, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0).addControl(new ZoomControl());
+     void drawCardOwn(Color color){
+        createTopText(new String[]{"Du","  erhälst eine Bonuskarte"}, 5,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
     }
 
-    /**
-     * Displays a message indicating that a specified player has completed their turn or action.
-     *
-     * @param name  The name of the player who finished.
-     * @param color The color representing the player's team.
-     */
-    void finishText(String name, Color color) {
-        createTopText(new String[]{name, " ist fertig!"}, 7, 70, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0).addControl(new ZoomControl());
+     void finishText(String name, Color color){
+        createTopText(new String[]{name," ist fertig!"}, 7,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
     }
 
-    /**
-     * Displays a message indicating that the current player has completed their turn or action.
-     *
-     * @param color The color representing the player's team.
-     */
-    void finishTextOwn(Color color) {
-        createTopText(new String[]{"Du", " bist fertig!"}, 7, 70, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, 0).addControl(new ZoomControl());
+     void finishTextOwn(Color color){
+        createTopText(new String[]{"Du", " bist fertig!"}, 7,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
     }
 
-    /**
-     * Converts a player's team color to a corresponding {@code ColorRGBA}.
-     *
-     * @param color The player's team color.
-     * @return The corresponding {@code ColorRGBA}.
-     * @throws RuntimeException if the color is invalid.
-     */
-    private ColorRGBA playerColorToColorRGBA(Color color) {
-        return switch (color) {
+
+
+    private ColorRGBA playerColorToColorRGBA(Color color){
+        return switch (color){
             case ARMY -> ColorRGBA.Green;
             case NAVY -> ColorRGBA.Blue;
             case CYBER -> ColorRGBA.Orange;
@@ -264,41 +132,25 @@ private ColorRGBA playerColorToColorRGBA(Color color) {
         };
     }
 
-    /**
-     * Hides all text messages displayed by the handler and resets the ranking counter.
-     */
-    void hide() {
-        ranking = 0;
-        root.detachAllChildren();
+     void hide(){
+         ranking = 0;
+         root.detachAllChildren();
     }
 
-    /**
-     * Displays a ranked dice roll result for a specified player.
-     *
-     * @param name  The name of the player.
-     * @param color The color representing the player's team.
-     * @param eye   The dice roll result.
-     */
-    void rollRankingResult(String name, Color color, int eye) {
-        createTopText(new String[]{name, ":  " + eye}, 10, 90, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, paddingRanked * ranking);
+    float paddingRanked = 100;
+
+    void rollRankingResult(String name, Color color, int eye){
+        createTopText(new String[]{name,":  "+eye}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, paddingRanked*ranking);
         ranking++;
     }
 
-    /**
-     * Displays a ranked dice roll result for the current player.
-     *
-     * @param color The color representing the player's team.
-     * @param eye   The dice roll result.
-     */
-    void rollRankingResultOwn(Color color, int eye) {
-        createTopText(new String[]{"Du", ":  " + eye}, 10, 90, new ColorRGBA[]{playerColorToColorRGBA(color), ColorRGBA.White}, paddingRanked * ranking);
-        ranking++;
-    }
+     void rollRankingResultOwn(Color color, int eye){
+         createTopText(new String[]{"Du",":  "+eye}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, paddingRanked*ranking);
+         ranking++;
+     }
+
+     void diceNow(){
+         createTopText("Klicke  zum  Würfeln", 5, 80, ColorRGBA.White, 0);
+     }
 
-    /**
-     * Displays a message prompting the player to roll the dice.
-     */
-    void diceNow() {
-        createTopText("Klicke  zum  Würfeln", 5, 80, ColorRGBA.White, 0);
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardControl.java

@@ -7,18 +7,23 @@
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.renderer.Camera;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
+import com.jme3.scene.control.AbstractControl;
+import com.jme3.scene.shape.Box;
+import com.jme3.scene.shape.Cylinder;
 import com.jme3.scene.shape.Sphere;
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.board.OutlineControl;
 
-/**
- * CardControl class extends OutlineControl to manage the visual representation
- * and behavior of a card in the game.
- */
+import java.awt.*;
+
 public class CardControl extends OutlineControl {
 
+    private static final ColorRGBA OUTLINE_COLOR = ColorRGBA.Yellow;
+
     private static final ColorRGBA HIGHLIGHT_COLOR = ColorRGBA.Yellow;
     private static final int HIGHLIGHT_WIDTH = 9;
 
@@ -28,45 +33,34 @@ public class CardControl extends OutlineControl {
     private static final ColorRGBA SELECT_COLOR = ColorRGBA.Blue;
     private static final int SELECT_WIDTH = 13;
 
+
+    private static final int OUTLINE_THICKNESS = 9;
+    private boolean hoverable;
+    private boolean highlight;
+    private boolean selectable;
+    private boolean select;
     private Node root;
     private BitmapText num;
 
-    /**
-     * Constructor for CardControl.
-     *
-     * @param app  the application instance
-     * @param fpp  the FilterPostProcessor instance
-     * @param cam  the Camera instance
-     * @param root the root Node
-     */
-    public CardControl(MdgaApp app, FilterPostProcessor fpp, Camera cam, Node root) {
-        super(app, fpp, cam,
-            HIGHLIGHT_COLOR, HIGHLIGHT_WIDTH,
-            HOVER_COLOR, HOVER_WIDTH,
-            SELECT_COLOR, SELECT_WIDTH
-        );
-
+    public CardControl(MdgaApp app, FilterPostProcessor fpp, Camera cam, Node root){
+        super(app, fpp, cam, OUTLINE_THICKNESS);
         this.root = root;
 
+
         Node rootNum = createNum();
-        rootNum.setLocalTranslation(new Vector3f(0.35f, 0.8f, 0));
+        rootNum.setLocalTranslation(new Vector3f(0.35f,0.8f,0));
         root.attachChild(rootNum);
     }
 
-    /**
-     * Creates a Node containing a number and a circle geometry.
-     *
-     * @return the created Node
-     */
-    private Node createNum() {
+    private Node createNum(){
         Node rootNum = new Node("root Num");
-        Geometry circle = new Geometry("circle", new Sphere(20, 20, 1));
-        circle.setLocalTranslation(new Vector3f(0.03f, 0.01f, 1));
+        Geometry circle = new Geometry("circle", new Sphere(20,20,1));
+        circle.setLocalTranslation(new Vector3f(0.03f,0.01f,1));
         circle.setLocalScale(0.2f);
         Material mat = new Material(getApp().getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
         mat.setColor("Color", ColorRGBA.Black);
         circle.setMaterial(mat);
-//        root.attachChild(circle);
+        root.attachChild(circle);
         BitmapFont guiFont = getApp().getAssetManager().loadFont("Fonts/Gunplay.fnt");
         num = new BitmapText(guiFont);
         num.setSize(0.3f);
@@ -78,30 +72,79 @@ private Node createNum() {
         return rootNum;
     }
 
-    /**
-     * Sets the number displayed on the card.
-     *
-     * @param num the number to display
-     */
-    public void setNumCard(int num) {
+    public void setNumCard(int num){
         this.num.setText(String.valueOf(num));
     }
 
-    /**
-     * Gets the root Node of the card.
-     *
-     * @return the root Node
-     */
     public Node getRoot() {
         return root;
     }
 
-    /**
-     * Initializes the spatial properties of the card.
-     */
     @Override
-    public void initSpatial() {
+    public void initSpatial(){
     }
 
-    private final static Vector3f HIGHLIGHT_Y = new Vector3f(0, 0.4f, 0);
+    public void outline(){
+        super.outline(OUTLINE_COLOR);
+    }
+
+    private final static Vector3f HIGHLIGHT_Y = new Vector3f(0,0.4f,0);
+
+    public void setHighlight() {
+        this.highlight = true;
+        root.setLocalTranslation(root.getLocalTranslation().add(HIGHLIGHT_Y));
+        highlight();
+    }
+
+    public void highlight() {
+        super.outline(HIGHLIGHT_COLOR, HIGHLIGHT_WIDTH);
+    }
+
+    public void unHighlight(){
+        highlight = false;
+        root.setLocalTranslation(root.getLocalTranslation().subtract(HIGHLIGHT_Y));
+        deOutline();
+    }
+
+    public void hover(){
+        if(!hoverable) return;
+        super.outline(HOVER_COLOR, HOVER_WIDTH);
+    }
+
+    public void hoverOff(){
+        if(!hoverable) return;
+
+        if(select) select();
+        else if(highlight) highlight();
+        else deOutline();
+    }
+
+    public void select(){
+        if(!selectable) return;
+        select = true;
+        super.outline(SELECT_COLOR, SELECT_WIDTH);
+    }
+
+    public void unSelect(){
+        if(!selectable) return;
+        select = false;
+        if(highlight) highlight();
+        else deOutline();
+    }
+
+    public void setSelectable(boolean selectable){
+        this.selectable = selectable;
+    }
+
+    public boolean isSelected() {
+        return select;
+    }
+
+    public boolean isSelectable() {
+        return selectable;
+    }
+
+    public void setHoverable(boolean hoverable) {
+        this.hoverable = hoverable;
+    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java

@@ -8,7 +8,6 @@
 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;
@@ -19,13 +18,8 @@
 import com.jme3.texture.Image;
 import com.jme3.texture.Texture2D;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-/**
- * CardLayer is an application state that manages the rendering and updating of card objects
- * in a separate viewport with post-processing effects.
- */
 public class CardLayer extends AbstractAppState {
 
     public static final int SHADOWMAP_SIZE = 1024 * 8;
@@ -37,58 +31,35 @@ public class CardLayer extends AbstractAppState {
     private List<Spatial> cardBuffer;
     private final FilterPostProcessor fpp;
     private final Camera overlayCam;
-    private Texture2D backTexture;
-    private FXAAFilter fxaaFilter;
-    private ViewPort view;
-    private DirectionalLightShadowFilter dlsf;
-    DirectionalLight sun;
-    ComposeFilter compose;
+    Texture2D backTexture;
 
-    /**
-     * Constructs a new CardLayer with the specified post-processor, camera, and background texture.
-     *
-     * @param fpp the FilterPostProcessor to use for post-processing effects
-     * @param overlayCam the Camera to use for the overlay
-     * @param backTexture the Texture2D to use as the background texture
-     */
     public CardLayer(FilterPostProcessor fpp, Camera overlayCam, Texture2D backTexture) {
         this.overlayCam = overlayCam;
         this.fpp = fpp;
-        this.backTexture = backTexture;
-        cardBuffer = new ArrayList<>();
+        this.cardBuffer = new ArrayList<>();
         init = false;
-        fxaaFilter = new FXAAFilter();
-        view = null;
-        dlsf = null;
-
-        sun = new DirectionalLight();
-        sun.setColor(ColorRGBA.White);
-        sun.setDirection(new Vector3f(.5f, -.5f, -1));
-        compose = new ComposeFilter(backTexture);
-        root = new Node("Under gui viewport Root");
+        this.backTexture = backTexture;
     }
 
-    /**
-     * Initializes the CardLayer, setting up the viewport, filters, and lighting.
-     *
-     * @param stateManager the AppStateManager managing this state
-     * @param app the Application instance
-     */
     @Override
     public void initialize(AppStateManager stateManager, Application app) {
         this.app = app;
+        root = new Node("Under gui viewport Root");
 
-        view = app.getRenderManager().createMainView("Under gui ViewPort", overlayCam);
+        ViewPort view = app.getRenderManager().createMainView("Under gui ViewPort", overlayCam);
         view.setEnabled(true);
         view.setClearFlags(true, true, true);
         view.attachScene(root);
         fpp.setFrameBufferFormat(Image.Format.RGBA8);
-        fpp.addFilter(compose);
-        fpp.addFilter(fxaaFilter);
+        fpp.addFilter(new ComposeFilter(backTexture));
 
+
+        DirectionalLight sun = new DirectionalLight();
+        sun.setColor(ColorRGBA.White);
+        sun.setDirection(new Vector3f(.5f, -.5f, -1));
         root.addLight(sun);
 
-        dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 3);
+        DirectionalLightShadowFilter dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 3);
         dlsf.setLight(sun);
         dlsf.setEnabled(true);
         dlsf.setEdgeFilteringMode(EdgeFilteringMode.PCFPOISSON);
@@ -100,35 +71,17 @@ public void initialize(AppStateManager stateManager, Application app) {
         if (!init) init = true;
     }
 
-    /**
-     * Shuts down the CardLayer, removing filters, lights, and clearing buffers.
-     */
     public void shutdown() {
-        fpp.removeFilter(dlsf);
-        dlsf = null;
-        root.removeLight(sun);
-        fpp.removeFilter(fxaaFilter);
-        view.detachScene(root);
-
         cardBuffer.clear();
         root.detachAllChildren();
     }
 
-    /**
-     * Renders the CardLayer, updating the geometric state of the root node.
-     *
-     * @param rm the RenderManager handling the rendering
-     */
+
     @Override
     public void render(RenderManager rm) {
         root.updateGeometricState();
     }
 
-    /**
-     * Updates the CardLayer, attaching buffered cards to the root node and updating its logical state.
-     *
-     * @param tpf time per frame
-     */
     @Override
     public void update(float tpf) {
         if (init && !cardBuffer.isEmpty()) {
@@ -140,39 +93,18 @@ public void update(float tpf) {
         root.updateLogicalState(tpf);
     }
 
-    /**
-     * Adds a spatial card to the CardLayer.
-     *
-     * @param card the Spatial card to add
-     */
     public void addSpatial(Spatial card) {
-        if (root == null) cardBuffer.add(card);
-        else root.attachChild(card);
+        cardBuffer.add(card);
     }
 
-    /**
-     * Deletes a spatial card from the CardLayer.
-     *
-     * @param spatial the Spatial card to delete
-     */
     public void deleteSpatial(Spatial spatial) {
         root.detachChild(spatial);
     }
 
-    /**
-     * Gets the overlay camera used by the CardLayer.
-     *
-     * @return the overlay camera
-     */
     public Camera getOverlayCam() {
         return overlayCam;
     }
 
-    /**
-     * Gets the root node of the CardLayer.
-     *
-     * @return the root node
-     */
     public Node getRootNode() {
         return root;
     }

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java

@@ -15,9 +15,6 @@
 
 import java.util.*;
 
-/**
- * Handles the card layer in the GUI, including card management and dice control.
- */
 public class CardLayerHandler {
     private static final Vector3f START = new Vector3f(-1.8f, -3.5f, 0);
     private static final Vector3f MARGIN = new Vector3f(1.8f, 0, 0);
@@ -32,28 +29,17 @@ public class CardLayerHandler {
     private DiceControl diceControl;
 
     private final Map<BonusCard, CardControl> bonusCardControlMap = new HashMap<>();
-    private final List<BonusCard> cardOrder = new ArrayList<>();
     private final Map<BonusCard, Integer> bonusCardIntegerMap = new HashMap<>();
     private final Set<CardControl> selectableCards = new HashSet<>();
 
     private BonusCard cardSelect = null;
-    private boolean show = false;
 
-    /**
-     * Constructs a CardLayerHandler.
-     *
-     * @param app the application instance
-     * @param backTexture the background texture
-     */
     public CardLayerHandler(MdgaApp app, Texture2D backTexture) {
         this.app = app;
         this.fpp = new FilterPostProcessor(app.getAssetManager());
         this.backTexture = backTexture;
     }
 
-    /**
-     * Initializes the card layer and dice control.
-     */
     public void init() {
         cardLayerCamera = createOverlayCam();
         cardLayer = new CardLayer(fpp, cardLayerCamera, backTexture);
@@ -63,188 +49,99 @@ public void init() {
         diceControl.create(new Vector3f(0, 0, 0), 1f, false);
     }
 
-    /**
-     * Shuts down the card layer and clears selectable cards.
-     */
     public void shutdown() {
-        clearSelectableCards();
         if (cardLayer != null) {
             cardLayer.shutdown();
-            app.getStateManager().detach(cardLayer);
+            clearSelectableCards();
         }
         cardLayer = null;
     }
 
-    /**
-     * Rolls the dice with a specified number and action to perform after rolling.
-     *
-     * @param rollNum the number to roll (must be between 1 and 6)
-     * @param actionAfter the action to perform after rolling
-     */
     public void rollDice(int rollNum, Runnable actionAfter) {
         if (!(1 <= rollNum && rollNum <= 6)) throw new RuntimeException("rollNum is not in the range [1,6]");
         diceControl.rollDice(rollNum, actionAfter);
     }
 
-    /**
-     * Shows the dice on the card layer.
-     */
     public void showDice() {
-        if (show) return;
-        show = true;
         cardLayer.addSpatial(diceControl.getSpatial());
         diceControl.spin();
     }
 
-    /**
-     * Hides the dice from the card layer.
-     */
     public void hideDice() {
-        show = false;
         diceControl.hide();
     }
 
-    /**
-     * Adds a card to the card layer.
-     *
-     * @param card the card to add
-     */
     public void addCard(BonusCard card) {
         if (card == BonusCard.HIDDEN) throw new RuntimeException("Can't add hidden card to GUI");
 
         if (!bonusCardControlMap.containsKey(card)) {
-            cardOrder.add(card);
+            CardControl control = createCard(bonusToAsset(card), nextPos());
+            bonusCardControlMap.put(card, control);
+            cardLayer.addSpatial(control.getRoot());
         }
 
         int newNum = bonusCardIntegerMap.getOrDefault(card, 0) + 1;
         bonusCardIntegerMap.put(card, newNum);
-
-        updateCard();
+        bonusCardControlMap.get(card).setNumCard(newNum);
     }
 
-    /**
-     * Removes a card from the card layer.
-     *
-     * @param card the card to remove
-     */
-    public void removeCard(BonusCard card) {
-        if (bonusCardControlMap.containsKey(card)) {
-            bonusCardIntegerMap.put(card, bonusCardIntegerMap.get(card) - 1);
-
-            if (bonusCardIntegerMap.get(card) <= 0) {
-                bonusCardIntegerMap.remove(card);
-                cardOrder.remove(card);
-            }
-            updateCard();
-        } else throw new RuntimeException("card is not in bonusCardControlMap");
-    }
-
-    /**
-     * Clears all selectable cards.
-     */
     public void clearSelectableCards() {
         for (CardControl control : selectableCards) {
-            control.selectableOff();
+            control.setSelectable(false);
+            control.setHoverable(false);
+            control.unHighlight();
+            control.unSelect();
         }
         selectableCards.clear();
         cardSelect = null;
     }
 
-    /**
-     * Updates the card layer with the current cards.
-     */
-    private void updateCard() {
-        for (BonusCard card : bonusCardControlMap.keySet()) {
-            CardControl control = bonusCardControlMap.get(card);
-            cardLayer.deleteSpatial(control.getRoot());
-        }
-        bonusCardControlMap.clear();
-
-        for (int i = 0; i < cardOrder.size(); i++) {
-            BonusCard card = cardOrder.get(i);
-            CardControl control = createCard(bonusToAsset(card), nextPos(i));
-            control.setNumCard(bonusCardIntegerMap.get(card));
-            cardLayer.addSpatial(control.getRoot());
-            bonusCardControlMap.put(card, control);
-        }
-    }
-
-    /**
-     * Sets the selectable cards.
-     *
-     * @param select the list of cards to set as selectable
-     */
     public void setSelectableCards(List<BonusCard> select) {
         for (BonusCard card : select) {
             selectableCards.add(bonusCardControlMap.get(card));
         }
         for (CardControl control : selectableCards) {
-            control.selectableOn();
+            control.setSelectable(true);
+            control.setHoverable(true);
+            control.setHighlight();
         }
     }
 
-    /**
-     * Selects a card control.
-     *
-     * @param cardControl the card control to select
-     */
     public void selectCard(CardControl cardControl) {
         if (cardControl.isSelected()) {
-            cardControl.selectOff();
+            cardControl.unSelect();
             cardSelect = null;
         } else {
             for (CardControl control : selectableCards) {
-                control.selectOff();
+                control.unSelect();
             }
-            cardControl.selectOn();
+            cardControl.select();
             cardSelect = getKeyByValue(bonusCardControlMap, cardControl);
         }
-
-        app.getModelSynchronize().selectCard(cardSelect);
     }
 
-    /**
-     * Gets the card layer camera.
-     *
-     * @return the card layer camera
-     */
     public Camera getCardLayerCamera() {
         return cardLayerCamera;
     }
 
-    /**
-     * Adds a shield symbol to the card layer.
-     */
-    public void shield() {
+    public void shield(){
         SymbolControl control = createSymbol(Asset.shieldSymbol);
         cardLayer.addSpatial(control.getSpatial());
         control.shield();
     }
 
-    /**
-     * Adds a swap symbol to the card layer.
-     */
-    public void swap() {
+    public void swap(){
         SymbolControl control = createSymbol(Asset.swapSymbol);
         cardLayer.addSpatial(control.getSpatial());
         control.swap();
     }
 
-    /**
-     * Adds a turbo symbol to the card layer.
-     */
-    public void turbo() {
+    public void turbo(){
         SymbolControl control = createSymbol(Asset.turboSymbol);
         cardLayer.addSpatial(control.getSpatial());
         control.turbo();
     }
 
-    /**
-     * Converts a bonus card to its corresponding asset.
-     *
-     * @param card the bonus card
-     * @return the corresponding asset
-     */
     private Asset bonusToAsset(BonusCard card) {
         return switch (card) {
             case TURBO -> Asset.turboCard;
@@ -254,21 +151,10 @@ private Asset bonusToAsset(BonusCard card) {
         };
     }
 
-    /**
-     * Calculates the next position for a card.
-     *
-     * @param i the index of the card
-     * @return the next position vector
-     */
-    private Vector3f nextPos(int i) {
-        return START.add(MARGIN.mult(i));
+    private Vector3f nextPos() {
+        return START.add(MARGIN.mult(bonusCardControlMap.size()));
     }
 
-    /**
-     * Creates an overlay camera for the card layer.
-     *
-     * @return the created overlay camera
-     */
     private Camera createOverlayCam() {
         Camera originalCam = app.getCamera();
         Camera overlayCam = new Camera(originalCam.getWidth(), originalCam.getHeight());
@@ -281,15 +167,6 @@ private Camera createOverlayCam() {
         return overlayCam;
     }
 
-    /**
-     * Gets the key associated with a value in a map.
-     *
-     * @param map the map to search
-     * @param value the value to find the key for
-     * @param <K> the type of keys in the map
-     * @param <V> the type of values in the map
-     * @return the key associated with the value, or null if not found
-     */
     private <K, V> K getKeyByValue(Map<K, V> map, V value) {
         for (Map.Entry<K, V> entry : map.entrySet()) {
             if (entry.getValue().equals(value)) {
@@ -299,9 +176,6 @@ private <K, V> K getKeyByValue(Map<K, V> map, V value) {
         return null;
     }
 
-    /**
-     * Test method to add sample cards to the card layer.
-     */
     public void test() {
         addCard(BonusCard.SHIELD);
         addCard(BonusCard.SHIELD);
@@ -309,14 +183,7 @@ public void test() {
         addCard(BonusCard.SWAP);
     }
 
-    /**
-     * Creates a card control for a given asset and position.
-     *
-     * @param card the asset representing the card
-     * @param pos the position to place the card
-     * @return the created card control
-     */
-    private CardControl createCard(Asset card, Vector3f pos) {
+    private CardControl createCard(Asset card, Vector3f pos){
         Node rootCard = new Node("Root Card");
         Spatial spatial = app.getAssetManager().loadModel(card.getModelPath());
         rootCard.attachChild(spatial);
@@ -325,37 +192,26 @@ private CardControl createCard(Asset card, Vector3f pos) {
         spatial.setMaterial(mat);
         spatial.setLocalScale(1f);
         rootCard.setLocalTranslation(pos);
-        spatial.rotate((float) Math.toRadians(90), (float) Math.toRadians(180), (float) Math.toRadians(180));
+        spatial.rotate((float)Math.toRadians(90), (float)Math.toRadians(180), (float)Math.toRadians(180));
         spatial.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
         CardControl control = new CardControl(app, fpp, cardLayer.getOverlayCam(), rootCard);
         spatial.addControl(control);
         return control;
     }
 
-    /**
-     * Creates a symbol control for a given asset.
-     *
-     * @param asset the asset representing the symbol
-     * @return the created symbol control
-     */
-    private SymbolControl createSymbol(Asset asset) {
+    private SymbolControl createSymbol(Asset asset){
         Spatial spatial = app.getAssetManager().loadModel(asset.getModelPath());
         Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
         mat.setTexture("ColorMap", app.getAssetManager().loadTexture(asset.getDiffPath()));
         spatial.setMaterial(mat);
         spatial.setLocalScale(1f);
-        spatial.rotate((float) Math.toRadians(90), (float) Math.toRadians(180), (float) Math.toRadians(180));
+        spatial.rotate((float)Math.toRadians(90), (float)Math.toRadians(180), (float)Math.toRadians(180));
         SymbolControl control = new SymbolControl();
         spatial.addControl(control);
         return control;
     }
 
-    /**
-     * Gets the card layer.
-     *
-     * @return the card layer
-     */
-    public CardLayer getCardLayer() {
+    public CardLayer getCardLayer(){
         return cardLayer;
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java

@@ -11,18 +11,16 @@
 import com.jme3.scene.Spatial;
 import com.jme3.scene.control.AbstractControl;
 import pp.mdga.client.Asset;
-import pp.mdga.client.MdgaApp;
+
+import java.util.Random;
 
 import static com.jme3.material.Materials.LIGHTING;
 import static com.jme3.material.Materials.UNSHADED;
 
-/**
- * DiceControl class handles the rolling and spinning behavior of a dice in the game.
- */
 public class DiceControl extends AbstractControl {
     private Quaternion targetRotation;
     private final Vector3f angularVelocity = new Vector3f();
-    private float deceleration = 1f;
+    private float deceleration = 0.5f;
     private float timeElapsed = 0.0f;
     private float rollDuration = 1f;
     private static final int ANGULAR_MIN = 5;
@@ -34,39 +32,31 @@ public class DiceControl extends AbstractControl {
     private final AssetManager assetManager;
     private Runnable actionAfter;
 
-    /**
-     * Constructor for DiceControl.
-     *
-     * @param assetManager the asset manager to load models and textures
-     */
-    public DiceControl(AssetManager assetManager) {
+    public DiceControl(AssetManager assetManager){
         this.assetManager = assetManager;
     }
 
-    /**
-     * Updates the control each frame.
-     *
-     * @param tpf time per frame
-     */
+
     @Override
     protected void controlUpdate(float tpf) {
-        float clampedTpf = Math.min(tpf, 0.05f); // Max 50 ms per frame
         if (isRolling) {
-            if (!slerp) {
+            if(!slerp) {
                 // Apply rotational velocity to the dice
-                spinWithAngularVelocity(clampedTpf);
+                spinWithAngularVelocity(tpf);
 
                 // Gradually reduce rotational velocity (simulate deceleration)
                 angularVelocity.subtractLocal(
-                        angularVelocity.mult(deceleration * clampedTpf)
+                        angularVelocity.mult(deceleration * tpf)
                 );
 
                 // Stop rolling when angular velocity is close to zero
-                if (angularVelocity.lengthSquared() <= 3f || MdgaApp.DEBUG_MULTIPLIER == 0) {
+                if (angularVelocity.lengthSquared() < 3f) {
                     slerp = true;
                 }
-            } else {
-                timeElapsed += clampedTpf * rollDuration;
+            }
+            else {
+                timeElapsed += tpf * rollDuration;
+
 
                 if (timeElapsed > 1.0f) timeElapsed = 1.0f;
                 Quaternion interpolated = spatial.getLocalRotation().clone();
@@ -74,23 +64,18 @@ protected void controlUpdate(float tpf) {
                 spatial.setLocalRotation(interpolated);
 
                 // Stop rolling once duration is complete
-                if (timeElapsed >= 1.0f * MdgaApp.DEBUG_MULTIPLIER) {
+                if (timeElapsed >= 1.0f) {
                     isRolling = false;
                     slerp = false;
                     actionAfter.run();
                 }
             }
-        } else if (spin) {
-            spinWithAngularVelocity(clampedTpf);
+        }else if(spin){
+            spinWithAngularVelocity(tpf);
         }
     }
 
-    /**
-     * Applies rotational velocity to the dice.
-     *
-     * @param tpf time per frame
-     */
-    private void spinWithAngularVelocity(float tpf) {
+    private void spinWithAngularVelocity(float tpf){
         Quaternion currentRotation = spatial.getLocalRotation();
         Quaternion deltaRotation = new Quaternion();
         deltaRotation.fromAngles(
@@ -101,32 +86,20 @@ private void spinWithAngularVelocity(float tpf) {
         spatial.setLocalRotation(currentRotation.mult(deltaRotation));
     }
 
-    /**
-     * Renders the control.
-     *
-     * @param rm the render manager
-     * @param vp the viewport
-     */
     @Override
     protected void controlRender(RenderManager rm, ViewPort vp) {
     }
 
-    /**
-     * Initiates the dice roll.
-     *
-     * @param diceNum the number on the dice to roll to
-     * @param actionAfter the action to perform after the roll
-     */
+
     public void rollDice(int diceNum, Runnable actionAfter) {
         if (isRolling) return;
         spin = false;
         slerp = false;
-        timeElapsed = 0;
         this.actionAfter = actionAfter;
         angularVelocity.set(
-                FastMath.nextRandomInt(ANGULAR_MIN, ANGULAR_MAX),
-                FastMath.nextRandomInt(ANGULAR_MIN, ANGULAR_MAX),
-                FastMath.nextRandomInt(ANGULAR_MIN, ANGULAR_MAX)
+                FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),
+                FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),
+                FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX)
         );
 
         targetRotation = getRotationForDiceNum(diceNum);
@@ -134,12 +107,6 @@ public void rollDice(int diceNum, Runnable actionAfter) {
         isRolling = true;
     }
 
-    /**
-     * Gets the target rotation for a given dice number.
-     *
-     * @param diceNum the number on the dice
-     * @return the target rotation as a Quaternion
-     */
     private Quaternion getRotationForDiceNum(int diceNum) {
         return switch (diceNum) {
             case 1 -> new Quaternion().fromAngleAxis((float) (1 * (Math.PI / 2)), Vector3f.UNIT_X);
@@ -152,19 +119,10 @@ private Quaternion getRotationForDiceNum(int diceNum) {
         };
     }
 
-    /**
-     * Linear interpolation function.
-     *
-     * @param t the interpolation factor
-     * @return the interpolated value
-     */
     public static float lerp(float t) {
         return (float) Math.sqrt(1 - Math.pow(t - 1, 2));
     }
 
-    /**
-     * Sets a random rotation for the dice.
-     */
     public void randomRotation() {
         Quaternion randomRotation = new Quaternion();
         randomRotation.fromAngles(
@@ -175,55 +133,38 @@ public void randomRotation() {
         spatial.setLocalRotation(randomRotation);
     }
 
-    /**
-     * Initiates the dice spin.
-     */
-    public void spin() {
-        angularVelocity.set(ANGULAR_SPIN, ANGULAR_SPIN, ANGULAR_SPIN);
+    public void spin(){
+        angularVelocity.set(ANGULAR_SPIN,ANGULAR_SPIN,ANGULAR_SPIN);
         spin = true;
     }
 
-    /**
-     * Hides the dice by removing it from the parent node.
-     */
-    public void hide() {
+    public void hide(){
         spatial.removeFromParent();
         spin = false;
         isRolling = false;
         slerp = false;
     }
 
-    /**
-     * Creates the dice model and sets its initial properties.
-     *
-     * @param pos the position to place the dice
-     * @param scale the scale of the dice
-     * @param shadow whether the dice should cast and receive shadows
-     */
-    public void create(Vector3f pos, float scale, boolean shadow) {
+    public void create(Vector3f pos, float scale, boolean shadow){
         Spatial spatial = assetManager.loadModel(Asset.dice.getModelPath());
         Material mat;
-        if (shadow) {
+        if(shadow){
             mat = new Material(assetManager, LIGHTING);
             mat.setTexture("DiffuseMap", assetManager.loadTexture(Asset.dice.getDiffPath()));
             spatial.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
-        } else {
+        }
+        else{
             mat = new Material(assetManager, UNSHADED);
             mat.setTexture("ColorMap", assetManager.loadTexture(Asset.dice.getDiffPath()));
         }
         spatial.setMaterial(mat);
         spatial.setLocalScale(scale);
         spatial.setLocalTranslation(pos);
-        spatial.rotate((float) Math.toRadians(90), (float) Math.toRadians(180), (float) Math.toRadians(180));
+        spatial.rotate((float)Math.toRadians(90), (float)Math.toRadians(180), (float)Math.toRadians(180));
         spatial.addControl(this);
     }
 
-    /**
-     * Sets the position of the dice.
-     *
-     * @param pos the new position
-     */
-    public void setPos(Vector3f pos) {
+    public void setPos(Vector3f pos){
         spatial.setLocalTranslation(pos);
     }
 

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiHandler.java

@@ -6,14 +6,11 @@
 import com.jme3.texture.Image;
 import com.jme3.texture.Texture2D;
 import pp.mdga.client.MdgaApp;
-import pp.mdga.game.BonusCard;
 import pp.mdga.game.Color;
+import pp.mdga.game.BonusCard;
 
 import java.util.List;
 
-/**
- * Handles the GUI elements and interactions for the game.
- */
 public class GuiHandler {
     private final MdgaApp app;
     private final CardLayerHandler cardLayerHandler;
@@ -23,12 +20,6 @@ public class GuiHandler {
 
     private FrameBuffer backFrameBuffer;
 
-    /**
-     * Constructs a new GuiHandler.
-     *
-     * @param app the application instance
-     * @param guiNode the GUI node
-     */
     public GuiHandler(MdgaApp app, Node guiNode) {
         this.app = app;
         this.ownColor = ownColor;
@@ -43,11 +34,6 @@ public GuiHandler(MdgaApp app, Node guiNode) {
         actionTextHandler = new ActionTextHandler(guiNode, app.getAssetManager(), app.getContext().getSettings());
     }
 
-    /**
-     * Initializes the GUI handler with the player's color.
-     *
-     * @param ownColor the player's color
-     */
     public void init(Color ownColor) {
         cardLayerHandler.init();
         playerNameHandler.show();
@@ -55,173 +41,67 @@ public void init(Color ownColor) {
         app.getViewPort().setOutputFrameBuffer(backFrameBuffer);
     }
 
-    /**
-     * Shuts down the GUI handler.
-     */
     public void shutdown() {
         cardLayerHandler.shutdown();
         app.getViewPort().setOutputFrameBuffer(null);
     }
 
-    /**
-     * Rolls the dice and handles the result.
-     *
-     * @param rollNum the number rolled
-     * @param mult the multiplier
-     */
     public void rollDice(int rollNum, int mult) {
-        cardLayerHandler.rollDice(rollNum, () -> {
-            if (mult == -1) actionTextHandler.ownDice(rollNum);
+        cardLayerHandler.rollDice(rollNum, ()->{
+            if(mult == -1) actionTextHandler.ownDice(rollNum);
             else actionTextHandler.ownDiceMult(rollNum, mult);
             hideDice();
             app.getModelSynchronize().animationEnd();
-            app.getModelSynchronize().animationEnd();
         });
     }
 
-    /**
-     * Shows the rolled dice with a multiplier for a specific player.
-     *
-     * @param rollNum the number rolled
-     * @param mult the multiplier
-     * @param color the player's color
-     */
     public void showRolledDiceMult(int rollNum, int mult, Color color) {
         String name = playerNameHandler.getName(color);
-        if (mult == -1) actionTextHandler.diceNum(rollNum, name, color);
+        if(mult == -1) actionTextHandler.diceNum(rollNum, name, color);
         else actionTextHandler.diceNumMult(rollNum, mult, name, color);
     }
 
-    /**
-     * Shows the rolled dice for a specific player.
-     *
-     * @param rollNum the number rolled
-     * @param color the player's color
-     */
     public void showRolledDice(int rollNum, Color color) {
         actionTextHandler.diceNum(rollNum, playerNameHandler.getName(color), color);
     }
 
-    /**
-     * Displays the dice on the screen.
-     */
     public void showDice() {
         cardLayerHandler.showDice();
         actionTextHandler.diceNow();
     }
 
-    /**
-     * Hides the dice from the screen.
-     */
     public void hideDice() {
         cardLayerHandler.hideDice();
     }
 
-    /**
-     * Adds a card to the player's hand.
-     *
-     * @param card the card to add
-     */
-    public void addCardOwn(BonusCard card) {
+    public void addCard(BonusCard card) {
         cardLayerHandler.addCard(card);
-        playerNameHandler.addCard(ownColor);
-        actionTextHandler.drawCardOwn(ownColor);
     }
 
-    /**
-     * Plays a card from the player's hand.
-     *
-     * @param card the card to play
-     */
-    public void playCardOwn(BonusCard card) {
-        getEffectByCard(card);
-        cardLayerHandler.removeCard(card);
-        playerNameHandler.removeCard(ownColor);
-    }
-
-    /**
-     * Plays a card from an enemy player's hand.
-     *
-     * @param color the enemy player's color
-     * @param card the card to play
-     */
-    public void playCardEnemy(Color color, BonusCard card) {
-        getEffectByCard(card);
-        playerNameHandler.removeCard(color);
-    }
-
-    /**
-     * Gets the effect of a card and applies it.
-     *
-     * @param bonus the card to get the effect from
-     */
-    private void getEffectByCard(BonusCard bonus) {
-        switch (bonus) {
-            case SWAP -> swap();
-            case TURBO -> turbo();
-            case SHIELD -> shield();
-            default -> throw new RuntimeException("invalid card");
-        }
-    }
-
-    /**
-     * Clears all selectable cards.
-     */
     public void clearSelectableCards() {
         cardLayerHandler.clearSelectableCards();
     }
 
-    /**
-     * Sets the selectable cards.
-     *
-     * @param select the list of selectable cards
-     */
     public void setSelectableCards(List<BonusCard> select) {
         cardLayerHandler.setSelectableCards(select);
     }
 
-    /**
-     * Selects a card.
-     *
-     * @param cardControl the card control to select
-     */
     public void selectCard(CardControl cardControl) {
         cardLayerHandler.selectCard(cardControl);
     }
 
-    /**
-     * Gets the camera for the card layer.
-     *
-     * @return the card layer camera
-     */
     public Camera getCardLayerCamera() {
         return cardLayerHandler.getCardLayerCamera();
     }
 
-    /**
-     * Gets the root node for the card layer.
-     *
-     * @return the card layer root node
-     */
-    public Node getCardLayerRootNode() {
+    public Node getCardLayerRootNode(){
         return cardLayerHandler.getCardLayer().getRootNode();
     }
 
-    /**
-     * Adds a player to the game.
-     *
-     * @param color the player's color
-     * @param name the player's name
-     */
     public void addPlayer(Color color, String name) {
         playerNameHandler.addPlayer(color, name, color == ownColor);
     }
 
-    /**
-     * Sets the active player.
-     *
-     * @param color the active player's color
-     */
     public void setActivePlayer(Color color) {
         playerNameHandler.setActivePlayer(color);
 
@@ -229,63 +109,36 @@ public void setActivePlayer(Color color) {
         else actionTextHandler.activePlayer(playerNameHandler.getName(color), color);
     }
 
-    /**
-     * Applies the shield effect.
-     */
-    public void shield() {
+    public void shield(){
         cardLayerHandler.shield();
     }
 
-    /**
-     * Applies the swap effect.
-     */
-    public void swap() {
+    public void swap(){
         cardLayerHandler.swap();
     }
 
-    /**
-     * Applies the turbo effect.
-     */
-    public void turbo() {
+    public void turbo(){
         cardLayerHandler.turbo();
     }
 
-    /**
-     * Hides the action text.
-     */
-    public void hideText() {
+    public void hideText(){
         actionTextHandler.hide();
     }
 
-    /**
-     * Draws a card for an enemy player.
-     *
-     * @param color the enemy player's color
-     */
     public void drawCard(Color color) {
-        //Color != ownColor
-        actionTextHandler.drawCard(playerNameHandler.getName(color), color);
-        playerNameHandler.addCard(color);
+        if (ownColor == color) actionTextHandler.drawCardOwn(color);
+        else actionTextHandler.drawCard(playerNameHandler.getName(color), color);
     }
 
-    /**
-     * Displays the finish text for a player.
-     *
-     * @param color the player's color
-     */
-    public void finish(Color color) {
-        if (ownColor == color) actionTextHandler.finishTextOwn(color);
+    public void finish(Color color){
+        if(ownColor == color) actionTextHandler.finishTextOwn(color);
         else actionTextHandler.finishText(playerNameHandler.getName(color), color);
     }
 
-    /**
-     * Displays the ranking result for a player.
-     *
-     * @param color the player's color
-     * @param eye the ranking result
-     */
-    public void rollRankingResult(Color color, int eye) {
-        if (ownColor == color) actionTextHandler.rollRankingResultOwn(color, eye);
+    public void rollRankingResult(Color color, int eye){
+        if(ownColor == color) actionTextHandler.rollRankingResultOwn(color, eye);
         else actionTextHandler.rollRankingResult(playerNameHandler.getName(color), color, eye);
     }
+
+
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java

@@ -15,16 +15,12 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * Handles the display and management of player names and their associated data.
- */
+
 public class PlayerNameHandler {
     private final BitmapFont playerFont;
     private final Node playerNameNode;
     private final List<Color> playerOrder;
     private final Map<Color, String> colorNameMap;
-    private final Map<Color, Integer> colorCardMap;
-
     private final AppSettings appSettings;
     private final AssetManager assetManager;
     private Color ownColor;
@@ -40,206 +36,93 @@ public class PlayerNameHandler {
 
     private final Node guiNode;
 
-    /**
-     * Constructs a PlayerNameHandler.
-     *
-     * @param guiNode the GUI node to attach player names to
-     * @param assetManager the asset manager to load resources
-     * @param appSettings the application settings
-     */
-    public PlayerNameHandler(Node guiNode, AssetManager assetManager, AppSettings appSettings) {
+    public PlayerNameHandler(Node guiNode, AssetManager assetManager, AppSettings appSettings){
         this.guiNode = guiNode;
 
         playerFont = assetManager.loadFont("Fonts/Gunplay.fnt");
         playerNameNode = new Node("player name node");
         playerOrder = new ArrayList<>();
         colorNameMap = new HashMap<>();
-        colorCardMap = new HashMap<>();
         this.appSettings = appSettings;
         this.assetManager = assetManager;
     }
 
-    /**
-     * Shows the player names on the GUI.
-     */
     public void show() {
         guiNode.attachChild(playerNameNode);
     }
 
-    /**
-     * Hides the player names from the GUI.
-     */
     public void hide() {
         guiNode.detachChild(playerNameNode);
     }
 
-    /**
-     * Draws the player names and their associated data on the GUI.
-     */
-    private void drawPlayers() {
+    private void drawPlayers(){
         playerNameNode.detachAllChildren();
 
-        for (int i = 0; i < playerOrder.size(); i++) {
+
+        for(int i = 0; i < playerOrder.size(); i++) {
             Color color = playerOrder.get(i);
-            if (!colorNameMap.containsKey(color)) throw new RuntimeException(color + " isn't mapped to a name");
+            if(!colorNameMap.containsKey(color)) throw new RuntimeException(color + " isn't mapped to a name");
 
             Node nameParent = new Node("nameParent");
+            nameParent.attachChild(createName(colorNameMap.get(color), i == 0, color == ownColor));
             nameParent.attachChild(createColor(color));
-            BitmapText name = createName(colorNameMap.get(color), i == 0, color == ownColor);
-            nameParent.attachChild(name);
-            if (colorCardMap.getOrDefault(color, 0) > 0) {
-                Picture pic = createHandCard(name.getLineWidth());
-                nameParent.attachChild(pic);
-                nameParent.attachChild(createCardNum(colorCardMap.get(color), pic.getWidth(), pic.getLocalTranslation().getX()));
-            }
-            nameParent.setLocalTranslation(50, appSettings.getWindowHeight() - PADDING_TOP - MARGIN_NAMES * i, 0);
+            nameParent.setLocalTranslation(50,appSettings.getWindowHeight()-PADDING_TOP- MARGIN_NAMES *i,0);
             playerNameNode.attachChild(nameParent);
         }
     }
 
-    /**
-     * Creates a BitmapText object to display the number of cards a player has.
-     *
-     * @param num the number of cards
-     * @param lastWidth the width of the last element
-     * @param lastX the x position of the last element
-     * @return a BitmapText object displaying the number of cards
-     */
-    private Spatial createCardNum(int num, float lastWidth, float lastX) {
-        BitmapText hudText = new BitmapText(playerFont);
-        //renderedSize = 45
-        hudText.setSize(TEXT_SIZE);
-        hudText.setColor(NORMAL_COLOR);
-        hudText.setText(String.valueOf(num));
-        hudText.setLocalTranslation(lastX + lastWidth + 20, hudText.getHeight() / 2, 0);
-        return hudText;
-    }
-
-    /**
-     * Creates a Picture object to display a hand card image.
-     *
-     * @param width the width of the previous element
-     * @return a Picture object displaying a hand card image
-     */
-    private Picture createHandCard(float width) {
-        Picture pic = new Picture("HUD Picture");
-        pic.setImage(assetManager, "./Images/handcard.png", true);
-        pic.setWidth(IMAGE_SIZE);
-        pic.setHeight(IMAGE_SIZE);
-        pic.setPosition(-pic.getWidth() / 2 + width + PADDING_LEFT * 2, -pic.getHeight() / 2);
-        return pic;
-    }
-
-    /**
-     * Returns the image path for a given color.
-     *
-     * @param color the color to get the image path for
-     * @return the image path for the given color
-     */
-    private String imagePath(Color color) {
+    private String imagePath(Color color){
         String root = "./Images/name_pictures/";
-        return switch (color) {
-            case ARMY -> root + "HEER_IMAGE.png";
-            case NAVY -> root + "MARINE_IMAGE.png";
-            case CYBER -> root + "CIR_IMAGE.png";
-            case AIRFORCE -> root + "LW_IMAGE.png";
+        return switch(color){
+            case ARMY -> root+"HEER_IMAGE.png";
+            case NAVY -> root+"MARINE_IMAGE.png";
+            case CYBER -> root+"CIR_IMAGE.png";
+            case AIRFORCE -> root+"LW_IMAGE.png";
             default -> throw new RuntimeException("None is not valid");
         };
     }
 
-    /**
-     * Creates a Picture object to display a color image.
-     *
-     * @param color the color to create the image for
-     * @return a Picture object displaying the color image
-     */
     private Spatial createColor(Color color) {
         Picture pic = new Picture("HUD Picture");
         pic.setImage(assetManager, imagePath(color), true);
         pic.setWidth(IMAGE_SIZE);
         pic.setHeight(IMAGE_SIZE);
-        pic.setPosition(-pic.getWidth() / 2, -pic.getHeight() / 2);
+        pic.setPosition(-pic.getWidth()/2,-pic.getHeight()/2);
         return pic;
     }
 
-    /**
-     * Creates a BitmapText object to display a player's name.
-     *
-     * @param name the player's name
-     * @param first whether the player is the first in the list
-     * @param own whether the player is the current user
-     * @return a BitmapText object displaying the player's name
-     */
-    private BitmapText createName(String name, boolean first, boolean own) {
+
+
+    private Spatial createName(String name, boolean first, boolean own){
         BitmapText hudText = new BitmapText(playerFont);
         //renderedSize = 45
         hudText.setSize(TEXT_SIZE);
         hudText.setColor(first ? ACTIVE_COLOR : own ? OWN_COLOR : NORMAL_COLOR);
-        hudText.setText(own ? name + " (Du)" : name);
-        hudText.setLocalTranslation(PADDING_LEFT, hudText.getHeight() / 2, 0);
+        hudText.setText(name);
+        hudText.setLocalTranslation(PADDING_LEFT,hudText.getHeight()/2, 0);
         return hudText;
     }
 
-    /**
-     * Adds a player to the handler.
-     *
-     * @param color the color associated with the player
-     * @param name the name of the player
-     * @param own whether the player is the current user
-     */
-    public void addPlayer(Color color, String name, boolean own) {
-        if (own) ownColor = color;
+    public void addPlayer(Color color, String name, boolean own){
+        if(own) ownColor = color;
         colorNameMap.put(color, name);
         playerOrder.add(color);
         drawPlayers();
     }
 
-    /**
-     * Sets the active player.
-     *
-     * @param color the color associated with the active player
-     */
     public void setActivePlayer(Color color) {
-        if (playerOrder.get(0) == color) return;
-        Color oldFirst = playerOrder.remove(0);
+        Color lastFirst = playerOrder.remove(0);
         playerOrder.remove(color);
         playerOrder.add(0, color);
-        playerOrder.add(oldFirst);
+        playerOrder.add(lastFirst);
 
         drawPlayers();
     }
 
-    /**
-     * Gets the name of a player by their color.
-     *
-     * @param color the color associated with the player
-     * @return the name of the player
-     */
-    public String getName(Color color) {
-        if (!colorNameMap.containsKey(color)) throw new RuntimeException("color is not in colorNameMap");
+    public String getName(Color color){
+        if(!colorNameMap.containsKey(color)) throw new RuntimeException("color is not in colorNameMap");
         return colorNameMap.get(color);
     }
 
-    /**
-     * Adds a card to a player.
-     *
-     * @param color the color associated with the player
-     */
-    public void addCard(Color color) {
-        colorCardMap.put(color, colorCardMap.getOrDefault(color, 0) + 1);
-        drawPlayers();
-    }
 
-    /**
-     * Removes a card from a player.
-     *
-     * @param color the color associated with the player
-     */
-    public void removeCard(Color color) {
-        if (colorCardMap.containsKey(color)) {
-            colorCardMap.put(color, colorCardMap.getOrDefault(color, 0) - 1);
-            if (colorCardMap.get(color) <= 0) colorCardMap.remove(color);
-        }
-        drawPlayers();
-    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/outline/OutlineFilter.java

@@ -11,129 +11,69 @@
 import com.jme3.texture.FrameBuffer;
 
 
-/**
- * OutlineFilter is a custom filter for rendering outlines around objects.
- */
 public class OutlineFilter extends Filter {
 
-    private OutlinePreFilter outlinePreFilter;
-    private ColorRGBA outlineColor = new ColorRGBA(0, 1, 0, 1);
-    private float outlineWidth = 1;
+	private OutlinePreFilter outlinePreFilter;
+	private ColorRGBA outlineColor = new ColorRGBA(0, 1, 0, 1);
+	private float outlineWidth = 1;
 
-    /**
-     * Constructs an OutlineFilter with the specified OutlinePreFilter.
-     *
-     * @param outlinePreFilter the pre-filter used for outlining
-     */
-    public OutlineFilter(OutlinePreFilter outlinePreFilter) {
-        super("OutlineFilter");
-        this.outlinePreFilter = outlinePreFilter;
-    }
+	public OutlineFilter(OutlinePreFilter outlinePreFilter) {
+		super("OutlineFilter");
+		this.outlinePreFilter = outlinePreFilter;
+	}
 
-    /**
-     * Initializes the filter with the given parameters.
-     *
-     * @param assetManager the asset manager
-     * @param renderManager the render manager
-     * @param vp the viewport
-     * @param w the width of the viewport
-     * @param h the height of the viewport
-     */
-    @Override
-    protected void initFilter(AssetManager assetManager, RenderManager renderManager, ViewPort vp, int w, int h) {
-        MaterialDef matDef = (MaterialDef) assetManager.loadAsset("MatDefs/SelectObjectOutliner/Outline.j3md");
-        material = new Material(matDef);
-        material.setVector2("Resolution", new Vector2f(w, h));
-        material.setColor("OutlineColor", outlineColor);
-        material.setFloat("OutlineWidth", outlineWidth);
-    }
+	@Override
+	protected void initFilter(AssetManager assetManager, RenderManager renderManager, ViewPort vp, int w, int h) {
+		MaterialDef matDef = (MaterialDef) assetManager.loadAsset("MatDefs/SelectObjectOutliner/Outline.j3md");
+		material = new Material(matDef);
+		material.setVector2("Resolution", new Vector2f(w, h));
+		material.setColor("OutlineColor", outlineColor);
+		material.setFloat("OutlineWidth", outlineWidth);
+	}
 
-    /**
-     * Called before each frame is rendered.
-     *
-     * @param tpf time per frame
-     */
-    @Override
-    protected void preFrame(float tpf) {
-        super.preFrame(tpf);
-        material.setTexture("OutlineDepthTexture", outlinePreFilter.getOutlineTexture());
+	@Override
+	protected void preFrame(float tpf) {
+		super.preFrame(tpf);
+		material.setTexture("OutlineDepthTexture", outlinePreFilter.getOutlineTexture());
 //		System.out.println("OutlineFilter.preFrame()");
-    }
+	}
 
-    /**
-     * Called after each frame is rendered.
-     *
-     * @param renderManager the render manager
-     * @param viewPort the viewport
-     * @param prevFilterBuffer the previous filter buffer
-     * @param sceneBuffer the scene buffer
-     */
-    @Override
-    protected void postFrame(RenderManager renderManager, ViewPort viewPort, FrameBuffer prevFilterBuffer, FrameBuffer sceneBuffer) {
-        super.postFrame(renderManager, viewPort, prevFilterBuffer, sceneBuffer);
+	@Override
+	protected void postFrame(RenderManager renderManager, ViewPort viewPort, FrameBuffer prevFilterBuffer, FrameBuffer sceneBuffer) {
+		super.postFrame(renderManager, viewPort, prevFilterBuffer, sceneBuffer);
 //		material.setTexture("OutlineDepthTexture", outlinePreFilter.getDefaultPassDepthTexture());
 //		System.out.println("OutlineFilter.postFrame()");
-    }
+	}
 
-    /**
-     * Returns the material used by this filter.
-     *
-     * @return the material
-     */
-    @Override
-    protected Material getMaterial() {
-        return material;
-    }
+	@Override
+	protected Material getMaterial() {
+		return material;
+	}
 
-    /**
-     * Returns the outline color.
-     *
-     * @return the outline color
-     */
-    public ColorRGBA getOutlineColor() {
-        return outlineColor;
-    }
+	public ColorRGBA getOutlineColor() {
+		return outlineColor;
+	}
 
-    /**
-     * Sets the outline color.
-     *
-     * @param outlineColor the new outline color
-     */
-    public void setOutlineColor(ColorRGBA outlineColor) {
-        this.outlineColor = outlineColor;
-        if (material != null) {
-            material.setColor("OutlineColor", outlineColor);
-        }
-    }
+	public void setOutlineColor(ColorRGBA outlineColor) {
+		this.outlineColor = outlineColor;
+		if (material != null) {
+			material.setColor("OutlineColor", outlineColor);
+		}
+	}
 
-    /**
-     * Returns the outline width.
-     *
-     * @return the outline width
-     */
-    public float getOutlineWidth() {
-        return outlineWidth;
-    }
+	public float getOutlineWidth() {
+		return outlineWidth;
+	}
 
-    /**
-     * Sets the outline width.
-     *
-     * @param outlineWidth the new outline width
-     */
-    public void setOutlineWidth(float outlineWidth) {
-        this.outlineWidth = outlineWidth;
-        if (material != null) {
-            material.setFloat("OutlineWidth", outlineWidth);
-        }
-    }
+	public void setOutlineWidth(float outlineWidth) {
+		this.outlineWidth = outlineWidth;
+		if (material != null) {
+			material.setFloat("OutlineWidth", outlineWidth);
+		}
+	}
 
-    /**
-     * Returns the OutlinePreFilter used by this filter.
-     *
-     * @return the OutlinePreFilter
-     */
-    public OutlinePreFilter getOutlinePreFilter() {
-        return outlinePreFilter;
-    }
+	public OutlinePreFilter getOutlinePreFilter() {
+		return outlinePreFilter;
+	}
 
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/outline/OutlinePreFilter.java

@@ -12,100 +12,56 @@
 import com.jme3.texture.Texture;
 
 
-/**
- * OutlinePreFilter is a custom filter used to apply an outline effect to objects.
- */
 public class OutlinePreFilter extends Filter {
 
-    private Pass normalPass;
-    private RenderManager renderManager;
+	private Pass normalPass;
+	private RenderManager renderManager;
 
-    /**
-     * Creates an OutlinePreFilter.
-     */
-    public OutlinePreFilter() {
-        super("OutlinePreFilter");
-    }
+	/**
+	 * Creates a OutlinePreFilter
+	 */
+	public OutlinePreFilter() {
+		super("OutlinePreFilter");
+	}
 
-    /**
-     * Indicates that this filter requires a depth texture.
-     *
-     * @return true, indicating that a depth texture is required.
-     */
-    @Override
-    protected boolean isRequiresDepthTexture() {
-        return true;
-    }
+	@Override
+	protected boolean isRequiresDepthTexture() {
+		return true;
+	}
 
-    /**
-     * Called after the render queue is processed.
-     *
-     * @param queue the render queue.
-     */
-    @Override
-    protected void postQueue(RenderQueue queue) {
-        Renderer r = renderManager.getRenderer();
-        r.setFrameBuffer(normalPass.getRenderFrameBuffer());
-        renderManager.getRenderer().clearBuffers(true, true, false);
-    }
+	@Override
+	protected void postQueue(RenderQueue queue) {
+		Renderer r = renderManager.getRenderer();
+		r.setFrameBuffer(normalPass.getRenderFrameBuffer());
+		renderManager.getRenderer().clearBuffers(true, true, false);
+	}
 
-    /**
-     * Called after the frame is rendered.
-     *
-     * @param renderManager the render manager.
-     * @param viewPort the viewport.
-     * @param prevFilterBuffer the previous filter buffer.
-     * @param sceneBuffer the scene buffer.
-     */
-    @Override
-    protected void postFrame(RenderManager renderManager, ViewPort viewPort, FrameBuffer prevFilterBuffer, FrameBuffer sceneBuffer) {
-        super.postFrame(renderManager, viewPort, prevFilterBuffer, sceneBuffer);
-    }
+	@Override
+	protected void postFrame(RenderManager renderManager, ViewPort viewPort, FrameBuffer prevFilterBuffer, FrameBuffer sceneBuffer) {
+		super.postFrame(renderManager, viewPort, prevFilterBuffer, sceneBuffer);
 
-    /**
-     * Returns the material used by this filter.
-     *
-     * @return the material.
-     */
-    @Override
-    protected Material getMaterial() {
-        return material;
-    }
+	}
 
-    /**
-     * Returns the texture containing the outline.
-     *
-     * @return the outline texture.
-     */
-    public Texture getOutlineTexture() {
-        return normalPass.getRenderedTexture();
-    }
+	@Override
+	protected Material getMaterial() {
+		return material;
+	}
 
-    /**
-     * Initializes the filter.
-     *
-     * @param manager the asset manager.
-     * @param renderManager the render manager.
-     * @param vp the viewport.
-     * @param w the width.
-     * @param h the height.
-     */
-    @Override
-    protected void initFilter(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h) {
-        this.renderManager = renderManager;
-        normalPass = new Pass();
-        normalPass.init(renderManager.getRenderer(), w, h, Format.RGBA8, Format.Depth);
-        material = new Material(manager, "MatDefs/SelectObjectOutliner/OutlinePre.j3md");
-    }
+	public Texture getOutlineTexture() {
+		return normalPass.getRenderedTexture();
+	}
 
-    /**
-     * Cleans up the filter.
-     *
-     * @param r the renderer.
-     */
-    @Override
-    protected void cleanUpFilter(Renderer r) {
-        normalPass.cleanup(r);
-    }
+	@Override
+	protected void initFilter(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h) {
+		this.renderManager = renderManager;
+		normalPass = new Pass();
+		normalPass.init(renderManager.getRenderer(), w, h, Format.RGBA8, Format.Depth);
+		material = new Material(manager, "MatDefs/SelectObjectOutliner/OutlinePre.j3md");
+	}
+
+	@Override
+	protected void cleanUpFilter(Renderer r) {
+		normalPass.cleanup(r);
+	}
 
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/outline/OutlineProFilter.java

@@ -10,34 +10,17 @@
 import com.jme3.renderer.ViewPort;
 import com.jme3.texture.FrameBuffer;
 
-/**
- * OutlineProFilter is a custom filter for rendering outlines around objects.
- */
 public class OutlineProFilter extends Filter {
 
     private OutlinePreFilter outlinePreFilter;
     private ColorRGBA outlineColor = new ColorRGBA(0, 1, 0, 1);
     private float outlineWidth = 1;
 
-    /**
-     * Constructs an OutlineProFilter with the specified OutlinePreFilter.
-     *
-     * @param outlinePreFilter the pre-filter used for outlining
-     */
     public OutlineProFilter(OutlinePreFilter outlinePreFilter) {
         super("OutlineFilter");
         this.outlinePreFilter = outlinePreFilter;
     }
 
-    /**
-     * Initializes the filter with the given parameters.
-     *
-     * @param assetManager the asset manager
-     * @param renderManager the render manager
-     * @param vp the viewport
-     * @param w the width of the viewport
-     * @param h the height of the viewport
-     */
     @Override
     protected void initFilter(AssetManager assetManager, RenderManager renderManager, ViewPort vp, int w, int h) {
         MaterialDef matDef = (MaterialDef) assetManager.loadAsset("MatDefs/SelectObjectOutliner/OutlinePro.j3md");
@@ -47,54 +30,29 @@ protected void initFilter(AssetManager assetManager, RenderManager renderManager
         material.setFloat("OutlineWidth", outlineWidth);
     }
 
-    /**
-     * Called before rendering each frame.
-     *
-     * @param tpf time per frame
-     */
     @Override
     protected void preFrame(float tpf) {
         super.preFrame(tpf);
         material.setTexture("OutlineDepthTexture", outlinePreFilter.getOutlineTexture());
+//		System.out.println("OutlineFilter.preFrame()");
     }
 
-    /**
-     * Called after rendering each frame.
-     *
-     * @param renderManager the render manager
-     * @param viewPort the viewport
-     * @param prevFilterBuffer the previous filter buffer
-     * @param sceneBuffer the scene buffer
-     */
     @Override
     protected void postFrame(RenderManager renderManager, ViewPort viewPort, FrameBuffer prevFilterBuffer, FrameBuffer sceneBuffer) {
         super.postFrame(renderManager, viewPort, prevFilterBuffer, sceneBuffer);
+//		material.setTexture("OutlineDepthTexture", outlinePreFilter.getDefaultPassDepthTexture());
+//		System.out.println("OutlineFilter.postFrame()");
     }
 
-    /**
-     * Returns the material used by this filter.
-     *
-     * @return the material
-     */
     @Override
     protected Material getMaterial() {
         return material;
     }
 
-    /**
-     * Returns the outline color.
-     *
-     * @return the outline color
-     */
     public ColorRGBA getOutlineColor() {
         return outlineColor;
     }
 
-    /**
-     * Sets the outline color.
-     *
-     * @param outlineColor the new outline color
-     */
     public void setOutlineColor(ColorRGBA outlineColor) {
         this.outlineColor = outlineColor;
         if (material != null) {
@@ -102,20 +60,10 @@ public void setOutlineColor(ColorRGBA outlineColor) {
         }
     }
 
-    /**
-     * Returns the outline width.
-     *
-     * @return the outline width
-     */
     public float getOutlineWidth() {
         return outlineWidth;
     }
 
-    /**
-     * Sets the outline width.
-     *
-     * @param outlineWidth the new outline width
-     */
     public void setOutlineWidth(float outlineWidth) {
         this.outlineWidth = outlineWidth;
         if (material != null) {
@@ -123,13 +71,9 @@ public void setOutlineWidth(float outlineWidth) {
         }
     }
 
-    /**
-     * Returns the OutlinePreFilter.
-     *
-     * @return the OutlinePreFilter
-     */
     public OutlinePreFilter getOutlinePreFilter() {
         return outlinePreFilter;
     }
 
 }
+

Projekte/mdga/client/src/main/java/pp/mdga/client/outline/SelectObjectOutliner.java

@@ -9,113 +9,80 @@
 import com.jme3.scene.Spatial;
 import pp.mdga.client.MdgaApp;
 
-/**
- * This class is responsible for outlining selected objects in the scene.
- */
 public class SelectObjectOutliner {
 
     private final FilterPostProcessor fpp;
     private final RenderManager renderManager;
     private final AssetManager assetManager;
     private final Camera cam;
+    private final int width;
     private boolean selected;
     private ViewPort outlineViewport = null;
-    //    private OutlineFilter outlineFilter = null;
+//    private OutlineFilter outlineFilter = null;
     private OutlineProFilter outlineFilter = null;
     private final MdgaApp app;
 
-    /**
-     * Constructor for SelectObjectOutliner.
-     *
-     * @param fpp the FilterPostProcessor
-     * @param renderManager the RenderManager
-     * @param assetManager the AssetManager
-     * @param cam the Camera
-     * @param app the MdgaApp instance
-     */
-    public SelectObjectOutliner(FilterPostProcessor fpp, RenderManager renderManager, AssetManager assetManager, Camera cam, MdgaApp app) {
+    public SelectObjectOutliner(int width, FilterPostProcessor fpp, RenderManager renderManager, AssetManager assetManager, Camera cam, MdgaApp app) {
         this.selected = false;
         this.fpp = fpp;
         this.renderManager = renderManager;
         this.assetManager = assetManager;
         this.cam = cam;
+        this.width = width;
         this.app = app;
     }
 
-    /**
-     * Deselects the currently selected object, removing the outline effect.
-     *
-     * @param model the Spatial model to deselect
-     */
     public void deselect(Spatial model) {
-        if (selected) {
+        if(selected){
             selected = false;
             hideOutlineFilterEffect(model);
         }
     }
 
-//    /**
-//     * Selects an object and applies an outline effect.
-//     *
-//     * @param model the Spatial model to select
-//     * @param color the ColorRGBA for the outline
-//     */
-//    public void select(Spatial model, ColorRGBA color) {
-//        if (!selected) {
-//            selected = true;
-//            showOutlineFilterEffect(model, width, color);
-//        }
-//    }
-
-    /**
-     * Selects an object and applies an outline effect.
-     *
-     * @param model the Spatial model to select
-     * @param color the ColorRGBA for the outline
-     * @param width the width of the outline
-     */
-    public void select(Spatial model, ColorRGBA color, int width) {
-        if (!selected) {
+    public void select(Spatial model, ColorRGBA color) {
+        if(!selected){
             selected = true;
             showOutlineFilterEffect(model, width, color);
         }
     }
 
-    /**
-     * Hides the outline effect from the selected object.
-     *
-     * @param model the Spatial model to hide the outline effect from
-     */
-    private void hideOutlineFilterEffect(Spatial model) {
-        outlineFilter.setEnabled(false);
-        outlineFilter.getOutlinePreFilter().setEnabled(false);
-        fpp.removeFilter(outlineFilter);
-        outlineViewport.detachScene(model);
-        outlineViewport.clearProcessors();
-        renderManager.removePreView(outlineViewport);
-        outlineViewport = null;
+    public void select(Spatial model, ColorRGBA color, int width) {
+        if(!selected){
+            selected = true;
+            showOutlineFilterEffect(model, width, color);
+        }
+    }
+
+    private void hideOutlineFilterEffect(Spatial model) {
+//        app.enqueue(() -> {
+            outlineFilter.setEnabled(false);
+            outlineFilter.getOutlinePreFilter().setEnabled(false);
+            fpp.removeFilter(outlineFilter);
+            outlineViewport.detachScene(model);
+            outlineViewport.clearProcessors();
+            renderManager.removePreView(outlineViewport);
+            outlineViewport = null;
+//            return null;
+//        });
     }
 
-    /**
-     * Shows the outline effect on the selected object.
-     *
-     * @param model the Spatial model to show the outline effect on
-     * @param width the width of the outline
-     * @param color the ColorRGBA for the outline
-     */
     private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color) {
-        outlineViewport = renderManager.createPreView("outlineViewport", cam);
-        FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager);
+//        app.enqueue(() -> {
+            outlineViewport = renderManager.createPreView("outlineViewport", cam);
+            FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager);
 
-        OutlinePreFilter outlinePreFilter = new OutlinePreFilter();
-        outlineFpp.addFilter(outlinePreFilter);
-        outlineViewport.attachScene(model);
-        outlineViewport.addProcessor(outlineFpp);
+            OutlinePreFilter outlinePreFilter = new OutlinePreFilter();
+            outlineFpp.addFilter(outlinePreFilter);
 
-        outlineFilter = new OutlineProFilter(outlinePreFilter);
-        outlineFilter.setOutlineColor(color);
-        outlineFilter.setOutlineWidth(width);
+            outlineViewport.attachScene(model);
+            outlineViewport.addProcessor(outlineFpp);
 
-        fpp.addFilter(outlineFilter);
+            outlineFilter = new OutlineProFilter(outlinePreFilter);
+            outlineFilter.setOutlineColor(color);
+            outlineFilter.setOutlineWidth(width);
+
+            fpp.addFilter(outlineFilter);
+//            return null;
+//        });
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java

@@ -3,9 +3,7 @@
 import com.jme3.network.*;
 import com.jme3.network.serializing.Serializer;
 import com.jme3.network.serializing.serializers.EnumSerializer;
-import pp.mdga.Resources;
 import pp.mdga.game.*;
-import pp.mdga.game.card.*;
 import pp.mdga.message.client.*;
 import pp.mdga.message.server.*;
 import pp.mdga.server.ServerGameLogic;
@@ -15,9 +13,6 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -34,7 +29,6 @@ public class MdgaServer implements MessageListener<HostedConnection>, Connection
     private static int port;
     private final ServerGameLogic logic;
     private final BlockingQueue<ReceivedMessage> pendingMessages = new LinkedBlockingQueue<>();
-    private volatile boolean running = true;
 
     static {
         // Configure logging
@@ -59,23 +53,21 @@ public MdgaServer(int port) {
     }
 
     /**
-     * Main method to start the server.
+     *
      */
     public void run() {
         startServer();
-        while (running) {
+        while (true)
             processNextMessage();
-        }
-        shutdownServerResources();
     }
 
     /**
-     * Starts the server and initializes listeners.
+     *
      */
     private void startServer() {
         try {
-            LOGGER.log(Level.INFO, "Starting server...");
-            unlockSerializers();//NON-NLS
+            LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
+
             myServer = Network.createServer(port);
             initializeSerializables();
             myServer.start();
@@ -83,28 +75,20 @@ private void startServer() {
             LOGGER.log(Level.INFO, "Server started: {0}", myServer.isRunning()); //NON-NLS
         } catch (IOException e) {
             LOGGER.log(Level.ERROR, "Couldn't start server: {0}", e.getMessage()); //NON-NLS
-            exit();
+            exit(1);
         }
     }
 
-    /**
-     * Process the next message in the queue.
-     */
     private void processNextMessage() {
         try {
-            ReceivedMessage message = pendingMessages.take(); // This is a blocking call
-            message.process(logic);
+            pendingMessages.take().process(logic);
         } catch (InterruptedException ex) {
-            LOGGER.log(Level.INFO, "Server thread interrupted, shutting down..."); //NON-NLS
+            LOGGER.log(Level.INFO, "Interrupted while waiting for messages"); //NON-NLS
             Thread.currentThread().interrupt();
         }
     }
 
-    /**
-     * Register serializable classes.
-     */
     private void initializeSerializables() {
-
         Serializer.registerClass(UUID.class, new UUIDSerializer());
         Serializer.registerClass(AnimationEndMessage.class);
         Serializer.registerClass(ClientStartGameMessage.class);
@@ -122,7 +106,6 @@ private void initializeSerializables() {
         Serializer.registerClass(RequestPlayCardMessage.class);
         Serializer.registerClass(SelectCardMessage.class);
         Serializer.registerClass(SelectedPiecesMessage.class);
-        Serializer.registerClass(SelectPieceMessage.class);
         Serializer.registerClass(SelectTSKMessage.class);
         Serializer.registerClass(ActivePlayerMessage.class);
         Serializer.registerClass(AnyPieceMessage.class);
@@ -140,7 +123,7 @@ private void initializeSerializables() {
         Serializer.registerClass(NoTurnMessage.class);
         Serializer.registerClass(PauseGameMessage.class);
         Serializer.registerClass(PlayCardMessage.class);
-        Serializer.registerClass(PossibleCardsMessage.class);
+        Serializer.registerClass(PossibleCardMessage.class);
         Serializer.registerClass(PossiblePieceMessage.class);
         Serializer.registerClass(RankingResponseMessage.class);
         Serializer.registerClass(RankingRollAgainMessage.class);
@@ -152,8 +135,6 @@ private void initializeSerializables() {
         Serializer.registerClass(UpdateReadyMessage.class);
         Serializer.registerClass(UpdateTSKMessage.class);
         Serializer.registerClass(WaitPieceMessage.class);
-        Serializer.registerClass(IncorrectRequestMessage.class);
-        Serializer.registerClass(SpectatorMessage.class);
         Serializer.registerClass(Player.class);
         Serializer.registerClass(Statistic.class);
         Serializer.registerClass(Board.class);
@@ -161,24 +142,12 @@ private void initializeSerializables() {
         Serializer.registerClass(Piece.class);
         Serializer.registerClass(BonusNode.class);
         Serializer.registerClass(StartNode.class);
+        Serializer.registerClass(PlayerData.class);
         Serializer.registerClass(HomeNode.class);
-        Serializer.registerClass(PowerCard.class);
-        Serializer.registerClass(TurboCard.class);
-        Serializer.registerClass(SwapCard.class);
-        Serializer.registerClass(ShieldCard.class);
-        Serializer.registerClass(HiddenCard.class);
-        Serializer.registerClass(ChoosePieceStateMessage.class);
-        Serializer.registerClass(DrawCardMessage.class);
-
-        Serializer.registerClass(Color.class, new EnumSerializer());
-        Serializer.registerClass(PieceState.class, new EnumSerializer());
-        Serializer.registerClass(ShieldState.class, new EnumSerializer());
-        Serializer.registerClass(BonusCard.class, new EnumSerializer());
+        Serializer.registerClass(PlayerDataMessage.class);
+        Serializer.registerClass(StartBriefingMessage.class);
     }
 
-    /**
-     * Register listeners for the server.
-     */
     private void registerListeners() {
         myServer.addMessageListener(this, AnimationEndMessage.class);
         myServer.addMessageListener(this, ClientStartGameMessage.class);
@@ -225,35 +194,16 @@ public void messageReceived(HostedConnection source, Message message) {
      * @param message as the received message as a Message object.
      */
     private void messageReceived(HostedConnection source, ClientMessage message) {
-        System.out.println("server received from: " + source.getId() + " " + message.getClass().getName());
+        LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
         pendingMessages.add(new ReceivedMessage(message, source.getId()));
     }
 
-    /**
-     * This method will be used to handle all connections which are connected to the server.
-     * It will check if the maximum number of connected clients are already reached. If yes it will send a
-     * LobbyDenyMessage to the given hostedConnection parameter and close it, otherwise it will send a
-     * LobbyAcceptMessage to the given hostedConnection parameter. In Addition, if the number of connected clients is
-     * equal to 1 it will set the host of the game to the id of the given hostedConnection parameter.
-     *
-     * @param server           as the server which is contains all connections as a Server object.
-     * @param hostedConnection as the connection which is added to the server as a HostedConnection object.
-     */
     @Override
     public void connectionAdded(Server server, HostedConnection hostedConnection) {
         System.out.println("new connection " + hostedConnection); //NON-NLS
         LOGGER.log(Level.DEBUG, "new connection {0}", hostedConnection); //NON-NLS
-
-        if (this.myServer.getConnections().size() > Resources.MAX_PLAYERS) {
-            this.logic.getServerSender().send(hostedConnection.getId(), new LobbyDenyMessage());
-            hostedConnection.close("");
-        } else {
-            if (hostedConnection.getAddress().contains("127.0.0.1") && this.logic.getGame().getHost() == -1) {
-                this.logic.getGame().setHost(hostedConnection.getId());
-                this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage(hostedConnection.getId()));
-            } else {
-                this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage());
-            }
+        if (this.myServer.getConnections().size() == 1) {
+            this.logic.getGame().setHost(hostedConnection.getId());
         }
     }
 
@@ -279,12 +229,12 @@ public void handleDisconnect(int id) {
         this.logic.received(new DisconnectedMessage(), id);
     }
 
-    /**
-     * Stops the server thread gracefully.
-     */
-    public void exit() {
-        LOGGER.log(Level.INFO, "Requesting server shutdown"); //NON-NLS
-        running = false;
+    public void exit(int exitValue) { //NON-NLS
+        LOGGER.log(Level.INFO, "close request"); //NON-NLS
+        if (myServer != null)
+            for (HostedConnection client : myServer.getConnections()) //NON-NLS
+                if (client != null) client.close("Game over"); //NON-NLS
+        System.exit(exitValue);
     }
 
     /**
@@ -300,10 +250,10 @@ public void send(int id, ServerMessage message) {
             return;
         }
         final HostedConnection connection = myServer.getConnection(id);
-        if (connection != null) {
-            System.out.println("server sends to: " + id + " " + message.getClass().getName());
+        if (connection != null)
             connection.send(message);
-        } else LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS
+        else
+            LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS
     }
 
     /**
@@ -326,47 +276,6 @@ public void broadcast(ServerMessage message) {
      */
     @Override
     public void disconnectClient(int id) {
-        if (myServer.getConnection(id) != null) {
-            this.myServer.getConnection(id).close("");
-        } else {
-            LOGGER.log(Level.ERROR, "no connection with id={0}", id); //NON-NLS
-        }
-    }
-
-    /**
-     * This method will be used to shut down the server.
-     * It will iterate threw all connections of myServer attribute and check if they are equal to null. If not they will
-     * be closed. After that the myServer attribute will be closed and this program will be exited with the exit code 0.
-     */
-    @Override
-    public void shutdown() {
-        this.exit();
-    }
-
-    /**
-     * Gracefully shutdown server resources like connections and sockets.
-     */
-    private void shutdownServerResources() {
-        LOGGER.log(Level.INFO, "Shutting down server resources"); //NON-NLS
-        if (myServer != null && myServer.isRunning()) {
-            for (HostedConnection client : myServer.getConnections()) {
-                if (client != null) client.close("Server shutting down.");
-            }
-            myServer.close();
-        }
-    }
-
-    /**
-     * This method will be used to unlock the Serializer registry.
-     */
-    private static void unlockSerializers() {
-        try {
-            Field lockField = Serializer.class.getDeclaredField("locked");
-            lockField.setAccessible(true);
-            lockField.setBoolean(null, false); // Unlock the Serializer registry
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            System.err.println("Failed to unlock the Serializer registry: " + e.getMessage());
-            e.printStackTrace();
-        }
+        this.myServer.getConnection(id).close("");
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/server/ReceivedMessage.java

@@ -3,16 +3,7 @@
 import pp.mdga.message.client.ClientInterpreter;
 import pp.mdga.message.client.ClientMessage;
 
-/**
- * Represents a message received from the server.
- */
 public record ReceivedMessage(ClientMessage msg, int from) {
-
-    /**
-     * Processes the received message using the specified client interpreter.
-     *
-     * @param interpreter the client interpreter to use for processing the message
-     */
     void process(ClientInterpreter interpreter) {
         msg.accept(interpreter, from);
     }

Projekte/mdga/client/src/main/java/pp/mdga/client/server/UUIDSerializer.java

@@ -1,52 +1,26 @@
 package pp.mdga.client.server;
 
-import com.jme3.network.serializing.Serializer;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
-/**
- * Serializer for UUID objects to be used with jME3 networking.
- */
-public class UUIDSerializer extends Serializer {
+import com.jme3.network.serializing.Serializer;
 
-    /**
-     * Reads a UUID object from the given ByteBuffer.
-     *
-     * @param data the ByteBuffer containing the serialized UUID
-     * @param c the class type of the object to be read
-     * @param <T> the type of the object to be read
-     * @return the deserialized UUID object, or null if the UUID is a placeholder
-     * @throws IOException if an I/O error occurs
-     */
+public class UUIDSerializer extends Serializer
+{
     @Override
-    public <T> T readObject(ByteBuffer data, Class<T> c) throws IOException {
-        byte[] uuid = new byte[36];
-        data.get(uuid);
+    public <T> T readObject(ByteBuffer data, Class<T> c) throws IOException
+{
+    byte[] uuid = new byte[36];
+    data.get(uuid);
 
-        if (uuid.equals(new UUID(1, 1))) {
-            return null;
-        } else {
-            return (T) UUID.fromString(new String(uuid));
-        }
-    }
+    return (T) UUID.fromString(new String(uuid));
+}
 
-    /**
-     * Writes a UUID object to the given ByteBuffer.
-     *
-     * @param buffer the ByteBuffer to write the serialized UUID to
-     * @param object the UUID object to be serialized
-     * @throws IOException if an I/O error occurs
-     */
     @Override
-    public void writeObject(ByteBuffer buffer, Object object) throws IOException {
+    public void writeObject(ByteBuffer buffer, Object object) throws IOException
+    {
         UUID uuid = (UUID) object;
-
-        if (uuid != null) {
-            buffer.put(uuid.toString().getBytes());
-        } else {
-            buffer.put(new UUID(1, 1).toString().getBytes());
-        }
+        buffer.put(uuid.toString().getBytes());
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java

@@ -19,13 +19,7 @@
 
 import java.util.ArrayList;
 
-/**
- * CeremonyView class handles the display and interaction of the ceremony view in the application.
- */
 public class CeremonyView extends MdgaView {
-    /**
-     * Enum representing the sub-states of the CeremonyView.
-     */
     private enum SubState {
         AWARD_CEREMONY,
         STATISTICS,
@@ -45,11 +39,6 @@ private enum SubState {
 
     private AmbientLight ambient = new AmbientLight();
 
-    /**
-     * Constructor for CeremonyView.
-     *
-     * @param app The application instance.
-     */
     public CeremonyView(MdgaApp app) {
         super(app);
 
@@ -63,9 +52,6 @@ public CeremonyView(MdgaApp app) {
         ambient.setColor(new ColorRGBA(0.3f, 0.3f, 0.3f, 1));
     }
 
-    /**
-     * Method called when entering the CeremonyView.
-     */
     @Override
     public void onEnter() {
         rootNode.addLight(ambient);
@@ -112,15 +98,12 @@ public void onEnter() {
         enterSub(SubState.AWARD_CEREMONY);
     }
 
-    /**
-     * Method called when leaving the CeremonyView.
-     */
     @Override
     public void onLeave() {
         backButton.hide();
         continueButton.hide();
 
-        if (null != background) {
+        if(null != background) {
             guiNode.detachChild(background);
         }
 
@@ -133,33 +116,18 @@ public void onLeave() {
         rootNode.detachChild(background);
     }
 
-    /**
-     * Method called when entering an overlay.
-     *
-     * @param overlay The overlay being entered.
-     */
     @Override
     protected void onEnterOverlay(Overlay overlay) {
-        if (rootNode.hasChild(podest)) {
+        if(rootNode.hasChild(podest)) {
             rootNode.detachChild(podest);
         }
     }
 
-    /**
-     * Method called when leaving an overlay.
-     *
-     * @param overlay The overlay being left.
-     */
     @Override
     protected void onLeaveOverlay(Overlay overlay) {
         enterSub(state);
     }
 
-    /**
-     * Method called to update the CeremonyView.
-     *
-     * @param tpf Time per frame.
-     */
     @Override
     protected void onUpdate(float tpf) {
         for (CeremonyButton c : ceremonyButtons) {
@@ -167,9 +135,6 @@ protected void onUpdate(float tpf) {
         }
     }
 
-    /**
-     * Handles the award ceremony sub-state.
-     */
     private void awardCeremony() {
         continueButton.show();
 
@@ -180,9 +145,6 @@ private void awardCeremony() {
         }
     }
 
-    /**
-     * Handles the statistics sub-state.
-     */
     private void statistics() {
         //background = createBackground("Images/b2.png");
         //guiNode.attachChild(background);
@@ -192,15 +154,10 @@ private void statistics() {
         ceremonyDialog.show();
     }
 
-    /**
-     * Enters a sub-state of the CeremonyView.
-     *
-     * @param state The sub-state to enter.
-     */
     private void enterSub(SubState state) {
         this.state = state;
 
-        if (rootNode.hasChild(podest)) {
+        if(rootNode.hasChild(podest)) {
             rootNode.detachChild(podest);
         }
 
@@ -221,23 +178,17 @@ private void enterSub(SubState state) {
         }
     }
 
-    /**
-     * Handles the forward button action.
-     */
     public void forward() {
         switch (state) {
             case AWARD_CEREMONY:
                 enterSub(SubState.STATISTICS);
                 break;
             case STATISTICS:
-                app.getModelSynchronize().next();
+                app.getModelSynchronize().enter(MdgaState.MAIN);
                 break;
         }
     }
 
-    /**
-     * Handles the back button action.
-     */
     private void back() {
         switch (state) {
             case AWARD_CEREMONY:
@@ -249,46 +200,17 @@ private void back() {
         }
     }
 
-    /**
-     * Adds a participant to the ceremony.
-     *
-     * @param color The color of the participant.
-     * @param pos The position of the participant.
-     * @param name The name of the participant.
-     */
     public void addCeremonyParticipant(Color color, int pos, String name) {
         CeremonyButton button = new CeremonyButton(app, guiNode, rootNode, color, CeremonyButton.Pos.values()[pos - 1], name);
 
         ceremonyButtons.add(button);
 
-        if (state != null && state.equals(SubState.AWARD_CEREMONY)) {
-            button.hide();
+        if(state.equals(SubState.AWARD_CEREMONY)) {
             button.show();
         }
     }
 
-    /**
-     * Adds a row of statistics.
-     *
-     * @param name The name of the row.
-     * @param v1 Value 1.
-     * @param v2 Value 2.
-     * @param v3 Value 3.
-     * @param v4 Value 4.
-     * @param v5 Value 5.
-     * @param v6 Value 6.
-     */
     public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) {
         ceremonyDialog.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
-
-        ceremonyDialog.hide();
-        ceremonyDialog.show();
-    }
-
-    /**
-     * Cleans up after the game.
-     */
-    public void afterGameCleanup() {
-        ceremonyDialog.prepare();
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java

@@ -1,71 +1,62 @@
 package pp.mdga.client.view;
 
 import com.jme3.post.FilterPostProcessor;
-import com.jme3.scene.Node;
-import pp.mdga.client.MdgaApp;
+import pp.mdga.client.MdgaState;
 import pp.mdga.client.acoustic.MdgaSound;
 import pp.mdga.client.board.BoardHandler;
 import pp.mdga.client.board.CameraHandler;
+import pp.mdga.client.MdgaApp;
 import pp.mdga.client.button.ButtonLeft;
 import pp.mdga.client.button.ButtonRight;
-import pp.mdga.client.dialog.InterruptDialog;
 import pp.mdga.client.gui.GuiHandler;
+import pp.mdga.game.BonusCard;
 import pp.mdga.game.Color;
+import pp.mdga.notification.AcquireCardNotification;
+import pp.mdga.notification.ActivePlayerNotification;
+import pp.mdga.notification.DiceNowNotification;
+import pp.mdga.notification.GameNotification;
+import pp.mdga.notification.MovePieceNotification;
+import pp.mdga.notification.PlayerInGameNotification;
+import pp.mdga.notification.RollDiceNotification;
+import pp.mdga.notification.SelectableCardsNotification;
+import pp.mdga.notification.SelectableMoveNotification;
+import pp.mdga.notification.SelectableSwapNotification;
+import pp.mdga.notification.ShieldActiveNotification;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
-/**
- * Represents the view for the game.
- */
 public class GameView extends MdgaView {
     private BoardHandler boardHandler;
     private CameraHandler camera;
     private GuiHandler guiHandler;
 
     private ButtonLeft leaveButton;
-    public ButtonRight confirmButton;
-
-    private ButtonRight noPowerButton;
+    private ButtonRight confirmButton;
 
     private Color ownColor = null;
 
-    private InterruptDialog interruptDialog;
-
     private FilterPostProcessor fpp;
 
-    public boolean needConfirm = false;
-    public boolean needNoPower = false;
-
-    private Node guiHandlerNode = new Node();
-
-    /**
-     * Constructs a new GameView.
-     *
-     * @param app the application instance
-     */
     public GameView(MdgaApp app) {
         super(app);
 
-        leaveButton = new ButtonLeft(app, settingsNode, () -> app.getModelSynchronize().leave(), "Spiel verlassen", 1);
+        leaveButton = new ButtonLeft(app, overlayNode, () -> app.getModelSynchronize().leave(), "Spiel verlassen", 1);
 
         confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1);
 
-        noPowerButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Verzichten", 1);
-
-        interruptDialog = new InterruptDialog(app, guiNode);
-
         fpp = new FilterPostProcessor(app.getAssetManager());
         this.camera = new CameraHandler(app, fpp);
         this.boardHandler = new BoardHandler(app, rootNode, fpp);
 
-        guiHandler = new GuiHandler(app, guiHandlerNode);
+        guiHandler = new GuiHandler(app, guiNode);
 
-        guiNode.attachChild(guiHandlerNode);
     }
 
-    /**
-     * Called when entering the view.
-     */
     @Override
     public void onEnter() {
+        setOwnColor(Color.AIRFORCE);
         camera.init(ownColor);
         boardHandler.init();
         guiHandler.init(ownColor);
@@ -73,167 +64,71 @@ public void onEnter() {
         app.getViewPort().addProcessor(fpp);
 
         app.getAcousticHandler().playSound(MdgaSound.START);
+
+//        guiHandler.addPlayer(Color.AIRFORCE, "Cedric");
+//        guiHandler.addPlayer(Color.ARMY, "Ben");
+//        guiHandler.addPlayer(Color.CYBER, "Felix");
+//        guiHandler.addPlayer(Color.NAVY, "Daniel");
+
+
     }
 
-    /**
-     * Called when leaving the view.
-     */
     @Override
     public void onLeave() {
         boardHandler.shutdown();
         guiHandler.shutdown();
         camera.shutdown();
 
+
         confirmButton.hide();
-        noPowerButton.hide();
 
         app.getViewPort().removeProcessor(fpp);
     }
 
-    /**
-     * Called to update the view.
-     *
-     * @param tpf time per frame
-     */
     @Override
     public void onUpdate(float tpf) {
         camera.update(app.getInputSynchronize().getScroll(), app.getInputSynchronize().getRotation());
     }
 
-    /**
-     * Called when entering an overlay.
-     *
-     * @param overlay the overlay being entered
-     */
     @Override
     protected void onEnterOverlay(Overlay overlay) {
-        if (overlay == Overlay.SETTINGS) {
+        if(overlay == Overlay.SETTINGS) {
             leaveButton.show();
         }
     }
 
-    /**
-     * Called when leaving an overlay.
-     *
-     * @param overlay the overlay being left
-     */
     @Override
     protected void onLeaveOverlay(Overlay overlay) {
-        if (overlay == Overlay.SETTINGS) {
+        if(overlay == Overlay.SETTINGS) {
             leaveButton.hide();
         }
     }
 
-    /**
-     * Leaves the game.
-     */
     private void leaveGame() {
         app.getModelSynchronize().leave();
     }
 
-    /**
-     * Gets the board handler.
-     *
-     * @return the board handler
-     */
     public BoardHandler getBoardHandler() {
-        return boardHandler;
+        return  boardHandler;
     }
 
-    /**
-     * Gets the GUI handler.
-     *
-     * @return the GUI handler
-     */
     public GuiHandler getGuiHandler() {
         return guiHandler;
     }
 
-    /**
-     * Sets the player's color.
-     *
-     * @param ownColor the player's color
-     */
     public void setOwnColor(Color ownColor) {
         this.ownColor = ownColor;
     }
 
-    /**
-     * Gets the player's color.
-     *
-     * @return the player's color
-     */
     public Color getOwnColor() {
         return ownColor;
     }
 
-    /**
-     * Shows the confirm button and hides the no power button.
-     */
     public void needConfirm() {
-        noPowerButton.hide();
         confirmButton.show();
-
-        needConfirm = true;
     }
 
-    /**
-     * Hides the confirm button.
-     */
     public void noConfirm() {
         confirmButton.hide();
-
-        needConfirm = false;
-    }
-
-    /**
-     * Shows the no power button and hides the confirm button.
-     */
-    public void showNoPower() {
-        confirmButton.hide();
-        noPowerButton.show();
-
-        needNoPower = true;
-    }
-
-    /**
-     * Hides the no power button.
-     */
-    public void hideNoPower() {
-        noPowerButton.hide();
-        needNoPower = false;
-    }
-
-    /**
-     * Enters the interrupt state with the specified color.
-     *
-     * @param color the color to set
-     */
-    public void enterInterrupt(Color color) {
-        enterOverlay(Overlay.INTERRUPT);
-
-        guiNode.detachChild(guiHandlerNode);
-        app.getGuiNode().attachChild(guiNode);
-
-        app.getInputSynchronize().setClickAllowed(false);
-
-        interruptDialog.setColor(color);
-        interruptDialog.show();
-    }
-
-    /**
-     * Leaves the interrupt state.
-     */
-    public void leaveInterrupt() {
-        leaveOverlay(Overlay.INTERRUPT);
-
-        app.getGuiNode().detachChild(guiNode);
-        guiNode.attachChild(guiHandlerNode);
-
-        app.getInputSynchronize().setClickAllowed(true);
-
-        app.getAcousticHandler().playSound(MdgaSound.START);
-
-        interruptDialog.hide();
     }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java

@@ -5,25 +5,26 @@
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
+import com.jme3.renderer.Camera;
 import com.jme3.scene.Geometry;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
+import com.jme3.util.SkyFactory;
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.acoustic.MdgaSound;
 import pp.mdga.client.button.ButtonLeft;
 import pp.mdga.client.button.ButtonRight;
 import pp.mdga.client.button.LobbyButton;
+import pp.mdga.client.button.SettingsButton;
 import pp.mdga.game.Color;
+import pp.mdga.notification.GameNotification;
 
-/**
- * Represents the lobby view in the game.
- */
 public class LobbyView extends MdgaView {
     private Geometry background;
 
     private ButtonLeft leaveButton;
     private ButtonRight readyButton;
-    private ButtonRight startButton;
 
     private LobbyButton cyberButton;
     private LobbyButton airforceButton;
@@ -36,17 +37,11 @@ public class LobbyView extends MdgaView {
 
     private Color own = null;
 
-    /**
-     * Constructs a new LobbyView.
-     *
-     * @param app the application instance
-     */
     public LobbyView(MdgaApp app) {
         super(app);
 
         leaveButton = new ButtonLeft(app, guiNode, this::leaveLobby, "Verlassen", 1);
         readyButton = new ButtonRight(app, guiNode, this::ready, "Bereit", 1);
-        startButton = new ButtonRight(app, guiNode, () -> app.getGameLogic().selectStart(), "Starten", 7);
 
         cyberButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.CYBER), Color.CYBER);
         airforceButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.AIRFORCE), Color.AIRFORCE);
@@ -56,9 +51,6 @@ public LobbyView(MdgaApp app) {
         ambient.setColor(new ColorRGBA(0.3f, 0.3f, 0.3f, 1));
     }
 
-    /**
-     * Called when entering the lobby view.
-     */
     @Override
     public void onEnter() {
         app.getCamera().setParallelProjection(true);
@@ -69,10 +61,6 @@ public void onEnter() {
         leaveButton.show();
         readyButton.show();
 
-        if (app.getGameLogic().isHost()) {
-            startButton.show();
-        }
-
         cyberButton.show();
         airforceButton.show();
         armyButton.show();
@@ -103,14 +91,10 @@ public void onEnter() {
         rootNode.attachChild(background);
     }
 
-    /**
-     * Called when leaving the lobby view.
-     */
     @Override
     public void onLeave() {
         leaveButton.hide();
         readyButton.hide();
-        startButton.hide();
 
         airforceButton.hide();
         armyButton.hide();
@@ -122,10 +106,10 @@ public void onLeave() {
         app.getCamera().setParallelProjection(false);
 
         app.getCamera().setFrustumPerspective(
-                45.0f,
-                (float) app.getCamera().getWidth() / app.getCamera().getHeight(),
-                0.1f,
-                1000.0f
+            45.0f,
+            (float) app.getCamera().getWidth() / app.getCamera().getHeight(),
+            0.1f,
+            1000.0f
         );
 
         app.getCamera().setLocation(new Vector3f(0, 0, 10));
@@ -144,11 +128,6 @@ public void onLeave() {
         rootNode.detachChild(background);
     }
 
-    /**
-     * Called on each frame update.
-     *
-     * @param tpf time per frame
-     */
     @Override
     protected void onUpdate(float tpf) {
         airforceButton.update(tpf);
@@ -159,34 +138,27 @@ protected void onUpdate(float tpf) {
 
     @Override
     protected void onEnterOverlay(Overlay overlay) {
-        // No implementation needed
+
     }
 
     @Override
-    protected void onLeaveOverlay(Overlay overlay) {
-        // No implementation needed
+    protected void onLeaveOverlay(Overlay overlay)
+    {
+
     }
 
-    /**
-     * Sets the taken status of a color.
-     *
-     * @param color the color
-     * @param isTaken whether the color is taken
-     * @param isSelf whether the color is taken by the player
-     * @param name the name of the player who took the color
-     */
     public void setTaken(Color color, boolean isTaken, boolean isSelf, String name) {
         LobbyButton.Taken taken;
 
-        if (isTaken) {
-            if (isSelf) {
+        if(isTaken) {
+            if(isSelf) {
                 own = color;
                 taken = LobbyButton.Taken.SELF;
             } else {
                 taken = LobbyButton.Taken.OTHER;
             }
         } else {
-            if (isSelf) {
+            if(isSelf) {
                 own = null;
             }
 
@@ -209,12 +181,6 @@ public void setTaken(Color color, boolean isTaken, boolean isSelf, String name)
         }
     }
 
-    /**
-     * Sets the ready status of a color.
-     *
-     * @param color the color
-     * @param isReady whether the color is ready
-     */
     public void setReady(Color color, boolean isReady) {
         LobbyButton button = switch (color) {
             case CYBER -> cyberButton;
@@ -230,20 +196,15 @@ public void setReady(Color color, boolean isReady) {
             this.isReady = isReady;
         }
 
-        if (!isReady) {
+        if(!isReady) {
             app.getAcousticHandler().playSound(MdgaSound.NOT_READY);
         } else {
-            if (button.getTaken() != LobbyButton.Taken.SELF) {
+            if(button.getTaken() != LobbyButton.Taken.SELF) {
                 app.getAcousticHandler().playSound(MdgaSound.OTHER_READY);
             }
         }
     }
 
-    /**
-     * Toggles the task selection for a color.
-     *
-     * @param color the color
-     */
     private void toggleTsk(Color color) {
         LobbyButton.Taken taken = LobbyButton.Taken.NOT;
 
@@ -262,10 +223,6 @@ private void toggleTsk(Color color) {
                 break;
         }
 
-        if (isReady) {
-            setReady(own, false);
-        }
-
         switch (taken) {
             case NOT:
                 app.getModelSynchronize().selectTsk(color);
@@ -279,25 +236,19 @@ private void toggleTsk(Color color) {
         }
     }
 
-    /**
-     * Sets the player as ready.
-     */
     public void ready() {
-        if (own == null) {
+        if(own == null) {
             app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
             return;
         }
 
-        if (!isReady) {
+        if(!isReady) {
             app.getAcousticHandler().playSound(MdgaSound.SELF_READY);
         }
 
         app.getModelSynchronize().setReady(!isReady);
     }
 
-    /**
-     * Leaves the lobby.
-     */
     private void leaveLobby() {
         app.getModelSynchronize().leave();
     }

Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java

@@ -7,13 +7,10 @@
 import pp.mdga.client.dialog.JoinDialog;
 import pp.mdga.client.dialog.StartDialog;
 
-/**
- * MainView class that extends MdgaView and manages the main view of the application.
- */
+import java.net.Inet4Address;
+import java.net.UnknownHostException;
+
 public class MainView extends MdgaView {
-    /**
-     * Enum representing the different sub-states of the MainView.
-     */
     private enum SubState {
         HOST,
         JOIN,
@@ -28,11 +25,6 @@ private enum SubState {
     private JoinDialog joinDialog;
     private HostDialog hostDialog;
 
-    /**
-     * Constructor for MainView.
-     *
-     * @param app the MdgaApp instance
-     */
     public MainView(MdgaApp app) {
         super(app);
 
@@ -43,9 +35,6 @@ public MainView(MdgaApp app) {
         background = createBackground("Images/startmenu.png");
     }
 
-    /**
-     * Called when the view is entered.
-     */
     @Override
     public void onEnter() {
         app.setup();
@@ -55,9 +44,6 @@ public void onEnter() {
         enterSub(SubState.MAIN);
     }
 
-    /**
-     * Called when the view is left.
-     */
     @Override
     public void onLeave() {
         startDialog.hide();
@@ -67,11 +53,6 @@ public void onLeave() {
         guiNode.detachChild(background);
     }
 
-    /**
-     * Called to update the view.
-     *
-     * @param tpf time per frame
-     */
     @Override
     public void onUpdate(float tpf) {
         startDialog.update();
@@ -79,31 +60,18 @@ public void onUpdate(float tpf) {
         hostDialog.update();
     }
 
-    /**
-     * Called when an overlay is entered.
-     *
-     * @param overlay the overlay being entered
-     */
     @Override
     protected void onEnterOverlay(Overlay overlay) {
         guiNode.detachChild(background);
-        settingsNode.attachChild(background);
+        overlayNode.attachChild(background);
     }
 
-    /**
-     * Called when an overlay is left.
-     *
-     * @param overlay the overlay being left
-     */
     @Override
     protected void onLeaveOverlay(Overlay overlay) {
-        settingsNode.detachChild(background);
+        overlayNode.detachChild(background);
         guiNode.attachChild(background);
     }
 
-    /**
-     * Shows the join menu.
-     */
     private void joinMenu() {
         startDialog.hide();
         hostDialog.hide();
@@ -111,9 +79,6 @@ private void joinMenu() {
         joinDialog.show();
     }
 
-    /**
-     * Shows the host menu.
-     */
     private void hostMenu() {
         startDialog.hide();
         joinDialog.hide();
@@ -121,9 +86,6 @@ private void hostMenu() {
         hostDialog.show();
     }
 
-    /**
-     * Shows the main menu.
-     */
     private void mainMenu() {
         joinDialog.hide();
         hostDialog.hide();
@@ -131,18 +93,14 @@ private void mainMenu() {
         startDialog.show();
     }
 
-    /**
-     * Attempts to host a game.
-     */
     private void tryHost() {
         int port = 0;
         String text = hostDialog.getPort();
-        app.getGameLogic().selectHost("");
 
         try {
             port = Integer.parseInt(text);
 
-            if (port >= 1 && port <= 65535) {
+            if(port >= 1 && port <= 65535) {
                 app.getModelSynchronize().setName(startDialog.getName());
                 hostDialog.hostServer();
                 try {
@@ -150,6 +108,10 @@ private void tryHost() {
                 } catch (InterruptedException ignored) {
                 }
                 hostDialog.connectServerAsClient();
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException ignored) {
+                }
                 app.getModelSynchronize().setHost(port);
                 //app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
                 return;
@@ -161,14 +123,10 @@ private void tryHost() {
         app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
     }
 
-    /**
-     * Attempts to join a game.
-     */
     private void tryJoin() {
         int port = 0;
         String ip = joinDialog.getIpt();
         String portText = joinDialog.getPort();
-        app.getGameLogic().selectJoin("");
 
         try {
             // Validate the port
@@ -182,6 +140,11 @@ private void tryJoin() {
                 app.getModelSynchronize().setName(startDialog.getName());
                 joinDialog.setHostname(ip);
                 joinDialog.connectToServer();
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException ignored) {
+                }
+                app.getModelSynchronize().setJoin(ip, port);
                 return;
             }
         } catch (IllegalArgumentException e) {
@@ -193,31 +156,20 @@ private void tryJoin() {
         app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
     }
 
-    /**
-     * Validates an IP address.
-     *
-     * @param ip the IP address to validate
-     * @return true if the IP address is valid, false otherwise
-     */
     private boolean isValidIpAddress(String ip) {
         String ipRegex =
-                "^(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\." +
-                        "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\." +
-                        "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\." +
-                        "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)$";
+            "^(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\." +
+                "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\." +
+                "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\." +
+                "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)$";
 
         return ip != null && ip.matches(ipRegex);
     }
 
-    /**
-     * Enters a sub-state.
-     *
-     * @param state the sub-state to enter
-     */
     private void enterSub(SubState state) {
         this.state = state;
 
-        if (null != background) {
+        if(null != background) {
             rootNode.detachChild(background);
         }
 
@@ -234,9 +186,6 @@ private void enterSub(SubState state) {
         }
     }
 
-    /**
-     * Forwards the state based on the current sub-state.
-     */
     public void forward() {
         switch (state) {
             case HOST:
@@ -250,11 +199,6 @@ public void forward() {
         }
     }
 
-    /**
-     * Forwards the state based on the current sub-state and a boolean flag.
-     *
-     * @param host a boolean flag indicating whether to host or join
-     */
     public void forward(boolean host) {
         switch (state) {
             case HOST:
@@ -264,7 +208,7 @@ public void forward(boolean host) {
                 tryJoin();
                 break;
             case MAIN:
-                if (host) {
+                if(host) {
                     enterSub(SubState.HOST);
                     //TODO playSound
                 } else {
@@ -275,9 +219,6 @@ public void forward(boolean host) {
         }
     }
 
-    /**
-     * Goes back to the main menu from the current sub-state.
-     */
     public void back() {
         switch (state) {
             case HOST:
@@ -293,22 +234,5 @@ public void back() {
                 break;
         }
     }
-
-    /**
-     * Gets the JoinDialog instance.
-     *
-     * @return the JoinDialog instance
-     */
-    public JoinDialog getJoinDialog() {
-        return joinDialog;
-    }
-
-    /**
-     * Gets the HostDialog instance.
-     *
-     * @return the HostDialog instance
-     */
-    public HostDialog getHostDialog() {
-        return hostDialog;
-    }
 }
+

Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java

@@ -2,29 +2,18 @@
 
 import com.jme3.asset.TextureKey;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector2f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.shape.Quad;
-import com.jme3.system.NanoTimer;
 import com.jme3.texture.Texture;
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.acoustic.MdgaSound;
-import pp.mdga.client.button.AbstractButton;
-import pp.mdga.client.button.LabelButton;
-import pp.mdga.client.button.SettingsButton;
+import pp.mdga.client.button.*;
 import pp.mdga.client.dialog.AudioSettingsDialog;
 import pp.mdga.client.dialog.SettingsDialog;
 import pp.mdga.client.dialog.VideoSettingsDialog;
 
-/**
- * Abstract class representing a view in the MDGA application.
- */
 public abstract class MdgaView {
-    /**
-     * Enum representing different types of overlays.
-     */
     public enum Overlay {
         INTERRUPT,
         SETTINGS,
@@ -33,7 +22,7 @@ public enum Overlay {
     protected MdgaApp app;
     protected Node rootNode = new Node("View Root");
     protected Node guiNode = new Node("View Root GUI");
-    protected Node settingsNode = new Node("View Root Overlay");
+    protected Node overlayNode = new Node("View Root Overlay");
 
     private SettingsButton settingsButton;
 
@@ -41,28 +30,17 @@ public enum Overlay {
     private VideoSettingsDialog videoSettingsDialog;
     private AudioSettingsDialog audioSettingsDialog;
 
-    protected LabelButton infoLabel = null;
-    protected NanoTimer infoTimer = new NanoTimer();
-
     private int settingsDepth = 0;
 
-    /**
-     * Constructor for MdgaView.
-     *
-     * @param app the application instance
-     */
     public MdgaView(MdgaApp app) {
         this.app = app;
         settingsButton = new SettingsButton(app, guiNode, this::enterSettings);
 
-        settingsDialog = new SettingsDialog(app, settingsNode, this);
-        videoSettingsDialog = new VideoSettingsDialog(app, settingsNode, this);
-        audioSettingsDialog = new AudioSettingsDialog(app, settingsNode, this);
+        settingsDialog = new SettingsDialog(app, overlayNode, this);
+        videoSettingsDialog = new VideoSettingsDialog(app, overlayNode, this);
+        audioSettingsDialog = new AudioSettingsDialog(app, overlayNode, this);
     }
 
-    /**
-     * Method to enter the view.
-     */
     public void enter() {
         app.getRootNode().attachChild(rootNode);
         app.getGuiNode().attachChild(guiNode);
@@ -72,12 +50,10 @@ public void enter() {
         onEnter();
     }
 
-    /**
-     * Method to leave the view.
-     */
     public void leave() {
         onLeave();
 
+
         settingsButton.hide();
 
         while (settingsDepth > 0) {
@@ -88,83 +64,36 @@ public void leave() {
         app.getGuiNode().detachChild(guiNode);
     }
 
-    /**
-     * Method to enter an overlay.
-     *
-     * @param overlay the overlay to enter
-     */
     public void enterOverlay(Overlay overlay) {
         app.getGuiNode().detachChild(guiNode);
 
         onEnterOverlay(overlay);
     }
 
-    /**
-     * Method to leave an overlay.
-     *
-     * @param overlay the overlay to leave
-     */
     public void leaveOverlay(Overlay overlay) {
         app.getGuiNode().attachChild(guiNode);
 
         onLeaveOverlay(overlay);
     }
 
-    /**
-     * Method to update the view.
-     *
-     * @param tpf time per frame
-     */
     public void update(float tpf) {
         videoSettingsDialog.update();
         audioSettingsDialog.update();
 
-        if (null != infoLabel && infoTimer.getTimeInSeconds() > 5) {
-            infoLabel.hide();
-            infoLabel = null;
-        }
-
         onUpdate(tpf);
     }
 
-    /**
-     * Abstract method to handle entering the view.
-     */
     protected abstract void onEnter();
 
-    /**
-     * Abstract method to handle leaving the view.
-     */
     protected abstract void onLeave();
 
-    /**
-     * Method to handle updating the view.
-     *
-     * @param tpf time per frame
-     */
     protected void onUpdate(float tpf) {
     }
 
-    /**
-     * Abstract method to handle entering an overlay.
-     *
-     * @param overlay the overlay to enter
-     */
     protected abstract void onEnterOverlay(Overlay overlay);
 
-    /**
-     * Abstract method to handle leaving an overlay.
-     *
-     * @param overlay the overlay to leave
-     */
     protected abstract void onLeaveOverlay(Overlay overlay);
 
-    /**
-     * Method to create a background geometry with a texture.
-     *
-     * @param texturePath the path to the texture
-     * @return the created background geometry
-     */
     protected Geometry createBackground(String texturePath) {
         TextureKey key = new TextureKey(texturePath, true);
         Texture backgroundTexture = app.getAssetManager().loadTexture(key);
@@ -181,35 +110,26 @@ protected Geometry createBackground(String texturePath) {
         return background;
     }
 
-    /**
-     * Method to enter the settings view.
-     */
     public void enterSettings() {
         enterOverlay(Overlay.SETTINGS);
 
-        app.getGuiNode().attachChild(settingsNode);
+        app.getGuiNode().attachChild(overlayNode);
 
         settingsDialog.show();
 
         settingsDepth++;
     }
 
-    /**
-     * Method to leave the settings view.
-     */
     public void leaveSettings() {
         leaveOverlay(Overlay.SETTINGS);
 
-        app.getGuiNode().detachChild(settingsNode);
+        app.getGuiNode().detachChild(overlayNode);
 
         settingsDialog.hide();
 
         settingsDepth--;
     }
 
-    /**
-     * Method to enter the video settings view.
-     */
     public void enterVideoSettings() {
         settingsDialog.hide();
         videoSettingsDialog.show();
@@ -217,9 +137,6 @@ public void enterVideoSettings() {
         settingsDepth++;
     }
 
-    /**
-     * Method to leave the video settings view.
-     */
     public void leaveVideoSettings() {
         settingsDialog.show();
         videoSettingsDialog.hide();
@@ -227,9 +144,6 @@ public void leaveVideoSettings() {
         settingsDepth--;
     }
 
-    /**
-     * Method to enter the audio settings view.
-     */
     public void enterAudioSettings() {
         settingsDialog.hide();
         audioSettingsDialog.show();
@@ -237,9 +151,6 @@ public void enterAudioSettings() {
         settingsDepth++;
     }
 
-    /**
-     * Method to leave the audio settings view.
-     */
     public void leaveAudioSettings() {
         settingsDialog.show();
         audioSettingsDialog.hide();
@@ -247,9 +158,6 @@ public void leaveAudioSettings() {
         settingsDepth--;
     }
 
-    /**
-     * Method to leave advanced settings.
-     */
     private void leaveAdvanced() {
         settingsDialog.show();
         audioSettingsDialog.hide();
@@ -257,9 +165,6 @@ private void leaveAdvanced() {
         settingsDepth--;
     }
 
-    /**
-     * Method to handle pressing the escape key.
-     */
     public void pressEscape() {
         if (settingsDepth == 0) {
             enterSettings();
@@ -270,9 +175,6 @@ public void pressEscape() {
         }
     }
 
-    /**
-     * Method to handle pressing the forward key.
-     */
     public void pressForward() {
         if (this instanceof MainView mainView) {
             mainView.forward(false);
@@ -284,43 +186,11 @@ public void pressForward() {
         }
 
         if (this instanceof GameView gameView) {
-            if (gameView.needConfirm) {
-                app.getModelSynchronize().confirm();
-            } else if (gameView.needNoPower) {
-                app.getModelSynchronize().confirm();
-            } else {
-                app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
-            }
+            app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
         }
 
         if (this instanceof CeremonyView ceremonyView) {
             ceremonyView.forward();
         }
     }
-
-    /**
-     * Method to show information on the view.
-     *
-     * @param error the error message
-     * @param isError flag indicating if it is an error
-     */
-    public void showInfo(String error, boolean isError) {
-        infoTimer.reset();
-
-        if (null != infoLabel) {
-            infoLabel.hide();
-        }
-
-        infoLabel = new LabelButton(app, guiNode, error, new Vector2f(5.5f, 2), new Vector2f(0.5f, AbstractButton.VERTICAL - 0.5f), false);
-
-        ColorRGBA color;
-
-        if (isError) {
-            color = ColorRGBA.Red.clone();
-        } else {
-            color = ColorRGBA.Green.clone();
-        }
-
-        infoLabel.setColor(ColorRGBA.Black, color);
-    }
 }

Projekte/mdga/client/src/main/resources/Maps/map.mdga

@@ -1,7 +1,7 @@
 world 0,0 90
-treesBigBackground 0,0 90
-treesSmallBackground 0,0 90
 
+#tree_small 1,1 0
+#tree_big 0,0 0
 
 #Marine Pos
 marine 4,-5 270
@@ -58,8 +58,7 @@ big_tent -10,-9 130
 big_tent 9,-10 225
 radar 0,10 -20
 tank -1,-10 135
-#tank 0,-18 180
-tank_shoot 0,-18 180
+tank 0,-18 180
 tank 3,-18 180
 tank -3,-18 180
 
@@ -132,145 +131,3 @@ node_home_blue 4,0 0
 node_home_blue 3,0 0
 node_home_blue 2,0 0
 node_home_blue 1,0 0
-
-# Randomly Distributed Trees within Radius 12 to 40
-
-treeSmall 10,15 180
-treeBig -15,12 45
-treeSmall -8,-22 270
-treeBig 22,8 90
-treeSmall -18,-10 135
-treeBig 9,24 300
-treeSmall 17,-9 60
-treeBig -20,5 330
-treeSmall -14,18 200
-treeBig 25,-7 120
-treeBig -12,-18 150
-treeSmall 19,-16 45
-treeBig 7,10 90
-treeBig -19,-9 270
-treeSmall 21,4 110
-treeBig -11,17 300
-treeSmall 3,-21 360
-treeSmall -23,14 100
-treeBig 4,26 330
-treeSmall 12,13 270
-treeBig -18,8 45
-treeBig 11,-10 135
-treeSmall 16,5 180
-treeBig -13,-17 330
-treeSmall -2,14 270
-#treeBig 7,9 300
-treeSmall 23,-10 240
-treeBig -6,18 180
-treeSmall 5,27 270
-treeBig 14,-11 60
-treeSmall 9,-16 180
-treeBig -12,22 240
-treeBig 18,7 360
-treeSmall -24,-4 200
-treeBig -8,21 300
-treeSmall 12,-19 120
-treeBig 6,-12 180
-treeSmall -11,10 75
-treeBig 9,6 270
-treeSmall 8,-14 150
-treeBig 3,18 30
-treeSmall 17,13 100
-treeBig -9,20 90
-treeBig 6,-22 330
-treeSmall -20,7 45
-treeBig 21,11 150
-treeSmall 15,-18 270
-treeBig -3,-12 200
-treeBig 12,-28 330
-treeSmall -17,-7 120
-treeBig -10,9 300
-treeSmall 2,-14 240
-treeBig 24,2 360
-treeSmall 4,-13 300
-treeBig -19,20 90
-#treeSmall -11,5 45
-treeBig 15,9 180
-treeSmall -6,10 240
-treeBig 3,15 30
-treeSmall 9,-19 150
-treeBig -21,-4 330
-treeSmall 19,11 270
-treeSmall 12,24 110
-treeBig -13,15 45
-treeSmall 7,-15 240
-treeBig 26,-8 300
-treeSmall -16,14 120
-treeBig 14,18 360
-treeSmall 8,21 100
-treeBig -8,-18 240
-treeSmall 9,15 180
-treeBig 10,-20 270
-treeSmall 2,27 90
-treeBig 18,12 300
-treeSmall -10,-14 150
-treeBig -15,16 330
-treeSmall -9,19 45
-treeBig 17,-14 120
-treeSmall 5,-25 180
-treeBig 7,23 30
-treeSmall -14,-12 200
-treeBig 6,-16 300
-treeSmall -20,-8 100
-treeBig 4,11 240
-treeSmall 24,-15 90
-treeSmall -19,-19 360
-treeBig 20,8 45
-treeSmall 3,22 270
-treeBig 13,-9 180
-treeSmall -11,18 150
-treeBig -17,-4 300
-treeSmall 5,-14 240
-treeBig 9,17 330
-treeSmall 15,13 90
-treeBig -21,18 30
-treeSmall 6,20 100
-treeBig -16,22 180
-treeSmall -5,18 360
-treeBig 22,11 45
-treeSmall 10,-23 240
-treeBig -10,-16 300
-treeSmall -17,14 120
-treeBig 20,4 150
-treeSmall 11,-22 180
-treeBig -24,-11 200
-treeSmall 14,17 150
-treeBig -8,-12 300
-treeSmall 7,-18 100
-treeBig -5,16 330
-treeSmall 16,-14 200
-treeBig 18,-8 90
-treeSmall -23,-9 45
-treeBig 24,10 300
-treeSmall -4,19 180
-treeBig 12,-5 330
-treeSmall -19,16 100
-treeBig 14,20 150
-treeSmall 9,12 180
-treeBig -22,8 60
-treeSmall 6,18 360
-treeBig 25,-9 45
-treeBig -10,12 240
-treeSmall 19,-17 100
-treeSmall -13,19 90
-treeSmall 16,-12 120
-treeBig 22,-6 45
-treeSmall -18,15 200
-treeBig 14,-10 300
-treeBig 6,10 330
-treeSmall 17,18 90
-treeBig -20,4 180
-treeBig 19,-16 300
-treeSmall -15,9 270
-treeBig 12,22 360
-
-
-
-
-

Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/Outline.frag

@@ -1,6 +1,7 @@
 // Samplers for textures
 uniform sampler2D m_Texture;
 uniform sampler2D m_OutlineDepthTexture;
+uniform sampler2D m_DepthTexture;
 
 // Input texture coordinates from the vertex shader
 in vec2 texCoord;
@@ -14,25 +15,26 @@ uniform float m_OutlineWidth;
 out vec4 fragColor;
 
 void main() {
-    // Sample depth textures at various offsets
+    // Sample depth textures
     vec4 depth = texture(m_OutlineDepthTexture, texCoord);
-    vec4 depth1 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
-    vec4 depth2 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
-    vec4 depth3 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
-    vec4 depth4 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
-    vec4 depth5 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, m_OutlineWidth)) / m_Resolution);
-    vec4 depth6 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, -m_OutlineWidth)) / m_Resolution);
-    vec4 depth7 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, 0.0)) / m_Resolution);
-    vec4 depth8 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, 0.0)) / m_Resolution);
+    vec4 depth1 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
+    vec4 depth2 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
+    vec4 depth3 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(-m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
+    vec4 depth4 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(-m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
+    vec4 depth5 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(0.0, m_OutlineWidth)) / m_Resolution);
+    vec4 depth6 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(0.0, -m_OutlineWidth)) / m_Resolution);
+    vec4 depth7 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(m_OutlineWidth, 0.0)) / m_Resolution);
+    vec4 depth8 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(-m_OutlineWidth, 0.0)) / m_Resolution);
 
     // Sample the main texture
     vec4 color = texture(m_Texture, texCoord);
 
-    // Check if an outline should be applied
-    bool isEdge = (depth == vec4(0.0)) &&
-                  (depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth ||
-                   depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth);
-
-    // Output the final color
-    fragColor = isEdge ? m_OutlineColor : color;
+    // Determine whether to apply the outline color
+    if (depth == vec4(0.0) &&
+       (depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth ||
+        depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)) {
+        fragColor = m_OutlineColor; // Apply outline color
+    } else {
+        fragColor = color; // Use the original texture color
+    }
 }

Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePre.frag

@@ -1,10 +1,11 @@
-// Input texture coordinates from the vertex shader
+
+// Use 'in' instead of 'varying' for inputs from the vertex shader
 in vec2 texCoord;
 
-// Output variable for the fragment color
+// Declare a custom output variable for the fragment color
 out vec4 fragColor;
 
-// Uniform samplers for textures
+// Uniform samplers
 uniform sampler2D m_Texture;
 uniform sampler2D m_NormalsTexture;
 uniform sampler2D m_DepthTexture;
@@ -12,7 +13,6 @@ uniform sampler2D m_DepthTexture;
 void main() {
     // Sample the texture at the given texture coordinates
     vec4 color = texture(m_Texture, texCoord);
-
     // Assign the color to the output variable
     fragColor = color;
 }

Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.frag

@@ -1,78 +1,109 @@
-// Uniform samplers
 uniform sampler2D m_Texture;
 uniform sampler2D m_OutlineDepthTexture;
 uniform sampler2D m_DepthTexture;
+varying vec2 texCoord;
 
-// Input texture coordinates from the vertex shader
-in vec2 texCoord;
-
-// Uniforms for resolution, outline color, and width
 uniform vec2 m_Resolution;
 uniform vec4 m_OutlineColor;
 uniform float m_OutlineWidth;
 
-// Output variable for fragment color
-out vec4 fragColor;
-
 void main() {
-    vec4 depth = texture(m_OutlineDepthTexture, texCoord);
-    vec4 depth1 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
-    vec4 depth2 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
-    vec4 depth3 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
-    vec4 depth4 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
-    vec4 depth5 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, m_OutlineWidth)) / m_Resolution);
-    vec4 depth6 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, -m_OutlineWidth)) / m_Resolution);
-    vec4 depth7 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, 0.0)) / m_Resolution);
-    vec4 depth8 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, 0.0)) / m_Resolution);
-
-    vec4 color = texture(m_Texture, texCoord);
-
-    float ratio = 0.0;
-    if (depth == vec4(0.0) &&
-        (depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth ||
-         depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)) {
-        float dist = m_OutlineWidth;
-        vec4 nearDepth;
-
-        // Iterate to find the distance to the nearest edge
-        for (float i = 0.0; i < m_OutlineWidth; i++) {
-            if (depth1 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(i, i)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth2 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(i, -i)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth3 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-i, i)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth4 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-i, -i)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth5 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, i)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth6 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, -i)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth7 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(i, 0.0)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            } else if (depth8 != depth) {
-                nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-i, 0.0)) / m_Resolution);
-                if (nearDepth != depth) { dist = i; break; }
-            }
-        }
-
-        // Calculate ratio for outline blending
-        ratio = clamp(1.0 - dist / m_OutlineWidth, 0.0, 1.0);
-
-        // Blend the outline color with the base color
-        fragColor = color * (1.0 - ratio) + m_OutlineColor * ratio;
-    } else {
-        // No outline, use the base texture color
-        fragColor = color;
-    }
-
-    // Optional: Debugging outline visualization
-    // fragColor = vec4(0.0, 1.0 - ratio, 0.0, 1.0);
+	vec4 depth = texture2D(m_OutlineDepthTexture, texCoord);
+	vec4 depth1 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(m_OutlineWidth,m_OutlineWidth))/m_Resolution);
+	vec4 depth2 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(m_OutlineWidth,-m_OutlineWidth))/m_Resolution);
+	vec4 depth3 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-m_OutlineWidth,m_OutlineWidth))/m_Resolution);
+	vec4 depth4 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-m_OutlineWidth,-m_OutlineWidth))/m_Resolution);
+	vec4 depth5 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,m_OutlineWidth))/m_Resolution);
+	vec4 depth6 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,-m_OutlineWidth))/m_Resolution);
+	vec4 depth7 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(m_OutlineWidth,0.))/m_Resolution);
+	vec4 depth8 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-m_OutlineWidth,0.))/m_Resolution);
+	vec4 color = texture2D(m_Texture, texCoord);
+	//如果是背景
+	float ratio=0.;
+	if(depth==vec4(0.) && (depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth||depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)){
+		float dist=m_OutlineWidth;
+		//距离边的像素
+		vec4 nearDepth;
+		if(depth1 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(i,i))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth2 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(i,-i))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth3 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-i,i))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth4 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-i,-i))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth5 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,i))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth6 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,-i))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth7 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(i,0.))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}else
+		if(depth8 != depth){
+			for(float i=0.;i<m_OutlineWidth;i++){
+				nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-i,0.))/m_Resolution);
+				if(nearDepth != depth){
+					dist = i;
+					break;
+				}
+			}
+		}
+		//0:场景颜色		1:outline颜色 
+		ratio = clamp(1.- dist/m_OutlineWidth,0.,1.);
+		//float off = (1.-ratio*ratio)*(1.-ratio*ratio);
+		gl_FragColor = color*(1.-ratio) +m_OutlineColor*ratio;
+		//gl_FragColor = m_OutlineColor;
+	}else{
+		gl_FragColor = color;
+	}
+	//debug
+	//gl_FragColor = vec4(0.,(1.-ratio),0.,1.);
 }

Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/Post15.vert

@@ -1,8 +1,8 @@
-// Vertex attributes
+// Use 'in' for vertex attributes
 in vec4 inPosition;
 in vec2 inTexCoord;
 
-// Output to fragment shader
+// Use 'out' for passing data to the fragment shader
 out vec2 texCoord;
 
 void main() {

Projekte/mdga/client/src/main/resources/Models/missile/AVMT300.mtl

@@ -1,32 +0,0 @@
-# Blender MTL File: 'untitled.blend'
-# Material Count: 3
-
-newmtl Material.001
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd untiffftled.jpg
-
-newmtl Material.002
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd untiffftled.jpg
-
-newmtl Material.004
-Ns 96.078431
-Ka 0.000000 0.000000 0.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd untiffftled.jpg