Merge development

- for leaving the lobby

Projekte/.run/MdgaApp.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MdgaApp" type="Application" factoryName="Application" singleton="false" nameIsGenerated="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/mdga/client/src/main/java/pp/mdga/client/Asset.java

@@ -1,76 +1,133 @@
 package pp.mdga.client;
 
+/**
+ * Represents different assets in the application. Each asset may have an associated model path,
+ * diffuse texture path, and a size factor. The enum provides multiple constructors to handle
+ * varying levels of detail for different assets.
+ */
 public enum Asset {
     bigTent,
     cardStack,
-    cir,
-    heer,
+    cir("Models/cir/cir_newOrigin.obj"),
+    heer("Models/heer/heer_newOrigin.obj"),
     jet,
-    lw,
-    marine,
-    node_home_blue("./node_home/node_home.j3o", "./node_home/node_home_blue_diff.png"),
-    node_wait_blue("./node_home/node_home.j3o", "./node_home/node_home_blue_diff.png"),
-    node_home_black("./node_home/node_home.j3o", "./node_home/node_home_black_diff.png"),
-    node_wait_black("./node_home/node_home.j3o", "./node_home/node_home_black_diff.png"),
-    node_home_green("./node_home/node_home.j3o", "./node_home/node_home_green_diff.png"),
-    node_wait_green("./node_home/node_home.j3o", "./node_home/node_home_green_diff.png"),
-    node_home_yellow("./node_home/node_home.j3o", "./node_home/node_home_orange_diff.png"),
-    node_wait_yellow("./node_home/node_home.j3o", "./node_home/node_home_orange_diff.png"),
+    lw("Models/lw/lw_newOrigin.obj"),
+    marine("Models/marine/marine_newOrigin.obj"),
+    node_home_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"),
+    node_wait_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"),
+    node_home_black("Models/node_home/node_home.j3o", "Models/node_home/node_home_black_diff.png"),
+    node_wait_black("Models/node_home/node_home.j3o", "Models/node_home/node_home_black_diff.png"),
+    node_home_green("Models/node_home/node_home.j3o", "Models/node_home/node_home_green_diff.png"),
+    node_wait_green("Models/node_home/node_home.j3o", "Models/node_home/node_home_green_diff.png"),
+    node_home_yellow("Models/node_home/node_home.j3o", "Models/node_home/node_home_orange_diff.png"),
+    node_wait_yellow("Models/node_home/node_home.j3o", "Models/node_home/node_home_orange_diff.png"),
     node_normal,
-    node_start("./node_normal/node_normal.j3o", "./node_normal/node_start_diff.png"),
-    node_bonus("./node_normal/node_normal.j3o", "./node_normal/node_bonus_diff.png"),
+    node_start("Models/node_normal/node_normal.j3o", "Models/node_normal/node_start_diff.png"),
+    node_bonus("Models/node_normal/node_normal.j3o", "Models/node_normal/node_bonus_diff.png"),
     radar,
     ship(0.8f),
     smallTent,
     tank,
-//    world(1.2f),
-    world("./world_new/world_export_new.obj", "./world_new/world_new_diff.png", 1.2f),
-    shield_ring("./shield_ring/shield_ring.obj", null),
-    tree_small("./tree_small/tree_small.obj", "./tree_small/tree_small_diff.png"),
-    tree_big("./tree_big/tree_big.obj", "./tree_big/tree_big_diff.png"),
-    turboCard,
-    swapCard,
-    shieldCard
+    world("Models/world_new/world_export_new.obj", "Models/world_new/world_new_diff.png", 1.2f),
+    shield_ring("Models/shield_ring/shield_ring.obj", null),
+    tree_small("Models/tree_small/tree_small.obj", "Models/tree_small/tree_small_diff.png"),
+    tree_big("Models/tree_big/tree_big.obj", "Models/tree_big/tree_big_diff.png"),
+    turboCard("Models/turboCard/turboCard.obj", "Models/turboCard/turboCard_diff.png"),
+    turboSymbol("Models/turboCard/turboSymbol.obj", "Models/turboCard/turboCard_diff.png"),
+    swapCard("Models/swapCard/swapCard.obj", "Models/swapCard/swapCard_diff.png"),
+    swapSymbol("Models/swapCard/swapSymbol.obj", "Models/swapCard/swapCard_diff.png"),
+    shieldCard("Models/shieldCard/shieldCard.obj", "Models/shieldCard/shieldCard_diff.png"),
+    shieldSymbol("Models/shieldCard/shieldSymbol.obj", "Models/shieldCard/shieldCard_diff.png"),
+    dice("Models/dice/dice.obj", "Models/dice/dice_diff.jpeg")
     ;
 
     private final String modelPath;
     private final String diffPath;
     private final float size;
+    private static final String root = "Models/";
 
+    /**
+     * Default constructor. Initializes modelPath and diffPath based on the enum name and sets default size to 1.0.
+     */
     Asset() {
-        String folderFileName = "./" + name() + "/" + name();
+        String folderFileName = "./" + root + name() + "/" + name();
         this.modelPath = folderFileName + ".j3o";
         this.diffPath = folderFileName + "_diff.png";
         this.size = 1f;
     }
 
+    /**
+     * Constructor with specific model path and diffuse texture path.
+     *
+     * @param modelPath Path to the 3D model file.
+     * @param diffPath  Path to the diffuse texture file.
+     */
     Asset(String modelPath, String diffPath) {
         this.modelPath = modelPath;
         this.diffPath = diffPath;
         this.size = 1f;
     }
 
+    /**
+     * Constructor with specific model path. Diffuse texture path is derived based on enum name.
+     *
+     * @param modelPath Path to the 3D model file.
+     */
+    Asset(String modelPath) {
+        String folderFileName = "./" + root + name() + "/" + name();
+        this.modelPath = modelPath;
+        this.diffPath = folderFileName + "_diff.png";;
+        this.size = 1f;
+    }
+
+    /**
+     * Constructor with specific size. Model and texture paths are derived based on enum name.
+     *
+     * @param size Scaling factor for the asset.
+     */
     Asset(float size) {
-        String folderFileName = "./" + name() + "/" + name();
+        String folderFileName = "./" + root + name() + "/" + name();
         this.modelPath = folderFileName + ".j3o";
         this.diffPath = folderFileName + "_diff.png";
         this.size = size;
     }
 
+    /**
+     * Constructor with specific model path, diffuse texture path, and size.
+     *
+     * @param modelPath Path to the 3D model file.
+     * @param diffPath  Path to the diffuse texture file.
+     * @param size      Scaling factor for the asset.
+     */
     Asset(String modelPath, String diffPath, float size){
         this.modelPath = modelPath;
         this.diffPath = diffPath;
         this.size = size;
     }
 
+    /**
+     * Gets the model path for the asset.
+     *
+     * @return Path to the 3D model file.
+     */
     public String getModelPath() {
         return modelPath;
     }
 
+    /**
+     * Gets the diffuse texture path for the asset.
+     *
+     * @return Path to the diffuse texture file, or null if not applicable.
+     */
     public String getDiffPath() {
         return diffPath;
     }
 
+    /**
+     * Gets the scaling factor for the asset.
+     *
+     * @return The size of the asset.
+     */
     public float getSize() {
         return size;
     }

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

@@ -0,0 +1,288 @@
+package pp.mdga.client;
+
+import com.jme3.collision.CollisionResult;
+import com.jme3.collision.CollisionResults;
+import com.jme3.input.InputManager;
+import com.jme3.input.KeyInput;
+import com.jme3.input.MouseInput;
+import com.jme3.input.controls.*;
+import com.jme3.math.Ray;
+import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
+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.PieceControl;
+import pp.mdga.client.gui.CardControl;
+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.SelectableCardsNotification;
+
+import java.util.List;
+
+public class InputSynchronizer {
+
+    private MdgaApp app;
+    private InputManager inputManager;
+
+    protected boolean rightMousePressed = false;
+    private float rotationAngle = 180f;
+    private int scrollValue = 0;
+    private CardControl hoverCard;
+    private PieceControl hoverPiece;
+
+    /**
+     * Constructor initializes the InputSynchronizer with the application context.
+     * Sets up input mappings and listeners for user interactions.
+     *
+     * @param app The application instance
+     */
+    InputSynchronizer(MdgaApp app) {
+        this.app = app;
+
+        this.inputManager = app.getInputManager();
+        hoverCard = null;
+        hoverPiece = null;
+        setupInput();
+    }
+
+    /**
+     * Configures input mappings for various actions and binds them to listeners.
+     */
+    private void setupInput() {
+        inputManager.addMapping("Settings", new KeyTrigger(KeyInput.KEY_ESCAPE));
+        inputManager.addMapping("Forward", new KeyTrigger(KeyInput.KEY_RETURN));
+
+        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", "Test");
+        inputManager.addListener(analogListener, "MouseLeft", "MouseRight", "MouseScrollUp", "MouseScrollDown");
+    }
+
+    private boolean test = false;
+
+    /**
+     * Handles action-based input events such as key presses and mouse clicks.
+     */
+    private final ActionListener actionListener = new ActionListener() {
+        @Override
+        public void onAction(String name, boolean isPressed, float tpf) {
+            if (name.equals("Settings") && isPressed) {
+                app.getView().pressEscape();
+            }
+            if (name.equals("Forward") && isPressed) {
+                app.getView().pressForward();
+            }
+            if (name.equals("RotateRightMouse")) {
+                rightMousePressed = isPressed;
+            }
+            if(name.equals("Click") && isPressed) {
+                if (app.getView() instanceof GameView gameView) {
+                    CardControl cardLayerSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayerRootNode(), CardControl.class);
+                    OutlineControl boardSelect = checkHover(app.getCamera(), app.getRootNode(), OutlineControl.class);
+
+                    if(cardLayerSelect != null) {
+                        //cardSelect
+                        if(cardLayerSelect.isSelectable()) gameView.getGuiHandler().selectCard(cardLayerSelect);
+                    }
+                    else if(boardSelect != null) {
+                        //boardSelect
+                        if(boardSelect instanceof PieceControl pieceControl){
+                            if(pieceControl.isSelectable()) gameView.getBoardHandler().pieceSelect(pieceControl);
+                        }
+                        if(boardSelect instanceof NodeControl nodeControl){
+//
+                        }
+                    }
+                    else {
+                        //both null
+                    }
+                }
+
+
+            }
+            if(name.equals("Test") &&isPressed){
+                if(app.getView() instanceof GameView gameView){
+                    app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
+                }
+            }
+        }
+    };
+
+    /**
+     * Handles analog-based input events such as mouse movement and scrolling.
+     */
+    private final AnalogListener analogListener = new AnalogListener() {
+        @Override
+        public void onAnalog(String name, float value, float tpf) {
+            if (name.equals("MouseLeft") && rightMousePressed) {
+                rotationAngle -= value * 360f;
+            }
+            else if (name.equals("MouseRight") && rightMousePressed) {
+                rotationAngle += value * 360f;
+            }
+            else if (name.equals("MouseScrollUp")) {
+                scrollValue = Math.max(1, scrollValue - 5);
+            }
+            else if (name.equals("MouseScrollDown")) {
+                scrollValue = Math.min(100, scrollValue + 5);
+            }
+            else if (name.equals("MouseLeft") || name.equals("MouseRight") || name.equals("MouseVertical")){
+                hoverPiece();
+                hoverCard();
+            }
+        }
+    };
+
+    /**
+     * Detects the hovered piece and updates its hover state.
+     */
+    private <T extends AbstractControl> T checkHover(Camera cam, Node root, Class<T> controlType) {
+        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);
+        }
+        return null;
+    }
+
+    /**
+     * Detects the hovered card and updates its hover state.
+     */
+    private <T extends AbstractControl> T checkHoverOrtho(Camera cam, Node root, Class<T> controlType) {
+        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 ){
+                T control = res.getGeometry().getControl(controlType);
+                if(control != null) return control;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Handles the hover state for a piece in the game.
+     * Checks if a piece is being hovered over, updates the hover state, and triggers hover effects.
+     */
+    private void hoverPiece() {
+        if (app.getView() instanceof GameView gameView) {
+            PieceControl control = checkPiece();
+            if (control != null) {
+                if (control != hoverPiece) {
+                    pieceOff();
+                    hoverPiece = control;
+                    hoverPiece.hover();
+                }
+            } else {
+                pieceOff();
+            }
+        }
+    }
+
+    /**
+     * Handles the hover state for a card in the game.
+     * Checks if a card is being hovered over, updates the hover state, and triggers hover effects.
+     */
+    private void hoverCard() {
+        if (app.getView() instanceof GameView gameView) {
+            CardControl control = checkCard(gameView);
+            if (control != null) {
+                if (control != hoverCard) {
+                    cardOff();
+                    hoverCard = control;
+                    hoverCard.hover();
+                }
+            } else {
+                cardOff();
+            }
+        }
+    }
+
+    /**
+     * Checks if a piece is being hovered over in the 3D game world.
+     *
+     * @return The PieceControl of the hovered piece, or null if no piece is hovered.
+     */
+    private PieceControl checkPiece() {
+        return checkHover(app.getCamera(), app.getRootNode(), PieceControl.class);
+    }
+
+    /**
+     * Checks if a card is being hovered over in the 2D card layer.
+     *
+     * @param gameView The current game view.
+     * @return The CardControl of the hovered card, or null if no card is hovered.
+     */
+    private CardControl checkCard(GameView gameView) {
+        return checkHoverOrtho(
+            gameView.getGuiHandler().getCardLayerCamera(),
+            gameView.getGuiHandler().getCardLayerRootNode(),
+            CardControl.class
+        );
+    }
+
+    /**
+     * Disables the hover effect on the currently hovered piece, if any.
+     */
+    private void pieceOff() {
+        if (hoverPiece != null) hoverPiece.hoverOff();
+        hoverPiece = null;
+    }
+
+    /**
+     * Disables the hover effect on the currently hovered card, if any.
+     */
+    private void cardOff() {
+        if (hoverCard != null) hoverCard.hoverOff();
+        hoverCard = null;
+    }
+
+    /**
+     * Retrieves the current mouse position in the 3D world using the specified camera.
+     *
+     * @param cam The camera used for determining the mouse position.
+     * @return A Vector3f representing the mouse position in the 3D world.
+     */
+    private Vector3f getMousePos(Camera cam) {
+        Vector2f mousePositionScreen = inputManager.getCursorPosition();
+        Vector3f world = cam.getWorldCoordinates(mousePositionScreen, 0);
+        if (cam.isParallelProjection()) world.setZ(0);
+        return world;
+    }
+
+    /**
+     * Gets the current rotation angle of the game element.
+     *
+     * @return The rotation angle in degrees, normalized to 360 degrees.
+     */
+    public float getRotation() {
+        return (rotationAngle / 2) % 360;
+    }
+
+    /**
+     * Gets the current scroll value.
+     *
+     * @return The scroll value as an integer.
+     */
+    public int getScroll() {
+        return scrollValue;
+    }
+}

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

@@ -1,72 +0,0 @@
-package pp.mdga.client;
-
-import com.jme3.input.InputManager;
-import com.jme3.input.KeyInput;
-import com.jme3.input.MouseInput;
-import com.jme3.input.controls.*;
-
-public class InputSyncronizer {
-
-    private MdgaApp app;
-    private InputManager inputManager;
-
-    protected boolean rightMousePressed = false;
-    private float rotationAngle = 180f;
-    private int scrollValue = 0;
-
-    InputSyncronizer(MdgaApp app) {
-        this.app = app;
-
-        this.inputManager = app.getInputManager();
-
-        setupInput();
-    }
-
-    private void setupInput() {
-        inputManager.addMapping("Settings", new KeyTrigger(KeyInput.KEY_ESCAPE));
-
-        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("MouseScrollUp", new MouseAxisTrigger(MouseInput.AXIS_WHEEL, false)); // Scroll up
-        inputManager.addMapping("MouseScrollDown", new MouseAxisTrigger(MouseInput.AXIS_WHEEL, true)); // Scroll down
-
-        inputManager.addListener(actionListener, "Settings", "RotateRightMouse");
-        inputManager.addListener(analogListener, "MouseLeft", "MouseRight", "MouseScrollUp", "MouseScrollDown");
-    }
-
-    private final ActionListener actionListener = new ActionListener() {
-        @Override
-        public void onAction(String name, boolean isPressed, float tpf) {
-            if (name.equals("Settings") && isPressed) {
-                app.getView().pressEscape();
-            }
-            if (name.equals("RotateRightMouse")) {
-                rightMousePressed = isPressed;
-            }
-        }
-    };
-
-    private final AnalogListener analogListener = new AnalogListener() {
-        @Override
-        public void onAnalog(String name, float value, float tpf) {
-            if (name.equals("MouseLeft") && rightMousePressed) {
-                rotationAngle -= value * 360f;
-            } else if (name.equals("MouseRight") && rightMousePressed) {
-                rotationAngle += value * 360f;
-            } else if (name.equals("MouseScrollUp")) {
-                scrollValue = Math.max(1, scrollValue - 5);
-            } else if (name.equals("MouseScrollDown")) {
-                scrollValue = Math.min(100, scrollValue + 5);
-            }
-        }
-    };
-
-    public float getRotation() {
-        return (rotationAngle / 2) % 360;
-    }
-
-    public int getScroll() {
-        return scrollValue;
-    }
-}

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

@@ -7,29 +7,60 @@
 import com.jme3.system.AppSettings;
 import pp.mdga.client.view.*;
 
+/**
+ * Main application class for the MdgaApp game.
+ * This class extends {@link SimpleApplication} and manages the game's lifecycle, states, and main components.
+ */
 public class MdgaApp extends SimpleApplication {
+
+    /** Handles animations in the application. */
     private AnimationHandler animationHandler;
+
+    /** Handles acoustic effects and state-based sounds. */
     private AcousticHandler acousticHandler;
+
+    /** Synchronizes notifications throughout the application. */
     private NotificationSynchronizer notificationSynchronizer;
-    private InputSyncronizer inputSyncronizer;
-    private ModelSyncronizer modelSyncronizer;
 
-    MdgaView view = null;
-    private MdgaState state = MdgaState.MAIN;
+    /** Manages input events and synchronization. */
+    private InputSynchronizer inputSynchronizer;
 
-    private static float resolutionFactor = 1.8f;
+    /** Synchronizes game models. */
+    private ModelSynchronizer modelSynchronizer;
 
+    /** The currently active view in the application. */
+    private MdgaView view = null;
+
+    /** The current state of the application. */
+    private MdgaState state = null;
+
+    /** Scale for rendering images. */
+    private static final float IMAGE_SCALE = 1.5f;
+
+    /** The main menu view. */
+    private MdgaView mainView;
+
+    /** The lobby view. */
+    private MdgaView lobbyView;
+
+    /** The game view. */
+    private MdgaView gameView;
+
+    /** The ceremony view. */
+    private MdgaView ceremonyView;
+
+    /**
+     * Main entry point for the application.
+     * Configures settings and starts the application.
+     *
+     * @param args command-line arguments (not used)
+     */
     public static void main(String[] args) {
         AppSettings settings = new AppSettings(true);
         settings.setSamples(128);
         settings.setCenterWindow(true);
-
-        int width = (int)(1280 * resolutionFactor);
-        int height = (int)(720 * resolutionFactor);
-
-        settings.setWidth(width);
-        settings.setHeight(height);
-
+        settings.setWidth(1920);
+        settings.setHeight(1080);
         settings.setVSync(false);
 
         MdgaApp app = new MdgaApp();
@@ -38,31 +69,49 @@ public static void main(String[] args) {
         app.start();
     }
 
+    /**
+     * Initializes the application by setting up handlers, views, and entering the default state.
+     */
     @Override
     public void simpleInitApp() {
+        GuiGlobals.initialize(this);
+
+        inputManager.deleteMapping("SIMPLEAPP_Exit");
+
+        flyCam.setEnabled(false);
+
         animationHandler = new AnimationHandler(this);
         acousticHandler = new AcousticHandler(this);
         notificationSynchronizer = new NotificationSynchronizer(this);
-        inputSyncronizer = new InputSyncronizer(this);
-        modelSyncronizer = new ModelSyncronizer(this);
+        inputSynchronizer = new InputSynchronizer(this);
+        modelSynchronizer = new ModelSynchronizer(this);
 
-        inputManager.deleteMapping("SIMPLEAPP_Exit");
-        inputManager.deleteMapping("FLYCAM_ZoomIn");
-        inputManager.deleteMapping("FLYCAM_ZoomOut");
-        inputManager.deleteMapping("FLYCAM_RotateDrag");
-        flyCam.setEnabled(false);
-        GuiGlobals.initialize(this);
+        mainView = new MainView(this);
+        lobbyView = new LobbyView(this);
+        gameView = new GameView(this);
+        ceremonyView = new CeremonyView(this);
 
-        enter(state);
+        enter(MdgaState.MAIN);
     }
 
+    /**
+     * Updates the application on each frame. Updates the view, acoustic handler, and notifications.
+     *
+     * @param tpf time per frame, used for smooth updating
+     */
     @Override
     public void simpleUpdate(float tpf) {
-        view.update();
+        view.update(tpf);
         acousticHandler.update();
         notificationSynchronizer.update();
     }
 
+    /**
+     * Transitions the application to a new state.
+     *
+     * @param state the new state to enter
+     * @throws RuntimeException if attempting to enter the {@link MdgaState#NONE} state
+     */
     public void enter(MdgaState state) {
         if (null != view) {
             view.leave();
@@ -72,19 +121,19 @@ public void enter(MdgaState state) {
 
         switch (state) {
             case MAIN:
-                view = new MainView(this);
+                view = mainView;
                 break;
             case LOBBY:
-                view = new LobbyView(this);
+                view = lobbyView;
                 break;
             case GAME:
-                view = new GameView(this);
+                view = gameView;
                 break;
             case CEREMONY:
-                view = new CeremonyView(this);
+                view = ceremonyView;
                 break;
             case NONE:
-                throw new RuntimeException("cant enter state NONE");
+                throw new RuntimeException("Cannot enter state NONE");
         }
 
         acousticHandler.playState(state);
@@ -92,31 +141,83 @@ public void enter(MdgaState state) {
         view.enter();
     }
 
-    public void afteGameCleanup() {
-        //TODO
-    }
-
+    /**
+     * Gets the animation handler.
+     *
+     * @return the {@link AnimationHandler} instance
+     */
     public AnimationHandler getAnimationHandler() {
         return animationHandler;
     }
 
+    /**
+     * Gets the acoustic handler.
+     *
+     * @return the {@link AcousticHandler} instance
+     */
     public AcousticHandler getAcousticHandler() {
         return acousticHandler;
     }
 
-    public MdgaState getState() {return state; }
-
-    public float getResolutionFactor() {
-        return resolutionFactor;
+    /**
+     * Gets the current state of the application.
+     *
+     * @return the current {@link MdgaState}
+     */
+    public MdgaState getState() {
+        return state;
     }
 
+    /**
+     * Gets the image scaling factor.
+     *
+     * @return the image scale as a float
+     */
+    public float getImageScale() {
+        return IMAGE_SCALE;
+    }
+
+    /**
+     * Gets the currently active view.
+     *
+     * @return the active {@link MdgaView}
+     */
     public MdgaView getView() {
         return view;
     }
 
-    public ModelSyncronizer getModelSyncronizer() {
-        return modelSyncronizer;
+    /**
+     * Gets the model synchronizer.
+     *
+     * @return the {@link ModelSynchronizer} instance
+     */
+    public ModelSynchronizer getModelSynchronize() {
+        return modelSynchronizer;
     }
 
-    public InputSyncronizer getInputSyncronizer() { return inputSyncronizer; }
+    /**
+     * Gets the input synchronizer.
+     *
+     * @return the {@link InputSynchronizer} instance
+     */
+    public InputSynchronizer getInputSynchronize() {
+        return inputSynchronizer;
     }
+
+    /**
+     * Gets the notification synchronizer.
+     *
+     * @return the {@link NotificationSynchronizer} instance
+     */
+    public NotificationSynchronizer getNotificationSynchronizer() {
+        return notificationSynchronizer;
+    }
+
+    /**
+     * Prepares the app for a new game cycle.
+     */
+    public void setup() {
+
+    }
+}
+

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

@@ -1,9 +1,35 @@
 package pp.mdga.client;
 
+/**
+ * Enum representing the various states of the MdgaApp application.
+ * Each state corresponds to a distinct phase or mode of the application.
+ */
 public enum MdgaState {
+
+    /**
+     * Represents an undefined or uninitialized state.
+     * This state should not be entered during normal application execution.
+     */
     NONE,
+
+    /**
+     * Represents the main menu state.
+     * This is typically the first state entered when the application starts.
+     */
     MAIN,
+
+    /**
+     * Represents the lobby state where players can prepare or wait before starting a game.
+     */
     LOBBY,
+
+    /**
+     * Represents the main gameplay state where the core game mechanics take place.
+     */
     GAME,
+
+    /**
+     * Represents the ceremony state, typically used for post-game events or celebrations.
+     */
     CEREMONY;
 }

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

@@ -0,0 +1,187 @@
+package pp.mdga.client;
+
+import pp.mdga.client.acoustic.MdgaSound;
+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;
+
+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;
+
+    ModelSynchronizer(MdgaApp app) {
+        this.app = app;
+    }
+
+    private Color testColor;
+    private int test = 0;
+
+    public void animationEnd() {
+
+    }
+
+    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) {
+            gameView.needConfirm();
+        } else {
+            gameView.noConfirm();
+        }
+    }
+
+    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) {
+            gameView.needConfirm();
+        } else {
+            gameView.noConfirm();
+        }
+    }
+
+    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) {
+            gameView.needConfirm();
+        } else {
+            gameView.noConfirm();
+        }
+    }
+
+    public void confirm() {
+        LOGGER.log(Level.INFO, "confirm");
+
+        GameView gameView = (GameView) app.getView();
+
+        if(a != null && b != null) {
+            //swap
+            gameView.getBoardHandler().clearSelectable();
+        } else if (a != null) {
+            //piece
+            gameView.getBoardHandler().clearSelectable();
+        } else if (card != null){
+            //card
+            gameView.getGuiHandler().clearSelectableCards();
+        } else {
+            throw new RuntimeException("nothing to confirm");
+        }
+
+        gameView.noConfirm();
+    }
+
+    public void selectTsk(Color color) {
+        // TODO call from somewhere
+        LOGGER.log(Level.INFO, "selectTsk: {0}", color);
+        LobbyView view = (LobbyView) app.getView();
+        view.setTaken(color, true, true, "OwnPlayerName");
+        testColor = color;
+    }
+
+    public void unselectTsk() {
+        // TODO call from somewhere
+        LOGGER.log(Level.INFO, "unselectTsk");
+    }
+
+    public void rolledDice() {
+        // TODO call from somewhere
+        LOGGER.log(Level.INFO, "rolledDice");
+    }
+
+    public void setName(String name) {
+        // TODO call from somewhere
+        LOGGER.log(Level.INFO, "setName: {0}", name);
+    }
+
+    public void setReady(boolean ready) {
+        LOGGER.log(Level.INFO, "setReady");
+        LobbyView view = (LobbyView) app.getView();
+        view.setReady(testColor, ready);
+        test++;
+
+        if(test > 2) {
+            testColor = null;
+            test = 0;
+            enter(MdgaState.GAME);
+        }
+    }
+
+    public void setHost(int port) {
+        // TODO call from somewhere
+        LOGGER.log(Level.INFO, "setHost: {0}", port);
+        enter(MdgaState.LOBBY);
+    }
+
+    public void setJoin(String ip, int port) {
+        // TODO call from somewhere
+        LOGGER.log(Level.INFO, "setJoin with IP: {0}, Port: {1}", new Object[]{ip, port});
+        enter(MdgaState.LOBBY);
+    }
+
+    public void leave() {
+        LOGGER.log(Level.INFO, "leave");
+        app.getAcousticHandler().playSound(MdgaSound.LEAVE);
+        enter(MdgaState.MAIN);
+    }
+
+    public void enter(MdgaState state) {
+        LOGGER.log(Level.INFO, "enter: {0}", state);
+        app.enter(state);
+
+        if (state == MdgaState.CEREMONY) {
+            CeremonyView ceremonyView = (CeremonyView) app.getView();
+            ceremonyView.addCeremonyParticipant(Color.AIRFORCE, 1, "ugidffdg");
+            ceremonyView.addCeremonyParticipant(Color.ARMY, 2, "ugidffdg");
+            ceremonyView.addCeremonyParticipant(Color.NAVY, 3, "ugidffdg");
+            ceremonyView.addCeremonyParticipant(Color.CYBER, 4, "ugidffdg");
+
+            ceremonyView.addStatisticsRow("player sdgsd", 1, 2, 3, 4, 5, 6);
+            ceremonyView.addStatisticsRow("player sdgsd", 1, 2, 3, 4, 5, 6);
+            ceremonyView.addStatisticsRow("player sdgsd", 1, 2, 3, 4, 5, 6);
+            ceremonyView.addStatisticsRow("player sdgsd", 1, 2, 3, 4, 5, 6);
+            ceremonyView.addStatisticsRow("Gesamt", 1, 2, 3, 4, 5, 6);
+        }
+
+        if (state == MdgaState.GAME) {
+            GameView gameView = (GameView) app.getView();
+
+            //app.getNotificationSynchronizer().addTestNotification(new DrawCardNotification(Color.AIRFORCE, BonusCard.SHIELD));
+            selectPiece(UUID.randomUUID());
+        }
+
+        if (state == MdgaState.LOBBY) {
+            LobbyView lobbyView = (LobbyView) app.getView();
+
+            app.getNotificationSynchronizer().addTestNotification(new TskSelectNotification(Color.CYBER, "blablabupp", false));
+            app.getNotificationSynchronizer().addTestNotification(new TskSelectNotification(Color.ARMY, "Spieler 2", false));
+            lobbyView.setReady(Color.ARMY, true);
+        }
+    }
+}

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

@@ -1,72 +0,0 @@
-package pp.mdga.client;
-
-import pp.mdga.client.view.LobbyView;
-import pp.mdga.game.Color;
-
-public class ModelSyncronizer {
-    private MdgaApp app;
-
-    ModelSyncronizer(MdgaApp app) {
-        this.app = app;
-    }
-
-    public void selectPiece() {
-        //TODO call from somewhere
-        System.out.println("selectPiece");
-    }
-
-    public void selectCard() {
-        //TODO call from somewhere
-        System.out.println("selectCard");
-    }
-
-    public void selectTsk(Color color) {
-        //TODO call from somewhere
-        System.out.println("selectTsk: " + color);
-        LobbyView view = (LobbyView) app.getView();
-        view.setTaken(color, true, true, "OwnPlayerName");
-    }
-
-    public void unselectTsk() {
-        //TODO call from somewhere
-        System.out.println("unselectTsk");
-    }
-
-    public void rolledDice() {
-        //TODO call from somewhere
-        System.out.println("rolledDice");
-    }
-
-    public void setName(String name) {
-        //TODO call from somewhere
-        System.out.println("setName:" + name);
-    }
-
-    public void setReady() {
-        //TODO call from somewhere
-        System.out.println("setReady");
-        app.enter(MdgaState.GAME);
-    }
-
-    public void setHost(int port) {
-        //TODO call from somewhere
-        System.out.println("setHost: " + port);
-        app.enter(MdgaState.LOBBY);
-    }
-
-    public void setJoin(String ip, int port) {
-        //TODO call from somewhere
-        System.out.println("setJoin");
-        app.enter(MdgaState.LOBBY);
-    }
-
-    public void leave() {
-        System.out.println("leave");
-        app.enter(MdgaState.MAIN);
-    }
-
-    public void enter(MdgaState state) {
-        System.out.println("enter:" + state);
-        app.enter(state);
-    }
-}

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

@@ -1,7 +1,11 @@
 package pp.mdga.client;
 
+import pp.mdga.client.board.BoardHandler;
+import pp.mdga.client.gui.GuiHandler;
+import pp.mdga.client.view.CeremonyView;
 import pp.mdga.client.view.GameView;
 import pp.mdga.client.view.LobbyView;
+import pp.mdga.game.Color;
 import pp.mdga.notification.*;
 
 import java.util.ArrayList;
@@ -21,7 +25,6 @@ public void addTestNotification(Notification n) {
 
     public void update() {
         //TODO fetch model notifications
-
         for (Notification n : notifications) {
             switch (app.getState()) {
                 case MAIN:
@@ -40,6 +43,7 @@ public void update() {
                     throw new RuntimeException("no notification expected: " + n.toString());
             }
         }
+        notifications.clear();
     }
 
     private void handleMain(Notification notification) {
@@ -53,13 +57,14 @@ private void handleMain(Notification notification) {
     private void handleLobby(Notification notification) {
         LobbyView lobbyView = (LobbyView) app.getView();
 
-        if (notification instanceof TskSelectNotification) {
-            TskSelectNotification n = (TskSelectNotification)notification;
+        if (notification instanceof TskSelectNotification n) {
             lobbyView.setTaken(n.getColor(), true, n.isSelf(), n.getName());
-        } else if (notification instanceof TskUnselectNotification) {
-            TskUnselectNotification n = (TskUnselectNotification)notification;
+            lobbyView.setTaken(n.getColor(), true, false, n.getName());
+        } else if (notification instanceof TskUnselectNotification n) {
             lobbyView.setTaken(n.getColor(), false, false, null);
-        } else if (notification instanceof GameNotification) {
+            //} else if(notification instanceof LobbyReadyNotification lobbyReadyNotification) {
+            //lobbyView.setReady(lobbyReadyNotification.getColor(), lobbyReadyNotification.isReady()):
+        } else if (notification instanceof GameNotification n) {
             app.enter(MdgaState.GAME);
         } else {
             throw new RuntimeException("notification not expected: " + notification.toString());
@@ -68,59 +73,105 @@ private void handleLobby(Notification notification) {
 
     private void handleGame(Notification notification) {
         GameView gameView = (GameView) app.getView();
+        GuiHandler guiHandler = gameView.getGuiHandler();
+        BoardHandler boardHandler = gameView.getBoardHandler();
 
-        if (notification instanceof AcquireCardNotification) {
-            // Handle AcquireCardNotification
-        } else if (notification instanceof ActivePlayerNotification) {
-            // Handle ActivePlayerNotification
-        } else if (notification instanceof CeremonyNotification) {
+        if (notification instanceof AcquireCardNotification n) {
+            guiHandler.addCard(n.getBonusCard());
+        } else if (notification instanceof ActivePlayerNotification n) {
+            gameView.getGuiHandler().setActivePlayer(n.getColor());
+        } else if (notification instanceof CeremonyNotification ceremonyNotification) {
             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) {
+                throw new IllegalArgumentException("All data lists in CeremonyNotification must have the same size.");
+            }
+
+            for (int i = 0; i < size; i++) {
+                Color color = ceremonyNotification.getColors().get(i);
+                String name = ceremonyNotification.getNames().get(i);
+                int v1 = ceremonyNotification.getPiecesThrown().get(i);
+                int v2 = ceremonyNotification.getPiecesLost().get(i);
+                int v3 = ceremonyNotification.getBonusCardsPlayed().get(i);
+                int v4 = ceremonyNotification.getSixes().get(i);
+                int v5 = ceremonyNotification.getNodesMoved().get(i);
+                int v6 = ceremonyNotification.getBonusNodes().get(i);
+
+                ceremonyView.addCeremonyParticipant(color, i, name);
+                ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
+            }
         } else if (notification instanceof DiceNowNotification) {
-            // Handle DiceNowNotification
-        } else if (notification instanceof DicingNotification) {
-            // Handle DicingNotification
-        } else if (notification instanceof DrawCardNotification) {
-            // Handle DrawCardNotification
-        } else if (notification instanceof HomeMoveNotification) {
-            HomeMoveNotification n = (HomeMoveNotification)notification;
-            gameView.getBoardHandler().moveHomePiece(n.getPieceId(), n.getHomeIndex());
+            guiHandler.showDice();
+        } else if (notification instanceof DicingNotification n) {
+            //TODO ???
+        } else if (notification instanceof DrawCardNotification n) {
+            guiHandler.drawCard(n.getColor());
+        } else if (notification instanceof HomeMoveNotification home) {
+            boardHandler.moveHomePiece(home.getPieceId(), home.getHomeIndex());
+            guiHandler.hideText();
         } else if (notification instanceof InterruptNotification) {
-            // Handle InterruptNotification
-        } else if (notification instanceof MovePieceNotification) {
-            MovePieceNotification n = (MovePieceNotification)notification;
-            //gameView.getBoardHandler().movePiece(n.get); //TODO
-        } else if (notification instanceof MoveThrowPieceNotification) {
-            MoveThrowPieceNotification n = (MoveThrowPieceNotification)notification;
-            //gameView.getBoardHandler().throwPiece(n.); //TODO
-        } else if (notification instanceof NoShieldNotification) {
-            NoShieldNotification n = (NoShieldNotification)notification;
-            gameView.getBoardHandler().unshieldPiece(n.getPieceId());
-        } else if (notification instanceof PieceInGameNotification) {
-            // Handle PieceInGameNotification
-        } else if (notification instanceof PlayCardNotification) {
-            // Handle PlayCardNotification
-        } else if (notification instanceof PlayerInGameNotification) {
-            // Handle PlayerInGameNotification
+            app.enter(MdgaState.LOBBY);
+        } else if (notification instanceof MovePieceNotification n) {
+            if(n.isMoveStart()) {
+                //StartMove
+                boardHandler.movePieceStart(n.getPiece(), n.getMoveIndex());
+            }
+            else {
+                //InfieldMove
+                boardHandler.movePiece(n.getPiece(), n.getStartIndex(), n.getMoveIndex());
+            }
+        } else if (notification instanceof ThrowPieceNotification n) {
+            boardHandler.throwPiece(n.getPieceId());
+        } else if (notification instanceof NoShieldNotification n) {
+            boardHandler.unshieldPiece(n.getPieceId());
+        } else if (notification instanceof PlayCardNotification n) {
+            switch(n.getCard()){
+                case SWAP -> guiHandler.swap();
+                case TURBO -> guiHandler.turbo();
+                case SHIELD -> guiHandler.shield();
+                default -> throw new RuntimeException("invalid card");
+            }
+        } else if (notification instanceof PlayerInGameNotification n) {
+            boardHandler.addPlayer(n.getColor(),n.getPiecesList());
+            guiHandler.addPlayer(n.getColor(),n.getName());
         } else if (notification instanceof ResumeNotification) {
-            // Handle ResumeNotification
-        } else if (notification instanceof RollDiceNotification) {
-            // Handle RollDiceNotification
-        } else if (notification instanceof SelectableCardsNotification) {
-            // Handle SelectableCardsNotification
-        } else if (notification instanceof SelectablePiecesNotification) {
-            // Handle SelectablePiecesNotification
-        } else if (notification instanceof ShieldActiveNotification) {
-            ShieldActiveNotification n = (ShieldActiveNotification)notification;
-            gameView.getBoardHandler().shieldPiece(n.getPieceId());
-        } else if (notification instanceof ShieldSuppressedNotification) {
-            ShieldSuppressedNotification n = (ShieldSuppressedNotification)notification;
-            gameView.getBoardHandler().suppressShield(n.getPieceId());
+            //TODO
+        } else if (notification instanceof RollDiceNotification n) {
+            if(n.getColor() == gameView.getOwnColor()){
+                guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1);
+            }
+            else {
+                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());
+        } 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.enter(MdgaState.MAIN);
-        } else if (notification instanceof SwapPieceNotification) {
-            // Handle SwapPieceNotification
+        } else if (notification instanceof SwapPieceNotification n) {
+            boardHandler.swapPieces(n.getFirstPiece(), n.getSecondPiece());
+            guiHandler.swap();
         } else if (notification instanceof WaitMoveNotification) {
-            // Handle WaitMoveNotification
+            //TODO ???
+        } else if (notification instanceof SelectableMoveNotification n) {
+            boardHandler.outlineMove(n.getPieces(), n.getMoveIndexe(), n.getHomeMoves());
+        } else if (notification instanceof SelectableSwapNotification n) {
+            boardHandler.outlineSwap(n.getOwnPieces(), n.getEnemyPieces());
+       } else if (notification instanceof SelectableShieldNotification n) {
+            boardHandler.outlineShield(n.getPieces());
+        } else if (notification instanceof TurboActiveNotification){
+            guiHandler.turbo();
         } else {
             throw new RuntimeException("notification not expected: " + notification.toString());
         }

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

@@ -5,6 +5,7 @@
 import pp.mdga.client.MdgaState;
 
 import java.util.*;
+import java.util.prefs.Preferences;
 
 public class AcousticHandler {
     private MdgaApp app;
@@ -23,14 +24,20 @@ public class AcousticHandler {
     private GameMusic scheduled = null; // Scheduled track to play next
     private GameMusic old = null; // Old track being faded out
 
-    private float mainVolume = 1.0f;
+    private float mainVolume = 0.0f;
     private float musicVolume = 1.0f;
     private float soundVolume = 1.0f;
 
     private ArrayList<GameSound> sounds = new ArrayList<>();
 
+    private Preferences prefs = Preferences.userNodeForPackage(AcousticHandler.class);
+
     public AcousticHandler(MdgaApp app) {
         this.app = app;
+
+        mainVolume = prefs.getFloat("mainVolume", 1.0f);
+        musicVolume = prefs.getFloat("musicVolume", 1.0f);
+        soundVolume = prefs.getFloat("soundVolume", 1.0f);
     }
 
     /**
@@ -67,10 +74,42 @@ public void playSound(MdgaSound sound) {
                 assets.add(new SoundAssetDelayVolume(SoundAsset.LOST, 1.0f, 0.0f));
                 break;
             case VICTORY:
-                assets.add(new SoundAssetDelayVolume(SoundAsset.VICTORY, 1.0f, 2.0f));
+                assets.add(new SoundAssetDelayVolume(SoundAsset.VICTORY, 1.0f, 0.0f));
+                break;
+            case BUTTON_PRESSED:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.BUTTON_PRESS, 0.7f, 0.0f));
+                break;
+            case WRONG_INPUT:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.ERROR, 1.0f, 0.0f));
+                break;
+            case UI_CLICK:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.UI_CLICK, 0.8f, 0.0f));
+                break;
+            case START:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.START, 0.8f, 0.5f));
+                break;
+            case THROW:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.LAUGHT, 1.0f, 0.2f));
+                break;
+            case POWERUP:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.POWERUP, 1.0f, 0.2f));
+                break;
+            case SELF_READY:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.ROBOT_READY, 1.0f, 0.0f));
+                break;
+            case OTHER_READY:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.UNIT_READY, 1.0f, 0.0f));
+                break;
+            case OTHER_CONNECTED:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.CONNECTED, 1.0f, 0.0f));
+                break;
+            case NOT_READY:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.UI_SOUND, 1.0f, 0.0f));
+                break;
+            case LEAVE:
+                assets.add(new SoundAssetDelayVolume(SoundAsset.UI_SOUND2, 0.6f, 0.0f));
                 break;
             default:
-
                 break;
         }
 
@@ -362,6 +401,7 @@ public float getSoundVolume() {
      */
     public void setMainVolume(float mainVolume) {
         this.mainVolume = mainVolume;
+        prefs.putFloat("mainVolume", mainVolume);
     }
 
     /**
@@ -371,6 +411,7 @@ public void setMainVolume(float mainVolume) {
      */
     public void setMusicVolume(float musicVolume) {
         this.musicVolume = musicVolume;
+        prefs.putFloat("musicVolume", musicVolume);
     }
 
     /**
@@ -380,6 +421,7 @@ public void setMusicVolume(float musicVolume) {
      */
     public void setSoundVolume(float soundVolume) {
         this.soundVolume = soundVolume;
+        prefs.putFloat("soundVolume", soundVolume);
     }
 
     /**

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

@@ -19,5 +19,16 @@ public enum MdgaSound {
     DESELECT,
     HURRY,
     VICTORY,
-    LOST
+    LOST,
+    BUTTON_PRESSED,
+    WRONG_INPUT,
+    UI_CLICK,
+    START,
+    THROW,
+    POWERUP,
+    SELF_READY,
+    OTHER_READY,
+    OTHER_CONNECTED,
+    NOT_READY,
+    LEAVE,
 }

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

@@ -20,6 +20,7 @@ enum MusicAsset {
     private final String path;
     private final boolean loop;
     private final float subVolume;
+    private static final String root = "Music/";
 
     /**
      * Constructs a new MusicAsset object with the specified name and sub-volume.
@@ -29,7 +30,7 @@ enum MusicAsset {
      * @param subVolume A relative volume that modifies the base volume of the track (typically a percentage).
      */
     MusicAsset(String name, float subVolume) {
-        this.path = "music/" + name;
+        this.path = root + name;
         this.loop = false;
         this.subVolume = subVolume;
     }
@@ -42,7 +43,7 @@ enum MusicAsset {
      * @param subVolume A relative volume that modifies the base volume of the track (typically a percentage).
      */
     MusicAsset(String name, boolean loop, float subVolume) {
-        this.path = "music/" + name;
+        this.path = root + name;
         this.loop = loop;
         this.subVolume = subVolume;
     }

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

@@ -17,7 +17,18 @@ enum SoundAsset {
     DESELECT(""),
     HURRY(""),
     VICTORY("LevelUp2.wav"),
-    LOST("GameOver.wav");
+    LOST("GameOver.wav"),
+    BUTTON_PRESS("menu_button.ogg"),
+    ERROR("buzzer.wav"),
+    UI_SOUND("ui_sound.ogg"),
+    UI_SOUND2("ui_swoosch.wav"),
+    UI_CLICK("uiclick.ogg"),
+    START("gamestart.ogg"),
+    LAUGHT("laughter.wav"),
+    POWERUP("powerup.wav"),
+    ROBOT_READY("robotReady.wav"),
+    UNIT_READY("unitReady.wav"),
+    CONNECTED("connected.wav");
 
     private final String path;
 
@@ -27,7 +38,7 @@ enum SoundAsset {
      * @param name The name of the sound file.
      */
     SoundAsset(String name) {
-        this.path = "sound/" + name;
+        this.path = "Sounds/" + name;
     }
 
     /**

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

@@ -9,6 +9,7 @@
 import com.jme3.scene.control.AbstractControl;
 import pp.mdga.client.Asset;
 import pp.mdga.client.MdgaApp;
+import pp.mdga.client.gui.DiceControl;
 import pp.mdga.game.Color;
 
 import java.util.*;
@@ -16,13 +17,10 @@
 public class BoardHandler {
     private static final float GRID_SIZE = 1.72f;
     private static final float GRID_ELEVATION = 0.0f;
-    private static final String MAP_NAME = "map.mdga";
+    private static final String MAP_NAME = "Maps/map.mdga";
 
     private final MdgaApp app;
 
-    private PileControl drawPile = null;
-    private PileControl discardPile = null;
-
     private ArrayList<NodeControl> infield;
     private Map<UUID, PieceControl> pieces;
 
@@ -32,18 +30,45 @@ public class BoardHandler {
     private Map<Color, List<PieceControl>> waitingPiecesMap;
     private Map<UUID, Color> pieceColor;
 
-    private Node node;
+    private Node rootNodeBoard;
+    private final Node rootNode;
 
-    private FilterPostProcessor fpp;
+    private final FilterPostProcessor fpp;
 
-    private boolean init;
+    private boolean isInitialised;
 
-    public BoardHandler(MdgaApp app, FilterPostProcessor fpp) {
+    private List<PieceControl> selectableOwnPieces;
+    private List<PieceControl> selectableEnemyPieces;
+    private List<NodeControl> outlineNodes;
+    private PieceControl selectedOwnPiece;
+    private PieceControl selectedEnemyPiece;
+    private DiceControl diceControl;
+
+    public BoardHandler(MdgaApp app, Node rootNode, FilterPostProcessor fpp) {
         if(app == null) throw new RuntimeException("app is null");
 
-        this.init = false;
         this.app = app;
         this.fpp = fpp;
+        rootNodeBoard = new Node("Board Root Node");
+        this.rootNode = rootNode;
+        isInitialised = false;
+    }
+
+    public void init() {
+        isInitialised = true;
+        selectableOwnPieces = new ArrayList<>();
+        selectableEnemyPieces = new ArrayList<>();
+        outlineNodes = new ArrayList<>();
+        selectedOwnPiece = null;
+        selectedEnemyPiece = null;
+        initMap();
+        rootNode.attachChild(rootNodeBoard);
+    }
+
+    public void shutdown(){
+        clearSelectable();
+        isInitialised = false;
+        rootNode.detachChild(rootNodeBoard);
     }
 
     private void addFigureToPlayerMap(Color col, AssetOnMap assetOnMap) {
@@ -52,19 +77,15 @@ private void addFigureToPlayerMap(Color col, AssetOnMap assetOnMap) {
     }
 
     private void initMap() {
-        if (init) return;
-
-        this.init = true;
-        this.node = new Node("Asset Node");
-        app.getRootNode().attachChild(node);
-
-        this.pieces = new HashMap<>();
-        this.colorAssetsMap = new HashMap<>();
-        this.infield = new ArrayList<>(40);
-        this.homeNodesMap = new HashMap<>();
-        this.waitingNodesMap = new HashMap<>();
-        this.waitingPiecesMap = new HashMap<>();
-        this.pieceColor = new HashMap<>();
+        pieces = new HashMap<>();
+        colorAssetsMap = new HashMap<>();
+        infield = new ArrayList<>(40);
+        homeNodesMap = new HashMap<>();
+        waitingNodesMap = new HashMap<>();
+        waitingPiecesMap = new HashMap<>();
+        pieceColor = new HashMap<>();
+        diceControl = new DiceControl(app.getAssetManager());
+        diceControl.create(new Vector3f(0,0,0), 0.7f, true);
 
         List<AssetOnMap> assetOnMaps = MapLoader.loadMap(MAP_NAME);
 
@@ -75,7 +96,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()));
+                    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);
@@ -111,8 +132,8 @@ private Spatial createModel(Asset asset, Vector3f pos, float rot) {
         Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
         mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(texName));
         model.setMaterial(mat);
-        node.attachChild(model);
-//        app.getRootNode().attachChild(model);
+        rootNodeBoard.attachChild(model);
+
         return model;
     }
 
@@ -137,20 +158,22 @@ private void movePieceToNode(PieceControl pieceControl, NodeControl nodeControl)
     }
 
     private void addHomeNode(Map<Color, List<NodeControl>> map, Color color, AssetOnMap assetOnMap){
-        List<NodeControl> homeNodes = addItemToMapList(map, color, displayAndControl(assetOnMap, new NodeControl()));
+        List<NodeControl> homeNodes = addItemToMapList(map, color, displayAndControl(assetOnMap, new NodeControl(app, fpp)));
         if (homeNodes.size() > 4) throw new RuntimeException("too many homeNodes for " + color);
     }
 
     private float getRotationMove(Vector3f prev, Vector3f next) {
         Vector3f direction = next.subtract(prev).normalizeLocal();
         //I had to reverse dir.y, because then it worked.
-        return (float) Math.toDegrees(Math.atan2(direction.x, -direction.y));
+        float newRot = (float) Math.toDegrees(Math.atan2(direction.x, -direction.y));
+        if(newRot < 0) newRot += 360;
+        return newRot;
     }
 
-    private void movePiece_rek(UUID uuid, int curIndex, int moveIndex){
+    private void movePieceRek(UUID uuid, int curIndex, int moveIndex){
         if (curIndex == moveIndex) return;
 
-        curIndex = (curIndex + 1) % 40;
+        curIndex = (curIndex + 1) % infield.size();
 
         PieceControl pieceControl = pieces.get(uuid);
         NodeControl nodeControl = infield.get(curIndex);
@@ -159,7 +182,7 @@ private void movePiece_rek(UUID uuid, int curIndex, int moveIndex){
 
         movePieceToNode(pieceControl, nodeControl);
 
-        movePiece_rek(uuid, curIndex, moveIndex);
+        movePieceRek(uuid, curIndex, moveIndex);
     }
 
     private <T, E> List<T> addItemToMapList(Map<E,List<T>> map, E key, T item){
@@ -169,16 +192,29 @@ private <T, E> List<T> addItemToMapList(Map<E,List<T>> map, E key, T item){
         return list;
     }
 
-    private <T, E> List<T> 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);
-        return list;
+    }
+
+    private Vector3f getWaitingPos(Color color){
+        return getMeanPosition(waitingNodesMap.get(color).stream().map(NodeControl::getLocation).toList());
+    }
+
+    public static Vector3f getMeanPosition(List<Vector3f> vectors) {
+        if (vectors.isEmpty()) return new Vector3f(0, 0, 0);
+
+        Vector3f sum = new Vector3f(0, 0, 0);
+        for (Vector3f v : vectors) {
+            sum.addLocal(v);
+        }
+        return sum.divide(vectors.size());
     }
 
     //public methods****************************************************************************************************
     public void addPlayer(Color color, List<UUID> uuid) {
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         List<AssetOnMap> playerAssets = colorAssetsMap.get(color);
         if (playerAssets == null) throw new RuntimeException("Assets for Player color are not defined");
@@ -191,6 +227,7 @@ public void addPlayer(Color color, List<UUID> uuid) {
         for (int i = 0; i < playerAssets.size(); i++){
             AssetOnMap assetOnMap = playerAssets.get(i);
             PieceControl pieceControl = displayAndControl(assetOnMap, new PieceControl(assetOnMap.rot(), app.getAssetManager(), app, fpp));
+            pieceControl.setRotation(assetOnMap.rot());
             movePieceToNode(pieceControl, waitNodes.get(i));
 
             pieces.put(uuid.get(i), pieceControl);
@@ -202,7 +239,7 @@ public void addPlayer(Color color, List<UUID> uuid) {
     }
 
     public void moveHomePiece(UUID uuid, int index){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         Color color = pieceColor.get(uuid);
         if(color == null) throw new RuntimeException("uuid is not mapped to a color");
@@ -223,7 +260,7 @@ public void moveHomePiece(UUID uuid, int index){
     }
 
     public void movePieceStart(UUID uuid, int nodeIndex){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         Color color = pieceColor.get(uuid);
         if(color == null) throw new RuntimeException("uuid is not mapped to a color");
@@ -235,13 +272,13 @@ public void movePieceStart(UUID uuid, int nodeIndex){
     }
 
     public void movePiece(UUID uuid, int curIndex, int moveIndex){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
-        movePiece_rek(uuid, curIndex, moveIndex);
+        movePieceRek(uuid, curIndex, moveIndex);
     }
 
     public void throwPiece(UUID uuid){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         Color color = pieceColor.get(uuid);
         if(color == null) throw new RuntimeException("uuid is not mapped to a color");
@@ -256,68 +293,189 @@ public void throwPiece(UUID uuid){
     }
 
     public void shieldPiece(UUID uuid){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         pieces.get(uuid).activateShield();
     }
 
     public void unshieldPiece(UUID uuid){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         pieces.get(uuid).deactivateShield();
     }
 
     public void suppressShield(UUID uuid){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
         pieces.get(uuid).suppressShield();
     }
 
     public void swapPieces(UUID piece1, UUID piece2){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
 
-        PieceControl piece1_control = pieces.get(piece1);
-        PieceControl piece2_control = pieces.get(piece2);
+        PieceControl piece1Control = pieces.get(piece1);
+        PieceControl piece2Control = pieces.get(piece2);
 
-        if(piece1_control == null) throw new RuntimeException("piece1 UUID is not valid");
-        if(piece2_control == null) throw new RuntimeException("piece2 UUID is not valid");
+        if(piece1Control == null) throw new RuntimeException("piece1 UUID is not valid");
+        if(piece2Control == null) throw new RuntimeException("piece2 UUID is not valid");
 
-        float rot1 = piece1_control.getRotation();
-        float rot2 = piece2_control.getRotation();
+        float rot1 = piece1Control.getRotation();
+        float rot2 = piece2Control.getRotation();
 
-        piece1_control.setRotation(rot2);
-        piece2_control.setRotation(rot1);
+        piece1Control.setRotation(rot2);
+        piece2Control.setRotation(rot1);
 
-        Vector3f pos1 = piece1_control.getLocation().clone();
-        Vector3f pos2 = piece2_control.getLocation().clone();
+        Vector3f pos1 = piece1Control.getLocation().clone();
+        Vector3f pos2 = piece2Control.getLocation().clone();
 
-        piece1_control.setLocation(pos2);
-        piece2_control.setLocation(pos1);
+        piece1Control.setLocation(pos2);
+        piece2Control.setLocation(pos1);
     }
 
-    public void init(){
-        initMap();
-    }
-
-    public void shutdown(){
-        if (!init) return;
-
-        init = false;
-        app.getRootNode().detachChild(node);
-    }
-
-
-    //List<Pieces>
-    //List<NodesIndexe>
     public void highlight(UUID uuid, boolean bool){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+        if (!isInitialised) throw new RuntimeException("BoardHandler is not initialized");
+
+        pieces.get(uuid).highlight(bool);
+        pieces.get(uuid).setSelectable(bool);
 
-        pieces.get(uuid).outline(bool);
     }
 
-    public void unHighlight(UUID uuid){
-        if (!init) throw new RuntimeException("BoardHandler is not initialized");
+    //called when (dice) moveNum is received from server to display the movable pieces and corresponding moveNodes
+    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");
 
-        pieces.get(uuid).deOutline();
+        selectableEnemyPieces.clear();
+        selectableOwnPieces.clear();
+        selectedOwnPiece = null;
+        selectedEnemyPiece = null;
+
+        for (int i = 0; i < pieces.size(); i++) {
+            UUID uuid = pieces.get(i);
+            PieceControl pieceControl = this.pieces.get(uuid);
+            NodeControl nodeControl;
+
+            if (homeMoves.get(i)) {
+                Color color = pieceColor.get(uuid);
+                nodeControl = homeNodesMap.get(color).get(moveIndexe.get(i));
+            }
+            else {
+                nodeControl = infield.get(moveIndexe.get(i));
+            }
+            nodeControl.highlight();
+            pieceControl.highlight(false);
+            pieceControl.setHoverable(true);
+            pieceControl.setSelectable(true);
+            outlineNodes.add(nodeControl);
+            selectableOwnPieces.add(pieceControl);
         }
     }
+
+    //called when swap notification is received to highlight and select own/enemy pieces
+    public void outlineSwap(List<UUID> ownPieces, List<UUID> enemyPieces){
+
+        selectableEnemyPieces.clear();
+        selectableOwnPieces.clear();
+        selectedOwnPiece = null;
+        selectedEnemyPiece = null;
+
+        for(UUID uuid : ownPieces) {
+            PieceControl p = pieces.get(uuid);
+            p.highlight(false);
+            p.setHoverable(true);
+            p.setSelectable(true);
+            selectableOwnPieces.add(p);
+        }
+        for(UUID uuid : enemyPieces) {
+            PieceControl p = pieces.get(uuid);
+            p.highlight(true);
+            p.setHoverable(true);
+            p.setSelectable(true);
+            selectableEnemyPieces.add(p);
+        }
+    }
+
+    public void outlineShield(List<UUID> pieces){
+        selectableOwnPieces.clear();
+        selectableEnemyPieces.clear();
+        selectedOwnPiece = null;
+        selectedEnemyPiece = null;
+
+        for (UUID uuid : pieces){
+            PieceControl p = this.pieces.get(uuid);
+            p.highlight(false);
+            p.setHoverable(true);
+            p.setSelectable(true);
+            selectableOwnPieces.add(p);
+        }
+    }
+
+    //called from inputSynchronizer when a piece is selectable
+    public void pieceSelect(PieceControl pieceSelected) {
+        boolean isSelected = pieceSelected.isSelected();
+        if(selectableOwnPieces.contains(pieceSelected)){
+            for(PieceControl p : selectableOwnPieces) {
+                p.unSelect();
+            }
+            if (!isSelected) {
+                pieceSelected.select();
+                selectedOwnPiece = pieceSelected;
+            }
+            else {
+                pieceSelected.unSelect();
+                selectedOwnPiece = null;
+            }
+        }
+        else if(selectableEnemyPieces.contains(pieceSelected)) {
+            for(PieceControl p : selectableEnemyPieces) {
+                p.unSelect();
+            }
+            if (!isSelected) {
+                pieceSelected.select();
+                selectedEnemyPiece = pieceSelected;
+            }
+            else {
+                pieceSelected.unSelect();
+                selectedEnemyPiece = null;
+            }
+        }
+        else throw new RuntimeException("pieceSelected is not in own/enemySelectablePieces");
+    }
+
+    //called when view is no longer needed to select pieces
+    public void clearSelectable(){
+        for(PieceControl p : selectableEnemyPieces) {
+            p.unSelect();
+            p.unHighlight();
+            p.setSelectable(false);
+        }
+        for(PieceControl p : selectableOwnPieces) {
+            p.unSelect();
+            p.unHighlight();
+            p.setSelectable(false);
+        }
+        for(NodeControl n : outlineNodes){
+            n.deOutline();
+        }
+        outlineNodes.clear();
+        selectableEnemyPieces.clear();
+        selectableOwnPieces.clear();
+        selectedEnemyPiece = null;
+        selectedOwnPiece = null;
+    }
+
+    public void enableHover(UUID uuid){
+        pieces.get(uuid).setHoverable(true);
+    }
+
+    public void showDice(Color color){
+        rootNodeBoard.attachChild(diceControl.getSpatial());
+        diceControl.setPos(getWaitingPos(color).add(new Vector3f(0,0,4)));
+        diceControl.spin();
+    }
+
+    public void hideDice(){
+        diceControl.hide();
+    }
+
+
+}

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

@@ -4,9 +4,14 @@
 import com.jme3.light.DirectionalLight;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
+import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
+import com.jme3.scene.Spatial;
 import com.jme3.shadow.DirectionalLightShadowFilter;
+import com.jme3.shadow.EdgeFilteringMode;
+import com.jme3.util.SkyFactory;
+import com.jme3.util.SkyFactory.EnvMapType;
 import pp.mdga.client.MdgaApp;
 
 public class CameraHandler {
@@ -17,8 +22,21 @@ public class CameraHandler {
 
     private static final int SHADOWMAP_SIZE = 1024 * 8;
 
+    private Vector3f defaultCameraPosition;
+    private Quaternion defaultCameraRotation;
+
+    FilterPostProcessor fpp;
+    DirectionalLightShadowFilter dlsf;
+
+    Spatial sky;
+
     public CameraHandler(MdgaApp app, FilterPostProcessor fpp) {
         this.app = app;
+        this.fpp = fpp;
+
+        // Save the default camera state
+        this.defaultCameraPosition = app.getCamera().getLocation().clone();
+        this.defaultCameraRotation = app.getCamera().getRotation().clone();
 
         sun = new DirectionalLight();
         sun.setColor(ColorRGBA.White);
@@ -27,19 +45,34 @@ public CameraHandler(MdgaApp app, FilterPostProcessor fpp){
         ambient = new AmbientLight();
         ambient.setColor(new ColorRGBA(0.3f, 0.3f, 0.3f, 1));
 
-        DirectionalLightShadowFilter dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 4);
+        dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 1);
         dlsf.setLight(sun);
-        fpp.addFilter(dlsf);
+        dlsf.setEnabled(true);
+        dlsf.setEdgeFilteringMode(EdgeFilteringMode.PCFPOISSON);
+        dlsf.setShadowIntensity(0.7f);
+
+        sky = SkyFactory.createSky(app.getAssetManager(), "Images/sky/sky.dds", EnvMapType.EquirectMap).rotate(FastMath.HALF_PI*1,0,FastMath.HALF_PI*0.2f);
+
+
     }
 
     public void init() {
         app.getRootNode().addLight(sun);
         app.getRootNode().addLight(ambient);
+        app.getRootNode().attachChild(sky);
+        fpp.addFilter(dlsf);
     }
 
     public void shutdown() {
         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);
     }
 
     public void update(float scroll, float rotation) {

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

@@ -1,22 +1,27 @@
 package pp.mdga.client.board;
 
+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;
 
-public class NodeControl extends AbstractControl {
+public class NodeControl extends OutlineControl {
 
-    @Override
-    protected void controlUpdate(float v) {
-    }
-
-    @Override
-    protected void controlRender(RenderManager renderManager, ViewPort viewPort) {
+    private static final ColorRGBA OUTLINE_HIGHLIGHT_COLOR = ColorRGBA.White;
+    private static final int OUTLINE_HIGHLIGHT_WIDTH = 6;
 
+    public NodeControl(MdgaApp app, FilterPostProcessor fpp) {
+        super(app, fpp);
     }
 
     public Vector3f getLocation(){
         return this.getSpatial().getLocalTranslation();
     }
+
+    public void highlight() {
+        super.outline(OUTLINE_HIGHLIGHT_COLOR, OUTLINE_HIGHLIGHT_WIDTH);
+    }
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/OutlineProFilter.java

@@ -0,0 +1,79 @@
+package pp.mdga.client.board.Outline;
+
+import com.jme3.asset.AssetManager;
+import com.jme3.material.Material;
+import com.jme3.material.MaterialDef;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector2f;
+import com.jme3.post.Filter;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.texture.FrameBuffer;
+
+public class OutlineProFilter extends Filter {
+
+    private OutlinePreFilter outlinePreFilter;
+    private ColorRGBA outlineColor = new ColorRGBA(0, 1, 0, 1);
+    private float outlineWidth = 1;
+
+    public OutlineProFilter(OutlinePreFilter outlinePreFilter) {
+        super("OutlineFilter");
+        this.outlinePreFilter = outlinePreFilter;
+    }
+
+    @Override
+    protected void initFilter(AssetManager assetManager, RenderManager renderManager, ViewPort vp, int w, int h) {
+        MaterialDef matDef = (MaterialDef) assetManager.loadAsset("MatDefs/SelectObjectOutliner/OutlinePro.j3md");
+        material = new Material(matDef);
+        material.setVector2("Resolution", new Vector2f(w, h));
+        material.setColor("OutlineColor", outlineColor);
+        material.setFloat("OutlineWidth", outlineWidth);
+    }
+
+    @Override
+    protected void preFrame(float tpf) {
+        super.preFrame(tpf);
+        material.setTexture("OutlineDepthTexture", outlinePreFilter.getOutlineTexture());
+//		System.out.println("OutlineFilter.preFrame()");
+    }
+
+    @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()");
+    }
+
+    @Override
+    protected Material getMaterial() {
+        return material;
+    }
+
+    public ColorRGBA getOutlineColor() {
+        return outlineColor;
+    }
+
+    public void setOutlineColor(ColorRGBA outlineColor) {
+        this.outlineColor = outlineColor;
+        if (material != null) {
+            material.setColor("OutlineColor", outlineColor);
+        }
+    }
+
+    public float getOutlineWidth() {
+        return outlineWidth;
+    }
+
+    public void setOutlineWidth(float outlineWidth) {
+        this.outlineWidth = outlineWidth;
+        if (material != null) {
+            material.setFloat("OutlineWidth", outlineWidth);
+        }
+    }
+
+    public OutlinePreFilter getOutlinePreFilter() {
+        return outlinePreFilter;
+    }
+
+}
+

Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java

@@ -7,6 +7,7 @@
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Spatial;
+import pp.mdga.client.MdgaApp;
 
 public class SelectObjectOutliner {
 
@@ -17,16 +18,18 @@ public class SelectObjectOutliner {
     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;
 
-
-    public SelectObjectOutliner(int width, FilterPostProcessor fpp, RenderManager renderManager, AssetManager assetManager, Camera cam) {
+    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;
     }
 
     public void deselect(Spatial model) {
@@ -43,16 +46,28 @@ public void select(Spatial model, ColorRGBA color) {
         }
     }
 
+    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;
+//        });
     }
 
     private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color) {
+//        app.enqueue(() -> {
             outlineViewport = renderManager.createPreView("outlineViewport", cam);
             FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager);
 
@@ -62,10 +77,12 @@ private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color)
             outlineViewport.attachScene(model);
             outlineViewport.addProcessor(outlineFpp);
 
-        outlineFilter = new OutlineFilter(outlinePreFilter);
+            outlineFilter = new OutlineProFilter(outlinePreFilter);
             outlineFilter.setOutlineColor(color);
             outlineFilter.setOutlineWidth(width);
 
             fpp.addFilter(outlineFilter);
+//            return null;
+//        });
     }
 }

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

@@ -0,0 +1,75 @@
+package pp.mdga.client.board;
+
+import com.jme3.math.ColorRGBA;
+import com.jme3.post.FilterPostProcessor;
+import com.jme3.renderer.Camera;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.Spatial;
+import com.jme3.scene.control.AbstractControl;
+import pp.mdga.client.MdgaApp;
+import pp.mdga.client.board.Outline.SelectObjectOutliner;
+
+public class OutlineControl extends AbstractControl {
+    private static final int THICKNESS_DEFAULT = 6;
+    private final SelectObjectOutliner outlineOwn;
+    private MdgaApp app;
+
+
+    public OutlineControl(MdgaApp app, FilterPostProcessor fpp){
+        this.app = 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);
+    }
+
+    public void outline(ColorRGBA color){
+        outlineOwn.select(spatial, color);
+    }
+
+    public void outline(ColorRGBA color, int width){
+        deOutline();
+        outlineOwn.select(spatial, color, width);
+    }
+
+    public void deOutline(){
+        outlineOwn.deselect(spatial);
+    }
+
+    @Override
+    protected void controlUpdate(float tpf) {
+
+    }
+
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+
+    }
+
+    public void initSpatial(){
+
+    }
+
+    @Override
+    public void setSpatial(Spatial spatial){
+        if(this.spatial == null && spatial != null){
+            super.setSpatial(spatial);
+            initSpatial();
+        }
+        else{
+            super.setSpatial(spatial);
+        }
+    }
+
+    public MdgaApp getApp() {
+        return app;
+    }
+}

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

@@ -7,18 +7,14 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
 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.control.AbstractControl;
 import pp.mdga.client.Asset;
 import pp.mdga.client.MdgaApp;
-import pp.mdga.client.board.Outline.SelectObjectOutliner;
 
-public class PieceControl extends AbstractControl {
+public class PieceControl extends OutlineControl {
     private final float initRotation;
     private final AssetManager assetManager;
     private Spatial shieldRing;
@@ -30,40 +26,53 @@ public class PieceControl extends AbstractControl {
     private static final ColorRGBA SHIELD_SUPPRESSED_COLOR = new ColorRGBA(1f, 0.5f, 0, SHIELD_TRANSPARENCY);
     private static final float SHIELD_Z = 0f;
 
-    SelectObjectOutliner outlineOwn;
-
     private static final ColorRGBA OUTLINE_OWN_COLOR = ColorRGBA.White;
     private static final ColorRGBA OUTLINE_ENEMY_COLOR = ColorRGBA.Red;
-    private static final int OUTLINE_THICKNESS = 4;
+    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;
+    private boolean highlight;
+    private boolean selectable;
+    private boolean select;
 
 
     public PieceControl(float initRotation, AssetManager assetManager, MdgaApp app, FilterPostProcessor fpp){
-        super();
+        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);
-
-
-        outlineOwn = new SelectObjectOutliner(OUTLINE_THICKNESS, fpp, app.getRenderManager(), app.getAssetManager(), app.getCamera());
-
+        enemy = false;
+        hoverable = false;
+        highlight = false;
+        selectable = false;
+        select = false;
     }
 
     public float getRotation() {
-        return (float) Math.toDegrees(this.spatial.getLocalRotation().toAngleAxis(new Vector3f(0,0,1)));
+        return (float) Math.toDegrees(spatial.getLocalRotation().toAngleAxis(new Vector3f(0,0,1)));
     }
 
     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));
-        this.spatial.setLocalRotation(quaternion);
+        spatial.setLocalRotation(quaternion);
     }
 
     public Vector3f getLocation(){
-        return this.getSpatial().getLocalTranslation();
+        return spatial.getLocalTranslation();
     }
 
     @Override
@@ -73,31 +82,16 @@ protected void controlUpdate(float delta) {
         }
     }
 
-    @Override
-    protected void controlRender(RenderManager renderManager, ViewPort viewPort) {
-
-    }
-
     public void setLocation(Vector3f loc){
-        this.getSpatial().setLocalTranslation(loc);
+        this.spatial.setLocalTranslation(loc);
     }
 
     @Override
-    public void setSpatial(Spatial spatial){
-        if(this.getSpatial() == null && spatial != null){
-            super.setSpatial(spatial);
-            initSpatial();
-        }
-        else{
-            super.setSpatial(spatial);
-        }
-    }
-
     public void initSpatial(){
         setRotation(this.initRotation);
 
-        Node oldParent = this.spatial.getParent();
-        this.parentNode.setName(this.spatial.getName() + " Parent");
+        Node oldParent = spatial.getParent();
+        this.parentNode.setName(spatial.getName() + " Parent");
         oldParent.detachChild(this.getSpatial());
         this.parentNode.attachChild(this.getSpatial());
         oldParent.attachChild(this.parentNode);
@@ -132,19 +126,60 @@ public void suppressShield(){
     }
 
     public void setMaterial(Material mat){
-        this.spatial.setMaterial(mat);
+        spatial.setMaterial(mat);
     }
 
     public Material getMaterial(){
-        return ((Geometry) this.spatial).getMaterial();
+        return ((Geometry) getSpatial()).getMaterial();
     }
 
-    public void outline(boolean enemy) {
-        ColorRGBA color = enemy ? OUTLINE_ENEMY_COLOR : OUTLINE_OWN_COLOR;
-        outlineOwn.select(this.getSpatial(), color);
+    public void highlight(boolean enemy) {
+        this.enemy = enemy;
+        highlight = true;
+        super.outline(enemy ? OUTLINE_ENEMY_COLOR : OUTLINE_OWN_COLOR, OUTLINE_HIGHLIGHT_WIDTH);
     }
 
-    public void deOutline() {
-        outlineOwn.deselect(this.getSpatial());
+    public void unHighlight(){
+        highlight = false;
+        deOutline();
+    }
+
+    public void hover(){
+        if(!hoverable) return;
+        super.outline(enemy ? OUTLINE_ENEMY_HOVER_COLOR : OUTLINE_OWN_HOVER_COLOR, OUTLINE_HOVER_WIDTH);
+    }
+
+    public void hoverOff(){
+        if(!hoverable) return;
+
+        if(select) select();
+        else if(highlight) highlight(enemy);
+        else deOutline();
+    }
+
+    public void unSelect(){
+        select = false;
+        if(highlight) highlight(enemy);
+        else deOutline();
+    }
+
+    public void select(){
+        if(!selectable) return;
+        select = true;
+        super.outline(enemy ? OUTLINE_ENEMY_SELECT_COLOR : OUTLINE_OWN_SELECT_COLOR, OUTLINE_SELECT_WIDTH);
+    }
+
+    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/button/AbstractButton.java

@@ -0,0 +1,161 @@
+package pp.mdga.client.button;
+
+import com.jme3.font.BitmapFont;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector2f;
+import com.jme3.scene.Node;
+import com.jme3.ui.Picture;
+import pp.mdga.client.MdgaApp;
+
+/**
+ * Represents an abstract base class for creating customizable button components in a graphical user interface.
+ * This class provides the framework for rendering buttons with different visual states, such as normal and pressed,
+ * and supports position adjustments and font customization.
+ *
+ * <p>Subclasses must implement the {@link #show()} and {@link #hide()} methods to define how the button
+ * is displayed and hidden in the application.</p>
+ */
+public abstract class AbstractButton {
+    /**
+     * Color representing the normal state of the button.
+     */
+    public static final ColorRGBA BUTTON_NORMAL = ColorRGBA.fromRGBA255(233, 236, 239, 255);
+
+    /**
+     * Color representing the pressed state of the button.
+     */
+    public static final ColorRGBA BUTTON_PRESSED = ColorRGBA.fromRGBA255(105, 117, 89, 255);
+
+    /**
+     * Color representing the normal state of the button text.
+     */
+    public static final ColorRGBA TEXT_NORMAL = ColorRGBA.Black;
+
+    /**
+     * Color representing the pressed state of the button text.
+     */
+    public static final ColorRGBA TEXT_PRESSED = ColorRGBA.fromRGBA255(180, 195, 191, 255);
+
+    /**
+     * The image representing the normal state of the button.
+     */
+    protected Picture pictureNormal = new Picture("normalButton");
+
+    /**
+     * The image representing the hover state of the button.
+     */
+    protected Picture pictureHover = new Picture("normalButton");
+
+    /**
+     * The number of horizontal divisions for calculating relative sizes.
+     */
+    public static final float HORIZONTAL = 16;
+
+    /**
+     * The number of vertical divisions for calculating relative sizes.
+     */
+    public static final float VERTICAL = 9;
+
+    /**
+     * The font used for rendering text on the button.
+     */
+    protected BitmapFont font;
+
+    /**
+     * Reference to the application instance for accessing assets and settings.
+     */
+    protected final MdgaApp app;
+
+    /**
+     * Node in the scene graph to which the button belongs.
+     */
+    protected final Node node;
+
+    /**
+     * The position of the button in 2D space.
+     */
+    protected Vector2f pos;
+
+    /**
+     * Factor for scaling the font size.
+     */
+    protected float fontSizeFactor = 1.0f;
+
+    /**
+     * Computed font size based on scaling factor and screen dimensions.
+     */
+    protected float fontSize;
+
+    /**
+     * Computed horizontal step size based on screen dimensions.
+     */
+    protected float horizontalStep;
+
+    /**
+     * Computed vertical step size based on screen dimensions.
+     */
+    protected float verticalStep;
+
+    /**
+     * Computed height step size based on vertical steps.
+     */
+    protected float heightStep;
+
+    /**
+     * Computed width step size based on horizontal steps.
+     */
+    protected float widthStep;
+
+    /**
+     * Flag indicating whether adjustments are applied to the button.
+     */
+    protected boolean adjust = false;
+
+    /**
+     * 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 node the node in the scene graph to which the button is attached
+     */
+    public AbstractButton(MdgaApp app, Node node) {
+        this.app = app;
+        this.node = node;
+
+        pictureNormal.setImage(app.getAssetManager(), "Images/General_Button_normal.png", true);
+        pictureHover.setImage(app.getAssetManager(), "Images/General_Button_hover.png", true);
+
+        font = app.getAssetManager().loadFont("Fonts/Gunplay.fnt");
+    }
+
+    /**
+     * Displays the button. Implementation must define how the button is rendered on the screen.
+     */
+    public abstract void show();
+
+    /**
+     * Hides the button. Implementation must define how the button is removed from the screen.
+     */
+    public abstract void hide();
+
+    /**
+     * Sets the position of the button in 2D space.
+     *
+     * @param pos the position to set
+     */
+    public void setPos(Vector2f pos) {
+        this.pos = pos;
+    }
+
+    /**
+     * Calculates relative sizes and dimensions for the button based on the screen resolution.
+     */
+    protected void calculateRelative() {
+        fontSize = fontSizeFactor * 15 * (float) app.getCamera().getWidth() / 720;
+
+        horizontalStep = (float) app.getCamera().getWidth() / HORIZONTAL;
+        verticalStep = (float) app.getCamera().getHeight() / VERTICAL;
+        heightStep = verticalStep / 2;
+        widthStep = horizontalStep / 2;
+    }
+}

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

@@ -0,0 +1,46 @@
+package pp.mdga.client.button;
+
+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.
+ * This class extends {@link ClickButton} and provides a predefined position and size for the button.
+ * It also includes placeholder methods for handling hover events, which can be customized as needed.
+ */
+public class ButtonLeft extends ClickButton {
+
+    /**
+     * Constructs a ButtonLeft instance with the specified properties.
+     *
+     * @param app          the application instance for accessing resources and settings
+     * @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 to display on the button
+     * @param narrowFactor a factor to adjust position of the button
+     */
+    public ButtonLeft(MdgaApp app, Node node, Runnable action, String label, int narrowFactor) {
+        super(app, node, action, label, new Vector2f(5, 2), new Vector2f(0.5f * narrowFactor, 1.8f));
+    }
+
+    /**
+     * Called when the button is hovered over by the pointer.
+     * Subclasses can override this method to define specific hover behavior.
+     */
+    @Override
+    public void onHover() {
+        // Placeholder for hover behavior
+    }
+
+    /**
+     * Called when the pointer stops hovering over the button.
+     * Subclasses can override this method to define specific unhover behavior.
+     */
+    @Override
+    public void onUnHover() {
+        // Placeholder for unhover behavior
+    }
+}
+

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

@@ -0,0 +1,48 @@
+package pp.mdga.client.button;
+
+import com.jme3.math.Vector2f;
+import com.jme3.scene.Node;
+import pp.mdga.client.MdgaApp;
+
+/**
+ * Represents a specific implementation of a clickable button positioned on the right side.
+ * This class extends {@link ClickButton} and provides a predefined position and size for the button.
+ * It includes placeholder methods for handling hover events, which can be customized as needed.
+ */
+public class ButtonRight extends ClickButton {
+
+    /**
+     * Constructs a ButtonRight instance with the specified properties.
+     *
+     * @param app          the application instance for accessing resources and settings
+     * @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 to display on the button
+     * @param narrowFactor a factor to adjust the position of the button
+     */
+    public ButtonRight(MdgaApp app, Node node, Runnable action, String label, int narrowFactor) {
+        super(app, node, action, label, new Vector2f(5, 2), new Vector2f(HORIZONTAL - 0.5f * narrowFactor, 1.8f));
+
+        // Enable adjustments specific to this button
+        adjust = true;
+    }
+
+    /**
+     * Called when the button is hovered over by the pointer.
+     * Subclasses can override this method to define specific hover behavior.
+     */
+    @Override
+    public void onHover() {
+        // Placeholder for hover behavior
+    }
+
+    /**
+     * Called when the pointer stops hovering over the button.
+     * Subclasses can override this method to define specific unhover behavior.
+     */
+    @Override
+    public void onUnHover() {
+        // Placeholder for unhover behavior
+    }
+}
+

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

@@ -0,0 +1,251 @@
+package pp.mdga.client.button;
+
+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.Node;
+import com.jme3.scene.Spatial;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import pp.mdga.client.Asset;
+import pp.mdga.client.MdgaApp;
+import pp.mdga.game.Color;
+
+/**
+ * Represents a button used in a ceremony screen, with 3D model integration, customizable
+ * appearance based on type, and interactive behavior. The button can rotate and display
+ * different positions such as FIRST, SECOND, THIRD, and LOST.
+ */
+public class CeremonyButton extends ClickButton {
+
+    /**
+     * Enum representing the possible positions of the button in the ceremony screen.
+     */
+    public enum Pos {
+        FIRST,
+        SECOND,
+        THIRD,
+        LOST,
+    }
+
+    /**
+     * Fixed width of the button in the UI layout.
+     */
+    static final float WIDTH = 4.0f;
+
+    /**
+     * Node to which the 3D model associated with this button is attached.
+     */
+    private final Node node3d;
+
+    /**
+     * Flag to determine if the button's 3D model should rotate.
+     */
+    private boolean rotate = false;
+
+    /**
+     * The 3D model associated with the button.
+     */
+    private Spatial model;
+
+    /**
+     * Current rotation angle of the button's 3D model.
+     */
+    private float rot = 180;
+
+    /**
+     * The taken state of the button (default is NOT taken).
+     */
+    private LobbyButton.Taken taken = LobbyButton.Taken.NOT;
+
+    /**
+     * A label associated with the button for displaying additional information.
+     */
+    private LabelButton label;
+
+    /**
+     * 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 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
+     */
+    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));
+
+        this.node3d = node3d;
+
+        label = new LabelButton(app, node, name, new Vector2f(WIDTH, 1), new Vector2f(0, 0), true);
+
+        final float mid = HORIZONTAL / 2;
+        final float uiSpacing = 1.4f;
+        final float figSpacingX = 0.9f;
+        final float figSpacingY = 0.25f;
+
+        float uiX = mid;
+        float uiY = 6;
+        float figX = 0;
+        float figY = -0.32f;
+
+        Asset asset = switch (tsk) {
+            case CYBER -> {
+                instance.setText("CIR");
+                yield Asset.cir;
+            }
+            case AIRFORCE -> {
+                instance.setText("Luftwaffe");
+                yield Asset.lw;
+            }
+            case ARMY -> {
+                instance.setText("Heer");
+                yield Asset.heer;
+            }
+            case NAVY -> {
+                instance.setText("Marine");
+                yield Asset.marine;
+            }
+            default -> throw new RuntimeException("None is not valid");
+        };
+
+        switch (pos) {
+            case FIRST:
+                rotate = true;
+                uiX = 0;
+                figY -= 1 * figSpacingY;
+                break;
+            case SECOND:
+                adjust = true;
+                label.adjust = true;
+                uiX -= uiSpacing;
+                uiY -= 1;
+                figX -= figSpacingX;
+                figY -= 2 * figSpacingY;
+                figY -= 0.1f;
+                break;
+            case THIRD:
+                uiX += uiSpacing;
+                uiY -= 1.5f;
+                figX += figSpacingX;
+                figY -= 3 * figSpacingY;
+                figY -= 0.07f;
+                break;
+            case LOST:
+                adjust = true;
+                label.adjust = true;
+                uiX -= 2 * uiSpacing + 0.4f;
+                uiX -= WIDTH / 2;
+                uiY -= 2.0f;
+                figX -= 2.5f * figSpacingX + 0.05f;
+                figY -= 4.5f * figSpacingY;
+                break;
+        }
+
+        setPos(new Vector2f(uiX, uiY));
+        label.setPos(new Vector2f(uiX, uiY + 1));
+
+        createModel(asset, new Vector3f(figX, figY, 6));
+    }
+
+    /**
+     * Handles hover behavior by changing the button's background appearance.
+     */
+    @Override
+    public void onHover() {
+        ColorRGBA buttonNormal = BUTTON_NORMAL.clone();
+        buttonNormal.a = 0.1f;
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(buttonNormal);
+        instance.setBackground(background);
+    }
+
+    /**
+     * Handles unhover behavior by resetting the button's background appearance.
+     */
+    @Override
+    public void onUnHover() {
+        ColorRGBA buttonNormal = BUTTON_NORMAL.clone();
+        buttonNormal.a = 0.1f;
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(buttonNormal);
+        instance.setBackground(background);
+    }
+
+    /**
+     * Displays the button along with its 3D model and associated label.
+     */
+    @Override
+    public void show() {
+        release();
+
+        calculateRelative();
+        setRelative();
+
+        node.attachChild(instance);
+        node3d.attachChild(model);
+
+        label.show();
+    }
+
+    /**
+     * Hides the button along with its 3D model and associated label.
+     */
+    @Override
+    public void hide() {
+        node.detachChild(instance);
+        node3d.detachChild(model);
+
+        label.hide();
+    }
+
+    /**
+     * Updates the rotation of the button's 3D model over time.
+     *
+     * @param tpf time per frame, used for smooth rotation calculations
+     */
+    public void update(float tpf) {
+        if (rotate) {
+            rot += 140.0f * tpf;
+            rot %= 360;
+        } else {
+            rot = 180;
+        }
+
+        model.setLocalRotation(new Quaternion().fromAngles(
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
+        ));
+    }
+
+    /**
+     * Creates a 3D model associated with the button and applies its materials and position.
+     *
+     * @param asset the asset representing the 3D model and texture
+     * @param pos   the initial position of the model in 3D space
+     */
+    private void createModel(Asset asset, Vector3f pos) {
+        String modelName = asset.getModelPath();
+        String texName = asset.getDiffPath();
+
+        model = app.getAssetManager().loadModel(modelName);
+        model.scale(asset.getSize() / 2);
+        model.rotate(
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
+        );
+        model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
+
+        model.setLocalTranslation(pos);
+
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
+        mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(texName));
+        model.setMaterial(mat);
+    }
+}

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

@@ -0,0 +1,212 @@
+package pp.mdga.client.button;
+
+import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
+import com.jme3.ui.Picture;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.HAlignment;
+import com.simsilica.lemur.VAlignment;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import pp.mdga.client.MdgaApp;
+import pp.mdga.client.acoustic.MdgaSound;
+
+/**
+ * Abstract base class for creating interactive buttons with click functionality.
+ * This class extends {@link AbstractButton} and provides additional behavior such as
+ * click handling, hover effects, and alignment management.
+ */
+public abstract class ClickButton extends AbstractButton {
+
+    /**
+     * The action to be executed when the button is clicked.
+     */
+    protected final Runnable action;
+
+    /**
+     * The label or text displayed on the button.
+     */
+    protected String label;
+
+    /**
+     * The size of the button in relative units.
+     */
+    protected Vector2f size;
+
+    /**
+     * The instance of the button being managed.
+     */
+    protected Button instance;
+
+    /**
+     * 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 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
+     */
+    ClickButton(MdgaApp app, Node node, Runnable action, String label, Vector2f size, Vector2f pos) {
+        super(app, node);
+
+        this.action = action;
+        this.label = label;
+        this.pos = pos;
+        this.size = size;
+
+        instance = new Button(label);
+
+        // Add click behavior
+        instance.addClickCommands((button) -> {
+            app.getAcousticHandler().playSound(MdgaSound.BUTTON_PRESSED);
+            action.run();
+        });
+
+        // Set text alignment
+        instance.setTextHAlignment(HAlignment.Center);
+        instance.setTextVAlignment(VAlignment.Center);
+
+        // Add hover commands
+        instance.addCommands(Button.ButtonAction.HighlightOn, (button) -> click());
+        instance.addCommands(Button.ButtonAction.HighlightOff, (button) -> release());
+
+        // Set font and colors
+        instance.setFont(font);
+        instance.setFocusColor(TEXT_NORMAL);
+
+        calculateRelative();
+        setRelative();
+    }
+
+    /**
+     * Displays the button by attaching it and its background image to the node.
+     */
+    @Override
+    public void show() {
+        node.attachChild(pictureNormal);
+        release();
+
+        calculateRelative();
+        setRelative();
+        setImageRelative(pictureNormal);
+
+        node.attachChild(instance);
+    }
+
+    /**
+     * Hides the button by detaching it and its background images from the node.
+     */
+    @Override
+    public void hide() {
+        node.detachChild(instance);
+
+        if (node.hasChild(pictureNormal)) {
+            node.detachChild(pictureNormal);
+        }
+        if (node.hasChild(pictureHover)) {
+            node.detachChild(pictureHover);
+        }
+    }
+
+    /**
+     * Abstract method to define hover behavior. Must be implemented by subclasses.
+     */
+    protected abstract void onHover();
+
+    /**
+     * Abstract method to define unhover behavior. Must be implemented by subclasses.
+     */
+    protected abstract void onUnHover();
+
+    /**
+     * Handles the button click behavior, including visual feedback and sound effects.
+     */
+    protected void click() {
+        instance.setColor(TEXT_PRESSED);
+        instance.setHighlightColor(TEXT_PRESSED);
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(BUTTON_PRESSED);
+        instance.setBackground(background);
+
+        app.getAcousticHandler().playSound(MdgaSound.UI_CLICK);
+
+        if (node.hasChild(pictureNormal)) {
+            node.detachChild(pictureNormal);
+            setImageRelative(pictureHover);
+            node.attachChild(pictureHover);
+        }
+
+        onHover();
+    }
+
+    /**
+     * Resets the button to its normal state after a click or hover event.
+     */
+    protected void release() {
+        instance.setColor(TEXT_NORMAL);
+        instance.setHighlightColor(TEXT_NORMAL);
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(BUTTON_NORMAL);
+        instance.setBackground(background);
+
+        if (node.hasChild(pictureHover)) {
+            node.detachChild(pictureHover);
+            setImageRelative(pictureNormal);
+            node.attachChild(pictureNormal);
+        }
+
+        onUnHover();
+    }
+
+    /**
+     * Sets the relative size and position of the button based on screen dimensions.
+     */
+    protected void setRelative() {
+        instance.setFontSize(fontSize);
+
+        instance.setPreferredSize(new Vector3f(size.x * widthStep, size.y * heightStep, 0));
+
+        float xAdjust = 0.0f;
+        if (adjust) {
+            xAdjust = instance.getPreferredSize().x;
+        }
+
+        instance.setLocalTranslation(pos.x * horizontalStep - xAdjust, pos.y * verticalStep, -1);
+
+        final float horizontalMid = ((float) app.getCamera().getWidth() / 2) - (instance.getPreferredSize().x / 2);
+        final float verticalMid = ((float) app.getCamera().getHeight() / 2) - instance.getPreferredSize().y / 2;
+
+        if (0 == pos.x) {
+            instance.setLocalTranslation(horizontalMid, instance.getLocalTranslation().y, instance.getLocalTranslation().z);
+        }
+
+        if (0 == pos.y) {
+            instance.setLocalTranslation(instance.getLocalTranslation().x, verticalMid, instance.getLocalTranslation().z);
+        }
+    }
+
+    /**
+     * Sets the relative size and position of the button's background image.
+     *
+     * @param picture the background image to set
+     */
+    protected void setImageRelative(Picture picture) {
+        if (null == picture) {
+            return;
+        }
+
+        final float LARGER = 10;
+
+        picture.setWidth(instance.getPreferredSize().x + LARGER);
+        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
+        );
+    }
+}
+

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

@@ -0,0 +1,166 @@
+package pp.mdga.client.button;
+
+import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
+import com.simsilica.lemur.*;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import pp.mdga.client.MdgaApp;
+
+/**
+ * Represents an input button with a label and a text field, allowing users to input text.
+ * The button is designed for graphical user interfaces and supports configurable
+ * size, position, and character limit.
+ */
+public class InputButton extends AbstractButton {
+
+    /**
+     * The label associated with the input field, displayed above or beside the text field.
+     */
+    private Label label;
+
+    /**
+     * The text field where users input their text.
+     */
+    private TextField field;
+
+    /**
+     * A container to hold the label and the text field for layout management.
+     */
+    private Container container = new Container();
+
+    /**
+     * The maximum allowed length of the input text.
+     */
+    private final int maxLenght;
+
+    /**
+     * The size of the input button in relative units.
+     */
+    protected Vector2f size;
+
+    /**
+     * Constructs an InputButton with the specified label, character limit, and other properties.
+     *
+     * @param app       the application instance for accessing resources
+     * @param node      the node in the scene graph to which the input button belongs
+     * @param label     the label displayed with the input field
+     * @param maxLenght the maximum number of characters allowed in the input field
+     */
+    public InputButton(MdgaApp app, Node node, String label, int maxLenght) {
+        super(app, node);
+
+        this.label = new Label(label);
+        this.maxLenght = maxLenght;
+
+        // Configure label properties
+        this.label.setColor(TEXT_NORMAL);
+
+        // Configure text field properties
+        field = new TextField("");
+        field.setColor(TEXT_NORMAL);
+        field.setTextHAlignment(HAlignment.Left);
+        field.setTextVAlignment(VAlignment.Center);
+
+        // Set background for the text field
+        QuadBackgroundComponent grayBackground = new QuadBackgroundComponent(BUTTON_NORMAL);
+        field.setBackground(grayBackground);
+
+        // Set fonts for label and text field
+        this.label.setFont(font);
+        field.setFont(font);
+
+        // Default position and size
+        pos = new Vector2f(0, 0);
+        size = new Vector2f(5.5f, 1);
+
+        // Add components to the container
+        container.addChild(this.label);
+        container.addChild(field);
+    }
+
+    /**
+     * Displays the input button by attaching it to the scene graph node.
+     */
+    @Override
+    public void show() {
+        calculateRelative();
+        setRelative();
+
+        node.attachChild(container);
+    }
+
+    /**
+     * Hides the input button by detaching it from the scene graph node.
+     */
+    @Override
+    public void hide() {
+        node.detachChild(container);
+    }
+
+    /**
+     * Updates the input field, enforcing the character limit.
+     * Trims the text if it exceeds the maximum allowed length.
+     */
+    public void update() {
+        String text = field.getText();
+        int length = text.length();
+
+        if (length > maxLenght) {
+            field.setText(text.substring(0, maxLenght));
+        }
+    }
+
+    /**
+     * Adjusts the relative size and position of the input button based on the screen resolution.
+     */
+    protected void setRelative() {
+        this.label.setFontSize(fontSize);
+        field.setFontSize(fontSize);
+
+        field.setPreferredSize(new Vector3f(size.x * widthStep, size.y * heightStep, 0));
+
+        float xAdjust = 0.0f;
+        if (adjust) {
+            xAdjust = container.getPreferredSize().x;
+        }
+
+        container.setLocalTranslation(pos.x * horizontalStep - xAdjust, pos.y * verticalStep, -1);
+
+        final float horizontalMid = ((float) app.getCamera().getWidth() / 2) - (container.getPreferredSize().x / 2);
+        final float verticalMid = ((float) app.getCamera().getHeight() / 2) - container.getPreferredSize().y / 2;
+
+        if (0 == pos.x) {
+            container.setLocalTranslation(horizontalMid, container.getLocalTranslation().y, -1);
+        }
+
+        if (0 == pos.y) {
+            container.setLocalTranslation(container.getLocalTranslation().x, verticalMid, -1);
+        }
+    }
+
+    /**
+     * Retrieves the text currently entered in the input field.
+     *
+     * @return the current text in the input field
+     */
+    public String getString() {
+        return field.getText();
+    }
+
+    /**
+     * Sets the text of the input field to the specified string.
+     *
+     * @param string the text to set in the input field
+     */
+    public void setString(String string) {
+        field.setText(string);
+    }
+
+    /**
+     * Resets the input field by clearing its text.
+     */
+    public void reset() {
+        field.setText("");
+    }
+}

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

@@ -0,0 +1,131 @@
+package pp.mdga.client.button;
+
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector2f;
+import com.jme3.scene.Node;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import pp.mdga.client.MdgaApp;
+
+/**
+ * A specialized button that can function as a label or a clickable button.
+ * It inherits from {@link ClickButton} and allows for flexible usage with or without button-like behavior.
+ */
+public class LabelButton extends ClickButton {
+
+    /**
+     * The color of the text displayed on the label or button.
+     */
+    private ColorRGBA text = TEXT_NORMAL;
+
+    /**
+     * The color of the button's background.
+     */
+    private ColorRGBA button = BUTTON_NORMAL;
+
+    /**
+     * Flag indicating whether this component functions as a button.
+     */
+    private boolean isButton;
+
+    /**
+     * Constructs a LabelButton 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 label    the text displayed on the label or button
+     * @param size     the size of the label or button
+     * @param pos      the position of the label or button in relative units
+     * @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);
+
+        this.isButton = isButton;
+
+        // Use the same image for hover and normal states
+        pictureHover = pictureNormal;
+    }
+
+    /**
+     * Displays the label or button, attaching it to the scene graph.
+     * If the component is a button, it also attaches the background image.
+     */
+    @Override
+    public void show() {
+        if (isButton) {
+            node.attachChild(pictureNormal);
+        }
+        release();
+
+        calculateRelative();
+        setRelative();
+        setImageRelative(pictureNormal);
+
+        instance.setFontSize(fontSize / 2);
+
+        node.attachChild(instance);
+    }
+
+    /**
+     * Hides the label or button, detaching it from the scene graph.
+     */
+    @Override
+    public void hide() {
+        node.detachChild(instance);
+
+        if (node.hasChild(pictureNormal)) {
+            node.detachChild(pictureNormal);
+        }
+        if (node.hasChild(pictureHover)) {
+            node.detachChild(pictureHover);
+        }
+    }
+
+    /**
+     * Handles hover behavior, updating the colors of the text and background.
+     */
+    @Override
+    public void onHover() {
+        instance.setColor(text);
+        instance.setHighlightColor(text);
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(button);
+        instance.setBackground(background);
+    }
+
+    /**
+     * Handles unhover behavior, restoring the colors of the text and background.
+     */
+    @Override
+    public void onUnHover() {
+        instance.setColor(text);
+        instance.setHighlightColor(text);
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(button);
+        instance.setBackground(background);
+    }
+
+    /**
+     * Sets the text displayed on the label or button.
+     *
+     * @param text the text to display
+     */
+    public void setText(String text) {
+        instance.setText(text);
+    }
+
+    /**
+     * Sets the colors of the text and background, and refreshes the label or button.
+     *
+     * @param text   the color of the text
+     * @param button the color of the button's background
+     */
+    public void setColor(ColorRGBA text, ColorRGBA button) {
+        this.text = text;
+        this.button = button;
+
+        hide();
+        show();
+    }
+}
+

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

@@ -0,0 +1,334 @@
+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;
+import pp.mdga.game.Color;
+
+/**
+ * Represents a button in a multiplayer lobby screen. The button supports multiple states
+ * (not taken, self, other) and displays a 3D model alongside its label. It can also indicate readiness
+ * and interactively respond to hover and click events.
+ */
+public class LobbyButton extends ClickButton {
+
+    /**
+     * Enum representing the possible ownership states of the lobby button.
+     */
+    public enum Taken {
+        NOT,   // The button is not taken
+        SELF,  // The button is taken by the user
+        OTHER  // The button is taken by another user
+    }
+
+    /**
+     * Color for a lobby button that is taken by another user.
+     */
+    static final ColorRGBA LOBBY_TAKEN = ColorRGBA.fromRGBA255(193, 58, 59, 100);
+
+    /**
+     * Color for a lobby button that is ready but not hovered.
+     */
+    static final ColorRGBA LOBBY_READY = ColorRGBA.fromRGBA255(55, 172, 190, 100);
+
+    /**
+     * Color for a lobby button that is ready and hovered.
+     */
+    static final ColorRGBA LOBBY_READY_HOVER = ColorRGBA.fromRGBA255(17, 211, 218, 100);
+
+    /**
+     * Color for a lobby button owned by the user in normal state.
+     */
+    static final ColorRGBA LOBBY_SELF_NORMAL = ColorRGBA.fromRGBA255(0, 151, 19, 100);
+
+    /**
+     * Color for a lobby button owned by the user when hovered.
+     */
+    static final ColorRGBA LOBBY_SELF_HOVER = ColorRGBA.fromRGBA255(0, 230, 19, 100);
+
+    /**
+     * Fixed width for the lobby button.
+     */
+    static final float WIDTH = 4.0f;
+
+    /**
+     * Node to which the 3D model associated with this button is attached.
+     */
+    private final Node node3d;
+
+    /**
+     * Indicates whether the 3D model should rotate.
+     */
+    private boolean rotate = false;
+
+    /**
+     * The 3D model displayed alongside the button.
+     */
+    private Spatial model;
+
+    /**
+     * The rotation angle of the 3D model.
+     */
+    private float rot = 180;
+
+    /**
+     * The current ownership state of the lobby button.
+     */
+    private Taken taken = Taken.NOT;
+
+    /**
+     * Label displayed on the lobby button.
+     */
+    private LabelButton label;
+
+    /**
+     * Indicates whether the button represents a ready state.
+     */
+    private boolean isReady = false;
+
+    /**
+     * 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)
+     */
+    public LobbyButton(MdgaApp app, Node node, Node node3d, Runnable action, Color tsk) {
+        super(app, node, action, "", new Vector2f(WIDTH, 7), new Vector2f(0, 0));
+
+        this.node3d = node3d;
+
+        label = new LabelButton(app, node, "- leer -", new Vector2f(WIDTH, 1), new Vector2f(0, 0), true);
+
+        final float mid = HORIZONTAL / 2;
+        final float uiSpacing = 0.4f;
+        final float figSpacing = 0.51f;
+
+        float uiX = mid;
+        float figX = 0;
+        Asset asset = null;
+
+        // Configure the button based on its type
+        switch (tsk) {
+            case CYBER:
+                adjust = true;
+                label.adjust = true;
+                uiX -= 3 * uiSpacing;
+                uiX -= WIDTH / 2;
+                asset = Asset.cir;
+                figX -= 3 * figSpacing;
+                instance.setText("CIR");
+                break;
+            case AIRFORCE:
+                adjust = true;
+                label.adjust = true;
+                uiX -= uiSpacing;
+                asset = Asset.lw;
+                figX -= figSpacing;
+                instance.setText("Luftwaffe");
+                break;
+            case ARMY:
+                uiX += uiSpacing;
+                asset = Asset.heer;
+                figX += figSpacing;
+                instance.setText("Heer");
+                break;
+            case NAVY:
+                uiX += 3 * uiSpacing;
+                uiX += WIDTH / 2;
+                asset = Asset.marine;
+                figX += 3 * figSpacing;
+                instance.setText("Marine");
+                break;
+        }
+
+        setPos(new Vector2f(uiX, 6));
+        label.setPos(new Vector2f(uiX, 7));
+
+        createModel(asset, new Vector3f(figX, -0.55f, 6));
+    }
+
+    /**
+     * Handles hover behavior, updating the button's color and enabling rotation.
+     */
+    @Override
+    public void onHover() {
+        ColorRGBA buttonPressed = BUTTON_PRESSED.clone();
+
+        switch (taken) {
+            case NOT:
+                buttonPressed.a = 0.3f;
+                break;
+            case SELF:
+                buttonPressed = LOBBY_SELF_HOVER;
+                break;
+            case OTHER:
+                buttonPressed = LOBBY_TAKEN;
+                break;
+        }
+
+        if (isReady) {
+            buttonPressed = LOBBY_READY_HOVER;
+        }
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(buttonPressed);
+        instance.setBackground(background);
+
+        rotate = true;
+    }
+
+    /**
+     * Handles unhover behavior, restoring the button's color and disabling rotation.
+     */
+    @Override
+    public void onUnHover() {
+        ColorRGBA buttonNormal = BUTTON_NORMAL.clone();
+
+        switch (taken) {
+            case NOT:
+                buttonNormal.a = 0.3f;
+                break;
+            case SELF:
+                buttonNormal = LOBBY_SELF_NORMAL;
+                break;
+            case OTHER:
+                buttonNormal = LOBBY_TAKEN;
+                break;
+        }
+
+        if (isReady) {
+            buttonNormal = LOBBY_READY;
+        }
+
+        QuadBackgroundComponent background = new QuadBackgroundComponent(buttonNormal);
+        instance.setBackground(background);
+
+        rotate = false;
+    }
+
+    /**
+     * Displays the lobby button and its associated components.
+     */
+    @Override
+    public void show() {
+        release();
+
+        calculateRelative();
+        setRelative();
+
+        node.attachChild(instance);
+        node3d.attachChild(model);
+
+        label.show();
+    }
+
+    /**
+     * Hides the lobby button and its associated components.
+     */
+    @Override
+    public void hide() {
+        node.detachChild(instance);
+        node3d.detachChild(model);
+
+        label.hide();
+    }
+
+    /**
+     * Updates the 3D model's rotation if the button is being hovered.
+     *
+     * @param tpf time per frame, used for smooth rotation calculations
+     */
+    public void update(float tpf) {
+        if (rotate) {
+            rot += 140.0f * tpf;
+            rot %= 360;
+        } else {
+            rot = 180;
+        }
+
+        model.setLocalRotation(new Quaternion().fromAngles(
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
+        ));
+    }
+
+    /**
+     * Creates the 3D model associated with the lobby button and applies textures and positioning.
+     *
+     * @param asset the asset representing the 3D model
+     * @param pos   the initial position of the 3D model
+     */
+    private void createModel(Asset asset, Vector3f pos) {
+        String modelName = asset.getModelPath();
+        String texName = asset.getDiffPath();
+
+        model = app.getAssetManager().loadModel(modelName);
+        model.scale(asset.getSize() / 2);
+        model.rotate(
+            (float) Math.toRadians(90),
+            (float) Math.toRadians(rot),
+            (float) Math.toRadians(180)
+        );
+        model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
+
+        model.setLocalTranslation(pos);
+
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
+        mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(texName));
+        model.setMaterial(mat);
+    }
+
+    /**
+     * Gets the current ownership state of the lobby button.
+     *
+     * @return the current state of the button
+     */
+    public Taken getTaken() {
+        return taken;
+    }
+
+    /**
+     * Sets the ownership state of the lobby button and updates its label accordingly.
+     *
+     * @param taken the new ownership state
+     * @param name  the name to display on the button
+     */
+    public void setTaken(Taken taken, String name) {
+        this.taken = taken;
+
+        if (taken == Taken.NOT) {
+            label.setText("- leer -");
+            isReady = false;
+        } else {
+            label.setText(name);
+        }
+
+        onUnHover();
+    }
+
+    /**
+     * Sets the ready state of the lobby button and updates its appearance.
+     *
+     * @param isReady whether the button represents a ready state
+     */
+    public void setReady(boolean isReady) {
+        this.isReady = isReady;
+        onUnHover();
+    }
+}
+

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

@@ -0,0 +1,43 @@
+package pp.mdga.client.button;
+
+import com.jme3.math.Vector2f;
+import com.jme3.scene.Node;
+import pp.mdga.client.MdgaApp;
+
+/**
+ * Represents a button used in menu screens for navigation or executing actions.
+ * Inherits from {@link ClickButton} and provides customizable text and actions.
+ */
+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
+     */
+    public MenuButton(MdgaApp app, Node node, Runnable action, String label) {
+        super(app, node, action, label, new Vector2f(5.5f, 2), new Vector2f(0, 0));
+    }
+
+    /**
+     * Called when the button is hovered over. Can be overridden to define hover-specific behavior.
+     * Currently, no additional behavior is implemented.
+     */
+    @Override
+    public void onHover() {
+        // Placeholder for hover behavior
+    }
+
+    /**
+     * Called when the pointer stops hovering over the button. Can be overridden to define unhover-specific behavior.
+     * Currently, no additional behavior is implemented.
+     */
+    @Override
+    public void onUnHover() {
+        // Placeholder for unhover behavior
+    }
+}
+

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

@@ -0,0 +1,75 @@
+package pp.mdga.client.button;
+
+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;
+
+/**
+ * Represents a button in the settings menu, designed to display an icon and handle hover effects.
+ * Inherits from {@link ClickButton} and customizes its behavior for settings functionality.
+ */
+public class SettingsButton extends ClickButton {
+
+    /**
+     * The icon displayed on the button, which changes based on hover state.
+     */
+    private IconComponent icon;
+
+    /**
+     * Constructs a SettingsButton with a predefined size and position.
+     *
+     * @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
+     */
+    public SettingsButton(MdgaApp app, Node node, Runnable action) {
+        super(app, node, action, "", new Vector2f(2, 2), new Vector2f(HORIZONTAL - 0.5f, VERTICAL - 0.5f));
+
+        // Enable adjustment for positioning
+        adjust = true;
+    }
+
+    /**
+     * Displays the settings button by attaching it to the scene graph.
+     */
+    @Override
+    public void show() {
+        release();
+
+        calculateRelative();
+        setRelative();
+        setImageRelative(pictureNormal);
+
+        node.attachChild(instance);
+    }
+
+    /**
+     * Handles hover behavior by changing the icon to the hover state.
+     */
+    @Override
+    public void onHover() {
+        icon = new IconComponent("Images/Settings_Button_hover.png");
+        icon.setIconScale(0.02f * app.getImageScale());
+        icon.setHAlignment(HAlignment.Center);
+        icon.setVAlignment(VAlignment.Center);
+
+        instance.setIcon(icon);
+    }
+
+    /**
+     * Handles unhover behavior by restoring the icon to the normal state.
+     */
+    @Override
+    public void onUnHover() {
+        icon = new IconComponent("Images/Settings_Button_normal.png");
+        icon.setIconScale(0.02f * app.getImageScale());
+        icon.setHAlignment(HAlignment.Center);
+        icon.setVAlignment(VAlignment.Center);
+
+        instance.setIcon(icon);
+    }
+}
+

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

@@ -0,0 +1,163 @@
+package pp.mdga.client.button;
+
+import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
+import com.simsilica.lemur.*;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import pp.mdga.client.MdgaApp;
+
+/**
+ * Represents a slider button component with a label, providing functionality for
+ * adjusting values in a graphical user interface. It includes increment, decrement,
+ * and thumb buttons, allowing for interactive adjustments.
+ */
+public class SliderButton extends AbstractButton {
+
+    /**
+     * The label displayed next to the slider.
+     */
+    private Label label;
+
+    /**
+     * The slider component for adjusting values.
+     */
+    private Slider slider;
+
+    /**
+     * A container to hold the label and slider for layout management.
+     */
+    private Container container = new Container();
+
+    /**
+     * The size of the slider button in relative units.
+     */
+    protected Vector2f size;
+
+    /**
+     * Constructs a SliderButton with the specified label.
+     *
+     * @param app   the application instance for accessing resources
+     * @param node  the node in the scene graph to which the slider button belongs
+     * @param label the text label displayed alongside the slider
+     */
+    public SliderButton(MdgaApp app, Node node, String label) {
+        super(app, node);
+
+        this.label = new Label(label);
+        this.label.setColor(TEXT_NORMAL);
+
+        // Configure the slider
+        slider = new Slider("slider");
+
+        // Configure decrement button
+        slider.getDecrementButton().setText(" - ");
+        slider.getDecrementButton().setFont(font);
+        slider.getDecrementButton().setFocusColor(TEXT_NORMAL);
+        slider.getDecrementButton().setTextVAlignment(VAlignment.Bottom);
+        slider.getDecrementButton().setColor(TEXT_NORMAL);
+        slider.getDecrementButton().setHighlightColor(TEXT_NORMAL);
+
+        // Configure increment button
+        slider.getIncrementButton().setText(" + ");
+        slider.getIncrementButton().setFont(font);
+        slider.getIncrementButton().setFocusColor(TEXT_NORMAL);
+        slider.getIncrementButton().setTextVAlignment(VAlignment.Bottom);
+        slider.getIncrementButton().setColor(TEXT_NORMAL);
+        slider.getIncrementButton().setHighlightColor(TEXT_NORMAL);
+
+        // Configure thumb button
+        slider.getThumbButton().setText("X");
+        slider.getThumbButton().setFont(font);
+        slider.getThumbButton().setFocusColor(TEXT_NORMAL);
+        slider.getThumbButton().setColor(TEXT_NORMAL);
+        slider.getThumbButton().setHighlightColor(TEXT_NORMAL);
+
+        // Set slider background
+        QuadBackgroundComponent background = new QuadBackgroundComponent(BUTTON_NORMAL);
+        slider.setBackground(background);
+
+        // Configure the label font
+        this.label.setFont(font);
+
+        // Default position and size
+        pos = new Vector2f(0, 0);
+        size = new Vector2f(5.5f, 1);
+
+        // Add label and slider to container
+        container.addChild(this.label);
+        container.addChild(slider);
+    }
+
+    /**
+     * Displays the slider button by attaching its container to the scene graph.
+     */
+    @Override
+    public void show() {
+        calculateRelative();
+        setRelative();
+
+        node.attachChild(container);
+    }
+
+    /**
+     * Hides the slider button by detaching its container from the scene graph.
+     */
+    @Override
+    public void hide() {
+        node.detachChild(container);
+    }
+
+    /**
+     * Sets the relative size and position of the slider button based on screen resolution.
+     */
+    protected void setRelative() {
+        this.label.setFontSize(fontSize);
+
+        // Set font sizes for slider components
+        slider.getDecrementButton().setFontSize(fontSize);
+        slider.getIncrementButton().setFontSize(fontSize);
+        slider.getThumbButton().setFontSize(fontSize);
+
+        // Set slider size
+        slider.setPreferredSize(new Vector3f(size.x * widthStep, size.y * heightStep, 0));
+
+        float xAdjust = 0.0f;
+        if (adjust) {
+            xAdjust = container.getPreferredSize().x;
+        }
+
+        // Set container position
+        container.setLocalTranslation(pos.x * horizontalStep - xAdjust, pos.y * verticalStep, -1);
+
+        final float horizontalMid = ((float) app.getCamera().getWidth() / 2) - (container.getPreferredSize().x / 2);
+        final float verticalMid = ((float) app.getCamera().getHeight() / 2) - container.getPreferredSize().y / 2;
+
+        if (0 == pos.x) {
+            container.setLocalTranslation(horizontalMid, container.getLocalTranslation().y, -1);
+        }
+
+        if (0 == pos.y) {
+            container.setLocalTranslation(container.getLocalTranslation().x, verticalMid, -1);
+        }
+    }
+
+    /**
+     * Retrieves the current percentage value of the slider.
+     *
+     * @return the current percentage value as a float
+     */
+    public float getPercent() {
+        return (float) slider.getModel().getPercent();
+    }
+
+    /**
+     * Sets the slider to the specified percentage value.
+     *
+     * @param percent the percentage value to set
+     */
+    public void setPercent(float percent) {
+        slider.getModel().setPercent(percent);
+    }
+}
+

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

@@ -0,0 +1,80 @@
+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.MenuButton;
+import pp.mdga.client.button.SliderButton;
+import pp.mdga.client.view.MdgaView;
+
+public class AudioSettingsDialog extends Dialog {
+    private final MdgaView view;
+
+    private SliderButton mainVolume;
+    private SliderButton musicVolume;
+    private SliderButton soundVolume;
+
+    private MenuButton backButton;
+
+    private boolean active = false;
+
+    public AudioSettingsDialog(MdgaApp app, Node node, MdgaView view) {
+        super(app, node);
+
+        this.view = view;
+
+        mainVolume = new SliderButton(app, node, "Gesamt Lautstärke");
+        musicVolume = new SliderButton(app, node, "Musik Lautstärke");
+        soundVolume = new SliderButton(app, node, "Effekt Lautstärke");
+
+        backButton = new MenuButton(app, node, view::leaveAudioSettings, "Zurück");
+
+        float offset = 2.8f;
+
+        mainVolume.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.0f;
+
+        musicVolume.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.0f;
+
+        soundVolume.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+
+        backButton.setPos(new Vector2f(0, 1.8f));
+    }
+
+    @Override
+    protected void onShow() {
+        active = true;
+
+        mainVolume.setPercent(app.getAcousticHandler().getMainVolume());
+        musicVolume.setPercent(app.getAcousticHandler().getMusicVolume());
+        soundVolume.setPercent(app.getAcousticHandler().getSoundVolume());
+
+        backButton.show();
+
+        mainVolume.show();
+        musicVolume.show();
+        soundVolume.show();
+    }
+
+    @Override
+    protected void onHide() {
+        active = false;
+
+        backButton.hide();
+
+        mainVolume.hide();
+        musicVolume.hide();
+        soundVolume.hide();
+    }
+
+    public void update() {
+        if(!active) {
+            return;
+        }
+
+        app.getAcousticHandler().setMainVolume(mainVolume.getPercent());
+        app.getAcousticHandler().setMusicVolume(musicVolume.getPercent());
+        app.getAcousticHandler().setSoundVolume(soundVolume.getPercent());
+    }
+}

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

@@ -0,0 +1,105 @@
+package pp.mdga.client.dialog;
+
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector2f;
+import com.jme3.scene.Node;
+import pp.mdga.client.MdgaApp;
+import pp.mdga.client.button.AbstractButton;
+import pp.mdga.client.button.LabelButton;
+import pp.mdga.client.button.MenuButton;
+
+import java.util.ArrayList;
+
+public class CeremonyDialog extends Dialog {
+    private ArrayList<ArrayList<LabelButton>> labels;
+
+    float offsetX;
+
+    public CeremonyDialog(MdgaApp app, Node node) {
+        super(app, node);
+
+        prepare();
+    }
+
+    @Override
+    protected void onShow() {
+        for (ArrayList<LabelButton> row : labels) {
+            for (LabelButton b : row) {
+                b.show();
+            }
+        }
+    }
+
+    @Override
+    protected void onHide() {
+        for (ArrayList<LabelButton> row : labels) {
+            for (LabelButton b : row) {
+                b.hide();
+            }
+        }
+    }
+
+    public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) {
+        float offsetYSmall = 0.5f;
+
+        ArrayList<LabelButton> row = new ArrayList<>();
+
+        Vector2f sizeSmall = new Vector2f(4, 1.2f);
+        row.add(new LabelButton(app, node, name, sizeSmall, new Vector2f(), true));
+        row.add(new LabelButton(app, node, "" + v1, sizeSmall, new Vector2f(), false));
+        row.add(new LabelButton(app, node, "" + v2, sizeSmall, new Vector2f(), false));
+        row.add(new LabelButton(app, node, "" + v3, sizeSmall, new Vector2f(), false));
+        row.add(new LabelButton(app, node, "" + v4, sizeSmall, new Vector2f(), false));
+        row.add(new LabelButton(app, node, "" + v5, sizeSmall, new Vector2f(), false));
+        row.add(new LabelButton(app, node, "" + v6, sizeSmall, new Vector2f(), false));
+
+        ColorRGBA colorText = AbstractButton.TEXT_NORMAL.clone();
+        colorText.a = 0.2f;
+
+        ColorRGBA colorButton = AbstractButton.BUTTON_NORMAL.clone();
+        colorButton.a = 0.2f;
+
+        int j = 0;
+        for (LabelButton b : row) {
+            if(j > 0) {
+                b.setColor(colorText, colorButton);
+            }
+
+            b.setPos(new Vector2f(offsetX, MenuButton.VERTICAL - offsetYSmall));
+            offsetYSmall += 0.8f;
+
+            j++;
+        }
+
+        offsetX += 2.3f;
+
+        labels.add(row);
+    }
+
+    public void prepare() {
+        offsetX = 0.5f;
+
+        labels = new ArrayList<>();
+
+        ArrayList<LabelButton> first = new ArrayList<>();
+        Vector2f size = new Vector2f(4, 1.2f);
+        first.add(new LabelButton(app, node, "", size, new Vector2f(), true));
+        first.add(new LabelButton(app, node, "Figuren geworfen", size, new Vector2f(), true));
+        first.add(new LabelButton(app, node, "Figuren verloren", size, new Vector2f(), true));
+        first.add(new LabelButton(app, node, "Gespielte Bonuskarten", size, new Vector2f(), true));
+        first.add(new LabelButton(app, node, "Gewürfelte 6en", size, new Vector2f(), true));
+        first.add(new LabelButton(app, node, "Gelaufene Felder", size, new Vector2f(), true));
+        first.add(new LabelButton(app, node, "Bonusfeldern erreicht", size, new Vector2f(), true));
+
+        float offsetY = 0.5f;
+
+        for (LabelButton b : first) {
+            b.setPos(new Vector2f(offsetX, MenuButton.VERTICAL - offsetY));
+            offsetY += 0.8f;
+        }
+
+        offsetX += 2.3f;
+
+        labels.add(first);
+    }
+}

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

@@ -1,82 +1,32 @@
 package pp.mdga.client.dialog;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
-import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
-import com.simsilica.lemur.HAlignment;
-import com.simsilica.lemur.VAlignment;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
 import pp.mdga.client.MdgaApp;
 
-import static com.jme3.math.FastMath.floor;
-
 public abstract class Dialog {
-    protected final ColorRGBA COLOR_DEFAULT = ColorRGBA.Gray;
-    protected final ColorRGBA COLOR_HOVER = ColorRGBA.DarkGray;
-
-    protected Container container;
-
     protected final MdgaApp app;
-    private final Node node;
+    protected final Node node = new Node();
 
-    protected final float vertical_step;
-    protected final float horitontal_step;
+    private final Node root;
 
-    protected float fontSize = 35;
-
-    public Dialog(MdgaApp app, Node node) {
+    Dialog(MdgaApp app, Node node) {
         this.app = app;
-        this.node = node;
-        this.container = new Container();
-
-        this.horitontal_step = app.getCamera().getWidth() / 16;
-        this.vertical_step = app.getCamera().getHeight() / 9;
-
-        int val = (int) (32 * Math.min(app.getResolutionFactor() * 0.9f, 1));
-        fontSize = val;
+        this.root = node;
     }
 
     public void show() {
-        node.attachChild(container);
+        root.attachChild(node);
+
+        onShow();
     }
 
     public void hide() {
-        node.detachChild(container);
+        root.detachChild(node);
+
+        onHide();
     }
 
-    protected void createButton(String label, Runnable action, Vector3f size) {
-        Button button = new Button(label);
-        button.addClickCommands(source -> action.run());
-        button.setFontSize(fontSize);
-        button.setHighlightColor(ColorRGBA.White);
-        button.setColor(ColorRGBA.Black);
-        button.setPreferredSize(size);
-        button.setTextHAlignment(HAlignment.Center);
-        button.setTextVAlignment(VAlignment.Center);
-
-        QuadBackgroundComponent background = new QuadBackgroundComponent(COLOR_DEFAULT);
-        background.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-        button.setBackground(background);
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOn, (source) -> {
-            QuadBackgroundComponent hoverBackground = new QuadBackgroundComponent(COLOR_HOVER);
-            hoverBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(hoverBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOff, (source) -> {
-            QuadBackgroundComponent normalBackground = new QuadBackgroundComponent(COLOR_DEFAULT);
-            normalBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(normalBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        container.addChild(button);
+    protected abstract void onShow();
+    protected abstract void onHide ();
 }
-}
-

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

@@ -1,15 +0,0 @@
-package pp.mdga.client.dialog;
-
-import java.util.function.Supplier;
-
-public class GetPercentRunnable {
-    private final Supplier<Float> action;
-
-    public GetPercentRunnable(Supplier<Float> action) {
-        this.action = action;
-    }
-
-    public float get() {
-        return action.get();
-    }
-}

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

@@ -1,143 +1,68 @@
 package pp.mdga.client.dialog;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
+import com.jme3.math.Vector2f;
 import com.jme3.scene.Node;
-import com.jme3.texture.Texture;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.component.SpringGridLayout;
 import pp.mdga.client.MdgaApp;
+import pp.mdga.client.button.ButtonLeft;
+import pp.mdga.client.button.ButtonRight;
+import pp.mdga.client.button.InputButton;
+import pp.mdga.client.button.MenuButton;
+import pp.mdga.client.view.MainView;
+
+import java.util.prefs.Preferences;
 
 public class HostDialog  extends Dialog {
-    private TextField portInput;
+    private InputButton portInput;
 
-    public HostDialog(MdgaApp app, Node node, Runnable backAction) {
+    private ButtonRight hostButton;
+    private ButtonLeft backButton;
+
+    private final MainView view;
+
+    private Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
+
+    public HostDialog(MdgaApp app, Node node, MainView view) {
         super(app, node);
 
-        QuadBackgroundComponent quad1 = new QuadBackgroundComponent(ColorRGBA.Gray);
-        quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor());
-        container.setBackground(quad1);
+        this.view = view;
 
-        Texture texture = app.getAssetManager().loadTexture("mdga_logo.png");
+        portInput = new InputButton(app, node, "Port: ", 5);
+        portInput.setString(prefs.get("hostPort", "11111"));
 
-        QuadBackgroundComponent b = new QuadBackgroundComponent(texture);
+        hostButton = new ButtonRight(app, node, view::forward, "Spiel hosten", 10);
+        backButton = new ButtonLeft(app, node, view::back, "Zurück", 10);
 
-        Panel imagePanel = new Panel();
-        imagePanel.setBackground(b);
+        float offset = 2.8f;
 
-        container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4 * app.getResolutionFactor(), texture.getImage().getHeight() / 4 * app.getResolutionFactor(), 0));
-
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        createTextField();
-
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        Container sub = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        createButton(sub, "Abbrechen", backAction, new Vector3f(170 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-
-        sub.addChild(new Panel(40 * app.getResolutionFactor(), 0 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        createButton(sub, "Starten", () -> tryStart(), new Vector3f(170 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-
-        container.addChild(sub);
-    }
-
-    void tryStart() {
-        if (null == portInput.getText()) {
-            portInput.setText("");
-            return;
-        }
-
-        int port = 0;
-
-        try {
-            port = Integer.parseInt(portInput.getText());
-        } catch (NumberFormatException e) {
-            portInput.setText("");
-            return;
-        }
-
-        if(port >= 1 && port <= 65535) {
-            app.getModelSyncronizer().setHost(port);
-        }
-
-        portInput.setText("");
+        portInput.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.5f;
     }
 
     @Override
-    public void show() {
-        super.show();
-
-        container.setLocalTranslation(
-            app.getCamera().getWidth() / 2 - container.getPreferredSize().x / 2,
-            app.getCamera().getHeight() / 2 + container.getPreferredSize().y / 2,
-            0
-        );
+    protected void onShow() {
+        portInput.show();
+        hostButton.show();
+        backButton.show();
     }
 
     @Override
-    public void hide() {
-        super.hide();
+    protected void onHide() {
+        portInput.hide();
+        hostButton.hide();
+        backButton.hide();
     }
 
-    private void createTextField() {
-        Container subContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        Label nameLabel = new Label("Port:\t");
-        nameLabel.setFontSize(fontSize);
-        nameLabel.setColor(ColorRGBA.Black);
-
-        portInput = new TextField("");
-
-        portInput.setColor(ColorRGBA.Black);
-        portInput.setTextHAlignment(HAlignment.Left);
-        portInput.setFontSize(fontSize);
-        portInput.setSingleLine(true);
-
-        QuadBackgroundComponent grayBackground = new QuadBackgroundComponent(ColorRGBA.DarkGray);
-        portInput.setBackground(grayBackground);
-
-        subContainer.addChild(nameLabel);
-        subContainer.addChild(portInput);
-
-        container.addChild(subContainer);
+    public void update() {
+        portInput.update();
     }
 
-    protected void createButton(Container c, String label, Runnable action, Vector3f size) {
-        Button button = new Button(label);
-        button.addClickCommands(source -> action.run());
-        button.setFontSize(fontSize);
-        button.setHighlightColor(ColorRGBA.White);
-        button.setColor(ColorRGBA.Black);
-        button.setPreferredSize(size);
-        button.setTextHAlignment(HAlignment.Center);
-        button.setTextVAlignment(VAlignment.Center);
+    public String getPort() {
+        prefs.put("hostPort", portInput.getString());
+        return portInput.getString();
+    }
 
-        QuadBackgroundComponent background = new QuadBackgroundComponent(COLOR_DEFAULT);
-        background.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-        button.setBackground(background);
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOn, (source) -> {
-            QuadBackgroundComponent hoverBackground = new QuadBackgroundComponent(COLOR_HOVER);
-            hoverBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(hoverBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOff, (source) -> {
-            QuadBackgroundComponent normalBackground = new QuadBackgroundComponent(COLOR_DEFAULT);
-            normalBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(normalBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        c.addChild(button);
+    public void resetPort() {
+        portInput.reset();
+        prefs.put("hostPort", "11111");
     }
 }

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

@@ -0,0 +1,4 @@
+package pp.mdga.client.dialog;
+
+public class InterruptDialog {
+}

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

@@ -1,192 +1,88 @@
 package pp.mdga.client.dialog;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
+import com.jme3.math.Vector2f;
 import com.jme3.scene.Node;
-import com.jme3.texture.Texture;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.component.SpringGridLayout;
 import pp.mdga.client.MdgaApp;
+import pp.mdga.client.acoustic.AcousticHandler;
+import pp.mdga.client.button.ButtonLeft;
+import pp.mdga.client.button.ButtonRight;
+import pp.mdga.client.button.InputButton;
+import pp.mdga.client.button.MenuButton;
+import pp.mdga.client.view.MainView;
 
-import java.util.regex.Pattern;
+import java.util.prefs.Preferences;
 
 public class JoinDialog extends Dialog {
-    private TextField portInput;
-    private TextField ipInput;
+    private InputButton ipInput;
+    private InputButton portInput;
 
-    public JoinDialog(MdgaApp app, Node node, Runnable backAction) {
+    private ButtonRight joinButton;
+    private ButtonLeft backButton;
+
+    private final MainView view;
+
+    private Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
+
+    public JoinDialog(MdgaApp app, Node node, MainView view) {
         super(app, node);
 
-        QuadBackgroundComponent quad1 = new QuadBackgroundComponent(ColorRGBA.Gray);
-        quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor());
-        container.setBackground(quad1);
+        this.view = view;
 
-        Texture texture = app.getAssetManager().loadTexture("mdga_logo.png");
+        ipInput = new InputButton(app, node, "Ip: ", 15);
+        portInput = new InputButton(app, node, "Port: ", 5);
+        portInput.setString(prefs.get("joinPort", "11111"));
+        ipInput.setString(prefs.get("joinIp", ""));
 
-        QuadBackgroundComponent b = new QuadBackgroundComponent(texture);
+        joinButton = new ButtonRight(app, node, view::forward, "Spiel beitreten", 10);
+        backButton = new ButtonLeft(app, node, view::back, "Zurück", 10);
 
-        Panel imagePanel = new Panel();
-        imagePanel.setBackground(b);
+        float offset = 2.8f;
 
-        container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4 * app.getResolutionFactor(), texture.getImage().getHeight() / 4 * app.getResolutionFactor(), 0));
+        ipInput.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.5f;
 
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        createIpField();
-
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        createPortField();
-
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        Container sub = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        createButton(sub, "Abbrechen", backAction, new Vector3f(170 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-
-        sub.addChild(new Panel(40 * app.getResolutionFactor(), 0 * app.getResolutionFactor(), ColorRGBA.Gray));
-
-        createButton(sub, "Beitreten", () -> tryJoin(), new Vector3f(170 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-
-        container.addChild(sub);
-    }
-
-    void tryJoin() {
-        if (null == portInput.getText()) {
-            portInput.setText("");
-            ipInput.setText("");
-            return;
-        }
-
-        int port = 0;
-
-        try {
-            port = Integer.parseInt(portInput.getText());
-        } catch (NumberFormatException e) {
-            portInput.setText("");
-            ipInput.setText("");
-            return;
-        }
-
-        if(!(port >= 1 && port <= 65535)) {
-            portInput.setText("");
-            ipInput.setText("");
-            return;
-        }
-
-        if (null == ipInput.getText()) {
-            portInput.setText("");
-            ipInput.setText("");
-            return;
-        }
-
-        String ipv4Pattern = "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";
-
-        if(!Pattern.matches(ipv4Pattern, ipInput.getText())) {
-            portInput.setText("");
-            ipInput.setText("");
-            return;
-        }
-
-        app.getModelSyncronizer().setJoin(ipInput.getText(), port);
+        portInput.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.5f;
     }
 
     @Override
-    public void show() {
-        super.show();
-
-        container.setLocalTranslation(
-            app.getCamera().getWidth() / 2 - container.getPreferredSize().x / 2,
-            app.getCamera().getHeight() / 2 + container.getPreferredSize().y / 2,
-            0
-        );
+    protected void onShow() {
+        ipInput.show();
+        portInput.show();
+        joinButton.show();
+        backButton.show();
     }
 
     @Override
-    public void hide() {
-        super.hide();
+    protected void onHide() {
+        ipInput.hide();
+        portInput.hide();
+        joinButton.hide();
+        backButton.hide();
     }
 
-    private void createPortField() {
-        Container subContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        Label nameLabel = new Label("Port:\t");
-        nameLabel.setFontSize(fontSize);
-        nameLabel.setColor(ColorRGBA.Black);
-
-        portInput = new TextField("");
-
-        portInput.setColor(ColorRGBA.Black);
-        portInput.setTextHAlignment(HAlignment.Left);
-        portInput.setFontSize(fontSize);
-        portInput.setSingleLine(true);
-
-        QuadBackgroundComponent grayBackground = new QuadBackgroundComponent(ColorRGBA.DarkGray);
-        portInput.setBackground(grayBackground);
-
-        subContainer.addChild(nameLabel);
-        subContainer.addChild(portInput);
-
-        container.addChild(subContainer);
+    public void update() {
+        ipInput.update();
+        portInput.update();
     }
 
-    private void createIpField() {
-        Container subContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        Label nameLabel = new Label("Ip:\t");
-        nameLabel.setFontSize(fontSize);
-        nameLabel.setColor(ColorRGBA.Black);
-
-        ipInput = new TextField("");
-
-        ipInput.setColor(ColorRGBA.Black);
-        ipInput.setTextHAlignment(HAlignment.Left);
-        ipInput.setFontSize(fontSize);
-        ipInput.setSingleLine(true);
-
-        QuadBackgroundComponent grayBackground = new QuadBackgroundComponent(ColorRGBA.DarkGray);
-        ipInput.setBackground(grayBackground);
-
-        subContainer.addChild(nameLabel);
-        subContainer.addChild(ipInput);
-
-        container.addChild(subContainer);
+    public String getIpt() {
+        prefs.put("joinIp", ipInput.getString());
+        return ipInput.getString();
     }
 
-    protected void createButton(Container c, String label, Runnable action, Vector3f size) {
-        Button button = new Button(label);
-        button.addClickCommands(source -> action.run());
-        button.setFontSize(fontSize);
-        button.setHighlightColor(ColorRGBA.White);
-        button.setColor(ColorRGBA.Black);
-        button.setPreferredSize(size);
-        button.setTextHAlignment(HAlignment.Center);
-        button.setTextVAlignment(VAlignment.Center);
+    public void resetIp() {
+        ipInput.reset();
+        prefs.put("joinIp", "");
+    }
 
-        QuadBackgroundComponent background = new QuadBackgroundComponent(COLOR_DEFAULT);
-        background.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-        button.setBackground(background);
+    public String getPort() {
+        prefs.put("joinPort", portInput.getString());
+        return portInput.getString();
+    }
 
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOn, (source) -> {
-            QuadBackgroundComponent hoverBackground = new QuadBackgroundComponent(COLOR_HOVER);
-            hoverBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(hoverBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOff, (source) -> {
-            QuadBackgroundComponent normalBackground = new QuadBackgroundComponent(COLOR_DEFAULT);
-            normalBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(normalBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        c.addChild(button);
+    public void resetPort() {
+        portInput.reset();
+        prefs.put("joinPort", "11111");
     }
 }

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

@@ -1,165 +0,0 @@
-package pp.mdga.client.dialog;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Command;
-import com.simsilica.lemur.HAlignment;
-import com.simsilica.lemur.VAlignment;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import pp.mdga.client.MdgaApp;
-import pp.mdga.game.Color;
-
-public class LobbyButtonDialog extends Dialog {
-    private final int pos;
-
-    private Button button;
-
-    private Command<Button> clickCommand;
-
-    private boolean taken = false;
-
-    private final String label;
-
-    private int val;
-
-    public LobbyButtonDialog(MdgaApp app, Node node, String label, int pos) {
-        super(app, node);
-
-        clickCommand = (Button source) -> {
-            toggleButton();
-        };
-
-        this.pos = pos;
-
-        this.label = label;
-        this.button = new Button(label);
-        this.button.setFontSize(fontSize);
-
-        val = pos;
-
-        createNotTakenButton(new Vector3f(170 * app.getResolutionFactor(), 250 * app.getResolutionFactor(), 0));
-    }
-
-    @Override
-    public void show() {
-        super.show();
-
-        float x = ((2 + (4 * pos)) * horitontal_step) - ((0.33333333f * pos) * container.getPreferredSize().x);
-        float y = 6 * vertical_step;
-
-        container.setLocalTranslation(x, y, 0);
-    }
-
-    @Override
-    public void hide() {
-        super.hide();
-    }
-
-    public void setTaken(boolean isTaken, boolean self, String name) {
-        taken = isTaken;
-
-        if(isTaken) {
-            createTakenButton(new Vector3f(170 * app.getResolutionFactor(), 250 * app.getResolutionFactor(), 0), self);
-
-            button.setText(label + "\n\n" + name);
-        } else {
-            createNotTakenButton(new Vector3f(170 * app.getResolutionFactor(), 250 * app.getResolutionFactor(), 0));
-
-            button.setText(label);
-        }
-    }
-
-    protected void createNotTakenButton(Vector3f size) {
-        button.setHighlightColor(ColorRGBA.White);
-        button.setColor(ColorRGBA.Black);
-        button.setPreferredSize(size);
-        button.setTextHAlignment(HAlignment.Center);
-        button.setTextVAlignment(VAlignment.Center);
-
-        if(button.getClickCommands() != null) {
-            button.removeClickCommands(clickCommand);
-        }
-
-        button.addClickCommands(clickCommand);
-
-        QuadBackgroundComponent background = new QuadBackgroundComponent(COLOR_DEFAULT);
-        background.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-        button.setBackground(background);
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOn, (source) -> {
-            QuadBackgroundComponent hoverBackground = new QuadBackgroundComponent(COLOR_HOVER);
-            hoverBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(hoverBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOff, (source) -> {
-            QuadBackgroundComponent normalBackground = new QuadBackgroundComponent(COLOR_DEFAULT);
-            normalBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(normalBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        container.addChild(button);
-    }
-
-    private void toggleButton() {
-        if(taken) {
-            app.getModelSyncronizer().unselectTsk();
-        }
-        else {
-            app.getModelSyncronizer().selectTsk(Color.values()[val]);
-        }
-    }
-
-    protected void createTakenButton(Vector3f size, boolean self) {
-        ColorRGBA color_a;
-        ColorRGBA color_b;
-
-        if(button.getClickCommands() != null) {
-            button.removeClickCommands(clickCommand);
-        }
-
-        if(!self) {
-            color_a = ColorRGBA.Red;
-            color_b = ColorRGBA.Red;
-        } else {
-            color_a = ColorRGBA.Green;
-            color_b = ColorRGBA.Yellow;
-
-            button.addClickCommands(clickCommand);
-        }
-
-        button.setHighlightColor(ColorRGBA.White);
-        button.setColor(ColorRGBA.Black);
-        button.setPreferredSize(size);
-        button.setTextHAlignment(HAlignment.Center);
-        button.setTextVAlignment(VAlignment.Center);
-
-        QuadBackgroundComponent background = new QuadBackgroundComponent(color_a);
-        background.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-        button.setBackground(background);
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOn, (source) -> {
-            QuadBackgroundComponent hoverBackground = new QuadBackgroundComponent(color_b);
-            hoverBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(hoverBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOff, (source) -> {
-            QuadBackgroundComponent normalBackground = new QuadBackgroundComponent(color_a);
-            normalBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(normalBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-        });
-
-        container.addChild(button);
-    }
-}

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

@@ -1,15 +0,0 @@
-package pp.mdga.client.dialog;
-
-import java.util.function.Consumer;
-
-public class PercentRunnable {
-    private final Consumer<Float> action;
-
-    public PercentRunnable(Consumer<Float> action) {
-        this.action = action;
-    }
-
-    public void run(float percent) {
-        action.accept(percent);
-    }
-}

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

@@ -1,78 +0,0 @@
-package pp.mdga.client.dialog;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import com.jme3.texture.Texture;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.HAlignment;
-import com.simsilica.lemur.Panel;
-import com.simsilica.lemur.VAlignment;
-import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import pp.mdga.client.MdgaApp;
-
-public class SettingsButtonDialog extends Dialog {
-    private IconComponent icon;
-
-    public SettingsButtonDialog(MdgaApp app, Node node, String label, Runnable action) {
-        super(app, node);
-
-        icon = new IconComponent("zahnrad.png");
-        icon.setIconScale(0.1f * app.getResolutionFactor());
-
-        createButton(label, action, new Vector3f(60 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-    }
-
-    @Override
-    public void show() {
-        super.show();
-
-        float x = (15.5f * horitontal_step) - container.getPreferredSize().x;
-        float y = 8.5f * vertical_step;
-
-        container.setLocalTranslation(x, y, 0);
-    }
-
-    @Override
-    public void hide() {
-        super.hide();
-    }
-
-    @Override
-    protected void createButton(String label, Runnable action, Vector3f size) {
-        Button button = new Button(label);
-        button.addClickCommands(source -> action.run());
-        button.setFontSize(fontSize);
-        button.setHighlightColor(ColorRGBA.White);
-        button.setColor(ColorRGBA.Black);
-        button.setPreferredSize(size);
-        button.setTextHAlignment(HAlignment.Center);
-        button.setTextVAlignment(VAlignment.Center);
-
-        QuadBackgroundComponent background = new QuadBackgroundComponent(COLOR_DEFAULT);
-        background.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-        button.setBackground(background);
-        button.setIcon(icon);
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOn, (source) -> {
-            QuadBackgroundComponent hoverBackground = new QuadBackgroundComponent(COLOR_HOVER);
-            hoverBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(hoverBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-            button.setIcon(icon);
-        });
-
-        button.addCommands(com.simsilica.lemur.Button.ButtonAction.HighlightOff, (source) -> {
-            QuadBackgroundComponent normalBackground = new QuadBackgroundComponent(COLOR_DEFAULT);
-            normalBackground.setMargin(5 * app.getResolutionFactor(), 5 * app.getResolutionFactor());
-            source.setBackground(normalBackground);
-            button.setHighlightColor(ColorRGBA.White);
-            button.setColor(ColorRGBA.Black);
-            button.setIcon(icon);
-        });
-
-        container.addChild(button);
-    }
-}

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

@@ -1,112 +1,50 @@
 package pp.mdga.client.dialog;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
+import com.jme3.math.Vector2f;
 import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.texture.Texture;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.component.SpringGridLayout;
-import com.simsilica.lemur.event.CursorListener;
-import com.simsilica.lemur.event.CursorMotionEvent;
-import com.simsilica.lemur.event.MouseEventControl;
 import pp.mdga.client.MdgaApp;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.style.*;
-
-import java.util.HashMap;
+import pp.mdga.client.button.InputButton;
+import pp.mdga.client.button.MenuButton;
+import pp.mdga.client.view.MainView;
+import pp.mdga.client.view.MdgaView;
 
 public class SettingsDialog extends Dialog {
-    private TextField nameInput;
+    private MenuButton videoButton;
+    private MenuButton audioButton;
+    private MenuButton backButton;
 
-    private HashMap<Slider, PercentRunnable> map = new HashMap<Slider, PercentRunnable>();
-    private HashMap<Slider, GetPercentRunnable> map2 = new HashMap<Slider, GetPercentRunnable>();
+    private final MdgaView view;
 
-    public SettingsDialog(MdgaApp app, Node node, String path) {
+    public SettingsDialog(MdgaApp app, Node node, MdgaView view) {
         super(app, node);
 
-        QuadBackgroundComponent quad1 = new QuadBackgroundComponent(ColorRGBA.Gray);
-        quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor());
-        container.setBackground(quad1);
+        this.view = view;
 
-        Texture texture = app.getAssetManager().loadTexture(path);
+        videoButton = new MenuButton(app, node, view::enterVideoSettings, "Video");
+        audioButton = new MenuButton(app, node, view::enterAudioSettings, "Audio");
+        backButton = new MenuButton(app, node, view::leaveSettings, "Zurück");
 
-        QuadBackgroundComponent b = new QuadBackgroundComponent(texture);
+        float offset = 2.8f;
 
-        Panel imagePanel = new Panel();
-        imagePanel.setBackground(b);
+        videoButton.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.25f;
 
-        container.addChild(imagePanel).setPreferredSize(new Vector3f((texture.getImage().getWidth() / 2) * app.getResolutionFactor(), (texture.getImage().getHeight() / 2) * app.getResolutionFactor(), 0));
+        audioButton.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
 
-        //abstandshalter
-        container.addChild(new Panel(80 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
+        backButton.setPos(new Vector2f(0, 1.8f));
     }
 
     @Override
-    public void show() {
-        super.show();
-
-        container.setLocalTranslation(
-            app.getCamera().getWidth() / 2 - container.getPreferredSize().x / 2,
-            app.getCamera().getHeight() / 2 + container.getPreferredSize().y / 2,
-            0
-        );
+    protected void onShow() {
+        videoButton.show();
+        audioButton.show();
+        backButton.show();
     }
 
     @Override
-    public void hide() {
-        super.hide();
-    }
-
-    public void addButton(String label, Runnable action, Vector3f size) {
-        createButton(label, action, size);
-    }
-
-    public void addSlider(String label, PercentRunnable action, GetPercentRunnable action2, Vector3f size, int start) {
-        Container subContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        Slider slider = new Slider("slider");
-
-        QuadBackgroundComponent background = new QuadBackgroundComponent(ColorRGBA.DarkGray);
-        slider.setBackground(background);
-
-        slider.setPreferredSize(size);
-        slider.setModel(new DefaultRangedValueModel(0, 100, start));
-        slider.setPreferredSize(new Vector3f(150 * app.getResolutionFactor(), 30 * app.getResolutionFactor(), 0));
-        slider.getDecrementButton().setText(" - ");
-        slider.getIncrementButton().setText(" + ");
-        slider.getDecrementButton().setFontSize(25 * app.getResolutionFactor());
-        slider.getIncrementButton().setFontSize(25 * app.getResolutionFactor());
-
-        Label nameLabel = new Label(label);
-        nameLabel.setFontSize(fontSize);
-        nameLabel.setColor(ColorRGBA.Black);
-        nameLabel.setPreferredSize(new Vector3f(150 * app.getResolutionFactor(), 10 * app.getResolutionFactor(), 0));
-
-        subContainer.addChild(nameLabel);
-        subContainer.addChild(slider);
-
-        container.addChild(subContainer);
-
-        map.put(slider, action);
-        map2.put(slider, action2);
-
-        //abstandshalter
-        container.addChild(new Panel(20 * app.getResolutionFactor(), 10 * app.getResolutionFactor(), ColorRGBA.Gray));
-    }
-
-    public void initVolume() {
-        map2.forEach((slider, runnable) -> {
-            double val = (double) runnable.get();
-            slider.getModel().setPercent(val);
-        });
-    }
-
-    public void update() {
-        map.forEach((slider, runnable) -> {
-            float val = (float) slider.getModel().getPercent();
-            runnable.run(val);
-        });
+    protected void onHide() {
+        videoButton.hide();
+        audioButton.hide();
+        backButton.hide();
     }
 }

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

@@ -1,28 +0,0 @@
-package pp.mdga.client.dialog;
-
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import pp.mdga.client.MdgaApp;
-
-public class SingleButtonLeftDialog extends Dialog {
-    public SingleButtonLeftDialog(MdgaApp app, Node node, String label, Runnable action) {
-        super(app, node);
-
-        createButton(label, action, new Vector3f(170 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-    }
-
-    @Override
-    public void show() {
-        super.show();
-
-        float x = 2 * horitontal_step;
-        float y = 1.8f * vertical_step;
-
-        container.setLocalTranslation(x, y, 0);
-    }
-
-    @Override
-    public void hide() {
-        super.hide();
-    }
-}

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

@@ -1,28 +0,0 @@
-package pp.mdga.client.dialog;
-
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
-import pp.mdga.client.MdgaApp;
-
-public class SingleButtonRightDialog extends Dialog {
-    public SingleButtonRightDialog(MdgaApp app, Node node, String label, Runnable action) {
-        super(app, node);
-
-        createButton(label, action, new Vector3f(170 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0));
-    }
-
-    @Override
-    public void show() {
-        super.show();
-
-        float x = (14 * horitontal_step) - container.getPreferredSize().x;
-        float y = 1.8f * vertical_step;
-
-        container.setLocalTranslation(x, y, 0);
-    }
-
-    @Override
-    public void hide() {
-        super.hide();
-    }
-}

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

@@ -1,86 +1,188 @@
 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.jme3.texture.Texture;
-import com.simsilica.lemur.*;
+import com.simsilica.lemur.Container;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.component.SpringGridLayout;
 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;
 
 public class StartDialog extends Dialog {
-    private TextField nameInput;
+    private InputButton nameInput;
 
-    public StartDialog(MdgaApp app, Node node) {
+    private MenuButton hostButton;
+    private MenuButton joinButton;
+    private MenuButton endButton;
+
+    private final MainView view;
+
+    public StartDialog(MdgaApp app, Node node, MainView view) {
         super(app, node);
 
-        QuadBackgroundComponent quad1 = new QuadBackgroundComponent(ColorRGBA.Gray);
-        quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor());
-        container.setBackground(quad1);
+        this.view = view;
 
-        Texture texture = app.getAssetManager().loadTexture("mdga_logo.png");
+        nameInput = new InputButton(app, node, "Name: ", 16);
 
-        QuadBackgroundComponent b = new QuadBackgroundComponent(texture);
+        hostButton = new MenuButton(app, node, () -> view.forward(true), "Spiel hosten");
+        joinButton = new MenuButton(app, node, () -> view.forward(false), "Spiel beitreten");
+        endButton = new MenuButton(app, node, app::stop, "Spiel beenden");
 
-        Panel imagePanel = new Panel();
-        imagePanel.setBackground(b);
+        float offset = 2.8f;
 
-        container.addChild(imagePanel).setPreferredSize(new Vector3f(texture.getImage().getWidth() / 4, texture.getImage().getHeight() / 4, 0));
+        nameInput.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.15f;
 
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
+        hostButton.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.25f;
 
-        createTextField();
+        joinButton.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
+        offset += 1.25f;
 
-        //abstandshalter
-        container.addChild(new Panel(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor(), ColorRGBA.Gray));
+        endButton.setPos(new Vector2f(0, 1.8f));
     }
 
     @Override
-    public void show() {
-        super.show();
+    protected void onShow() {
+        nameInput.show();
 
-        container.setLocalTranslation(
-            app.getCamera().getWidth() / 2 - container.getPreferredSize().x / 2,
-            app.getCamera().getHeight() / 2 + container.getPreferredSize().y / 2,
-            0
-        );
+        hostButton.show();
+        joinButton.show();
+        endButton.show();
     }
 
     @Override
-    public void hide() {
-        super.hide();
+    protected void onHide ()
+    {
+        nameInput.hide();
+
+        hostButton.hide();
+        joinButton.hide();
+        endButton.hide();
     }
 
-    public void addButton(String label, Runnable action, Vector3f size) {
-        createButton(label, action, size);
-    }
-
-    private void createTextField() {
-        Container subContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-
-        Label nameLabel = new Label("Name:\t");
-        nameLabel.setFontSize(fontSize);
-        nameLabel.setColor(ColorRGBA.Black);
-
-        nameInput = new TextField("");
-
-        nameInput.setColor(ColorRGBA.Black);
-        nameInput.setTextHAlignment(HAlignment.Left);
-        nameInput.setFontSize(fontSize);
-        nameInput.setSingleLine(true);
-
-        QuadBackgroundComponent grayBackground = new QuadBackgroundComponent(ColorRGBA.DarkGray);
-        nameInput.setBackground(grayBackground);
-
-        subContainer.addChild(nameLabel);
-        subContainer.addChild(nameInput);
-
-        container.addChild(subContainer);
+    public void update() {
+        nameInput.update();
     }
 
     public String getName() {
-        return nameInput.getText();
+        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",
+            };
+
+            Random random = new Random();
+            name = names[random.nextInt(names.length)];
+        }
+
+        return name;
     }
 }

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

@@ -0,0 +1,47 @@
+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.MenuButton;
+import pp.mdga.client.view.MdgaView;
+
+public class VideoSettingsDialog extends Dialog {
+    private MenuButton backButton;
+
+    private final MdgaView view;
+
+    private boolean active = false;
+
+    public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
+        super(app, node);
+
+        this.view = view;
+
+        backButton = new MenuButton(app, node, view::leaveVideoSettings, "Zurück");
+
+        float offset = 2.8f;
+
+        backButton.setPos(new Vector2f(0, 1.8f));
+    }
+
+    @Override
+    protected void onShow() {
+        active = true;
+
+        backButton.show();
+    }
+
+    @Override
+    protected void onHide() {
+        active = false;
+
+        backButton.hide();
+    }
+
+    public void update() {
+        if(!active) {
+            return;
+        }
+    }
+}

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

@@ -0,0 +1,129 @@
+package pp.mdga.client.gui;
+
+import com.jme3.asset.AssetManager;
+import com.jme3.font.BitmapFont;
+import com.jme3.font.BitmapText;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
+import com.jme3.system.AppSettings;
+import pp.mdga.client.Asset;
+import pp.mdga.game.Color;
+
+public class ActionTextHandler {
+    private Node root;
+    private BitmapFont font;
+    private AppSettings appSettings;
+
+    public ActionTextHandler(Node guiNode, AssetManager assetManager, AppSettings appSettings){
+        root = new Node("actionTextRoot");
+        guiNode.attachChild(root);
+
+        root.setLocalTranslation(center(appSettings.getWidth(), appSettings.getHeight(), Vector3f.ZERO));
+        font = assetManager.loadFont("Fonts/Gunplay.fnt");
+        this.appSettings = appSettings;
+
+    }
+
+    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");
+
+        Node textNode = new Node("TextWithSpacing");
+        Node center = new Node();
+        float xOffset = 0;
+        for(int i = 0; i < textArr.length; i++){
+            String text = textArr[i];
+            ColorRGBA color = colorArr[i];
+            for (char c : text.toCharArray()) {
+                BitmapText letter = new BitmapText(font);
+                letter.setColor(color);
+                letter.setSize(size);
+                letter.setText(Character.toString(c));
+                letter.setLocalTranslation(xOffset, letter.getHeight()/2, 0);
+                center.attachChild(letter);
+
+                xOffset += letter.getLineWidth() + spacing;
+            }
+        }
+
+        center.setLocalTranslation(new Vector3f(-xOffset/2,0,0));
+        textNode.attachChild(center);
+        return textNode;
+    }
+
+    private Node createTextWithSpacing(String text, float spacing, float size, ColorRGBA color) {
+        return createTextWithSpacing(new String[]{text}, spacing, size, new ColorRGBA[]{color});
+    }
+
+    private Vector3f center(float width, float height, Vector3f pos){
+        return new Vector3f(pos.x+width/2, pos.y+height/2,0);
+    }
+
+    private Node createTopText(String name, float spacing, float size, ColorRGBA color, float top){
+        return createTopText(new String[]{name}, spacing, size, new ColorRGBA[]{color}, 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);
+        root.attachChild(text);
+        return text;
+    }
+
+    private Vector3f centerText(float width, float height, Vector3f pos){
+        return center(-width, height, pos);
+    }
+
+    public void activePlayer(String name, Color color){
+        createTopText(new String[]{name," ist dran"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
+    }
+
+    public void ownActive(Color color){
+        createTopText(new String[]{"Du"," bist dran"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
+    }
+
+    public 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);
+
+    }
+
+    public 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);
+    }
+
+    public void ownDice(int diceNum){
+        createTopText(String.valueOf(diceNum), 10, 100, ColorRGBA.White, 0);
+    }
+
+    public 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);
+    }
+
+    public 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());
+    }
+
+    public void drawCardOwn(Color color){
+        createTopText(new String[]{"Du","  erhälst eine Bonuskarte"}, 5,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
+    }
+
+    private ColorRGBA playerColorToColorRGBA(Color color){
+        return switch (color){
+            case ARMY -> ColorRGBA.Green;
+            case NAVY -> ColorRGBA.Blue;
+            case CYBER -> ColorRGBA.Orange;
+            case AIRFORCE -> ColorRGBA.Black;
+            default -> throw new RuntimeException("None is not valid");
+        };
+    }
+
+    public void hide(){
+        root.detachAllChildren();
+    }
+
+
+}

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

@@ -1,23 +1,150 @@
 package pp.mdga.client.gui;
 
+import com.jme3.font.BitmapFont;
+import com.jme3.font.BitmapText;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+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;
 
-public class CardControl extends AbstractControl {
+import java.awt.*;
 
-    public CardControl(){
+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;
+
+    private static final ColorRGBA HOVER_COLOR = ColorRGBA.Green;
+    private static final int HOVER_WIDTH = 12;
+
+    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;
+
+    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));
+        root.attachChild(rootNum);
     }
 
+    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));
+        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);
+        BitmapFont guiFont = getApp().getAssetManager().loadFont("Fonts/Gunplay.fnt");
+        num = new BitmapText(guiFont);
+        num.setSize(0.3f);
+        num.setText("1");
+        num.setColor(ColorRGBA.White);
+        num.setLocalTranslation(-num.getLineWidth() / 2, num.getHeight() / 2, 2);
+        rootNum.attachChild(circle);
+        rootNum.attachChild(num);
+        return rootNum;
+    }
 
-    @Override
-    protected void controlUpdate(float tpf) {
+    public void setNumCard(int num){
+        this.num.setText(String.valueOf(num));
+    }
 
+    public Node getRoot() {
+        return root;
     }
 
     @Override
-    protected void controlRender(RenderManager rm, ViewPort vp) {
+    public void initSpatial(){
+    }
 
+    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

@@ -3,13 +3,22 @@
 import com.jme3.app.Application;
 import com.jme3.app.state.AbstractAppState;
 import com.jme3.app.state.AppStateManager;
+import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
+import com.jme3.post.FilterPostProcessor;
+import com.jme3.post.filters.ComposeFilter;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.jme3.shadow.DirectionalLightShadowFilter;
+import com.jme3.shadow.DirectionalLightShadowRenderer;
+import com.jme3.shadow.EdgeFilteringMode;
+import com.jme3.texture.Image;
+import com.jme3.texture.Texture2D;
 import pp.mdga.client.Asset;
 
 import java.util.*;
@@ -21,11 +30,16 @@ public class CardLayer extends AbstractAppState {
     private boolean init;
 
     private List<Spatial> cardBuffer;
+    private final FilterPostProcessor fpp;
+    private final Camera overlayCam;
+    Texture2D backTexture;
 
-
-    public CardLayer() {
+    public CardLayer(FilterPostProcessor fpp, Camera overlayCam, Texture2D backTexture) {
+        this.overlayCam = overlayCam;
+        this.fpp = fpp;
         this.cardBuffer = new ArrayList<>();
         init = false;
+        this.backTexture = backTexture;
     }
 
     @Override
@@ -33,23 +47,36 @@ public void initialize(AppStateManager stateManager, Application app ) {
         this.app = app;
         root = new Node("Under gui viewport Root");
 
-        Camera originalCam = app.getCamera();
-
-        Camera cam = new Camera(originalCam.getWidth(), originalCam.getHeight());
-        cam.setParallelProjection(false);
-        cam.setFrustum(originalCam.getFrustumNear(), originalCam.getFrustumFar(), originalCam.getFrustumLeft(), originalCam.getFrustumRight(),originalCam.getFrustumTop(), originalCam.getFrustumBottom());
-        cam.setFov(originalCam.getFov());
-        cam.setLocation(new Vector3f(0, 0, 10));
-        cam.lookAt(new Vector3f(0,0,0), Vector3f.UNIT_Y);
-
-        ViewPort view = app.getRenderManager().createMainView("Under gui ViewPort", cam);
+        ViewPort view = app.getRenderManager().createMainView("Under gui ViewPort", overlayCam);
         view.setEnabled(true);
-        view.setClearFlags(false, true, false);
+        view.setClearFlags(true, true, true);
         view.attachScene(root);
+        fpp.setFrameBufferFormat(Image.Format.RGBA8);
+        fpp.addFilter(new ComposeFilter(backTexture));
+
+
+        DirectionalLight sun = new DirectionalLight();
+        sun.setColor(ColorRGBA.White);
+        sun.setDirection(new Vector3f(.5f,-.5f,-1));
+        root.addLight(sun);
+
+        final int SHADOWMAP_SIZE=1024*8;
+
+        DirectionalLightShadowFilter dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 3);
+        dlsf.setLight(sun);
+        dlsf.setEnabled(true);
+        dlsf.setEdgeFilteringMode(EdgeFilteringMode.PCFPOISSON);
+        dlsf.setShadowIntensity(.5f);
+        fpp.addFilter(dlsf);
+
+        view.addProcessor(fpp);
 
         if(!init) init = true;
+    }
 
-
+    public void shutdown(){
+        cardBuffer.clear();
+        root.detachAllChildren();
     }
 
 
@@ -61,17 +88,28 @@ public void render(RenderManager rm) {
 
     @Override
     public void update( float tpf ) {
-        root.updateLogicalState(tpf);
-
         if (init && !cardBuffer.isEmpty()) {
             for(Spatial spatial : cardBuffer){
                 root.attachChild(spatial);
             }
             cardBuffer.clear();
         }
+        root.updateLogicalState(tpf);
     }
 
-    public void addCard(Spatial card){
+    public void addSpatial(Spatial card){
         cardBuffer.add(card);
     }
+
+    public void deleteSpatial(Spatial spatial){
+        root.detachChild(spatial);
+    }
+
+    public Camera getOverlayCam(){
+        return overlayCam;
+    }
+
+    public Node getRootNode(){
+        return root;
+    }
 }

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

@@ -0,0 +1,216 @@
+package pp.mdga.client.gui;
+
+import com.jme3.material.Material;
+import com.jme3.math.Vector3f;
+import com.jme3.post.FilterPostProcessor;
+import com.jme3.renderer.Camera;
+import com.jme3.renderer.queue.RenderQueue;
+import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
+import com.jme3.texture.Texture2D;
+import pp.mdga.client.Asset;
+import pp.mdga.client.MdgaApp;
+import pp.mdga.game.BonusCard;
+
+import java.util.*;
+
+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);
+    private static final float CARDLAYER_CAMERA_ZOOM = 4;
+
+    private final MdgaApp app;
+    private final FilterPostProcessor fpp;
+    private final Texture2D backTexture;
+
+    private Camera cardLayerCamera;
+    private CardLayer cardLayer;
+    private DiceControl diceControl;
+
+    private final Map<BonusCard, CardControl> bonusCardControlMap = new HashMap<>();
+    private final Map<BonusCard, Integer> bonusCardIntegerMap = new HashMap<>();
+    private final Set<CardControl> selectableCards = new HashSet<>();
+
+    private BonusCard cardSelect = null;
+
+    public CardLayerHandler(MdgaApp app, Texture2D backTexture) {
+        this.app = app;
+        this.fpp = new FilterPostProcessor(app.getAssetManager());
+        this.backTexture = backTexture;
+    }
+
+    public void init() {
+        cardLayerCamera = createOverlayCam();
+        cardLayer = new CardLayer(fpp, cardLayerCamera, backTexture);
+        app.getStateManager().attach(cardLayer);
+
+        diceControl = new DiceControl(app.getAssetManager());
+        diceControl.create(new Vector3f(0, 0, 0), 1f, false);
+    }
+
+    public void shutdown() {
+        if (cardLayer != null) {
+            cardLayer.shutdown();
+            clearSelectableCards();
+        }
+        cardLayer = null;
+    }
+
+    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);
+    }
+
+    public void showDice() {
+        cardLayer.addSpatial(diceControl.getSpatial());
+        diceControl.spin();
+    }
+
+    public void hideDice() {
+        diceControl.hide();
+    }
+
+    public void addCard(BonusCard card) {
+        if (card == BonusCard.HIDDEN) throw new RuntimeException("Can't add hidden card to GUI");
+
+        if (!bonusCardControlMap.containsKey(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);
+        bonusCardControlMap.get(card).setNumCard(newNum);
+    }
+
+    public void clearSelectableCards() {
+        for (CardControl control : selectableCards) {
+            control.setSelectable(false);
+            control.setHoverable(false);
+            control.unHighlight();
+            control.unSelect();
+        }
+        selectableCards.clear();
+        cardSelect = null;
+    }
+
+    public void setSelectableCards(List<BonusCard> select) {
+        for (BonusCard card : select) {
+            selectableCards.add(bonusCardControlMap.get(card));
+        }
+        for (CardControl control : selectableCards) {
+            control.setSelectable(true);
+            control.setHoverable(true);
+            control.setHighlight();
+        }
+    }
+
+    public void selectCard(CardControl cardControl) {
+        if (cardControl.isSelected()) {
+            cardControl.unSelect();
+            cardSelect = null;
+        } else {
+            for (CardControl control : selectableCards) {
+                control.unSelect();
+            }
+            cardControl.select();
+            cardSelect = getKeyByValue(bonusCardControlMap, cardControl);
+        }
+    }
+
+    public Camera getCardLayerCamera() {
+        return cardLayerCamera;
+    }
+
+    public void shield(){
+        SymbolControl control = createSymbol(Asset.shieldSymbol);
+        cardLayer.addSpatial(control.getSpatial());
+        control.shield();
+    }
+
+    public void swap(){
+        SymbolControl control = createSymbol(Asset.swapSymbol);
+        cardLayer.addSpatial(control.getSpatial());
+        control.swap();
+    }
+
+    public void turbo(){
+        SymbolControl control = createSymbol(Asset.turboSymbol);
+        cardLayer.addSpatial(control.getSpatial());
+        control.turbo();
+    }
+
+    private Asset bonusToAsset(BonusCard card) {
+        return switch (card) {
+            case TURBO -> Asset.turboCard;
+            case SHIELD -> Asset.shieldCard;
+            case SWAP -> Asset.swapCard;
+            case HIDDEN -> throw new RuntimeException("HIDDEN is not allowed in GUI");
+        };
+    }
+
+    private Vector3f nextPos() {
+        return START.add(MARGIN.mult(bonusCardControlMap.size()));
+    }
+
+    private Camera createOverlayCam() {
+        Camera originalCam = app.getCamera();
+        Camera overlayCam = new Camera(originalCam.getWidth(), originalCam.getHeight());
+        overlayCam.setParallelProjection(true);
+        float aspect = (float) originalCam.getWidth() / originalCam.getHeight();
+        float size = CARDLAYER_CAMERA_ZOOM;
+        overlayCam.setFrustum(-1000, 1000, -aspect * size, aspect * size, size, -size);
+        overlayCam.setLocation(new Vector3f(0, 0, 10));
+        overlayCam.lookAt(new Vector3f(0, 0, 0), Vector3f.UNIT_Y);
+        return overlayCam;
+    }
+
+    private <K, V> K getKeyByValue(Map<K, V> map, V value) {
+        for (Map.Entry<K, V> entry : map.entrySet()) {
+            if (entry.getValue().equals(value)) {
+                return entry.getKey();
+            }
+        }
+        return null;
+    }
+
+    public void test() {
+        addCard(BonusCard.SHIELD);
+        addCard(BonusCard.SHIELD);
+        addCard(BonusCard.TURBO);
+        addCard(BonusCard.SWAP);
+    }
+
+    private CardControl createCard(Asset card, Vector3f pos){
+        Node rootCard = new Node("Root Card");
+        Spatial spatial = app.getAssetManager().loadModel(card.getModelPath());
+        rootCard.attachChild(spatial);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
+        mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(card.getDiffPath()));
+        spatial.setMaterial(mat);
+        spatial.setLocalScale(1f);
+        rootCard.setLocalTranslation(pos);
+        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;
+    }
+
+    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));
+        SymbolControl control = new SymbolControl();
+        spatial.addControl(control);
+        return control;
+    }
+
+    public CardLayer getCardLayer(){
+        return cardLayer;
+    }
+}

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

@@ -0,0 +1,171 @@
+package pp.mdga.client.gui;
+
+import com.jme3.asset.AssetManager;
+import com.jme3.material.Material;
+import com.jme3.math.FastMath;
+import com.jme3.math.Quaternion;
+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.Spatial;
+import com.jme3.scene.control.AbstractControl;
+import pp.mdga.client.Asset;
+
+import java.util.Random;
+
+import static com.jme3.material.Materials.LIGHTING;
+import static com.jme3.material.Materials.UNSHADED;
+
+public class DiceControl extends AbstractControl {
+    private Quaternion targetRotation;
+    private final Vector3f angularVelocity = new Vector3f();
+    private float deceleration = 0.5f;
+    private float timeElapsed = 0.0f;
+    private float rollDuration = 1f;
+    private static final int ANGULAR_MIN = 5;
+    private static final int ANGULAR_MAX = 15;
+    private static final int ANGULAR_SPIN = 10;
+    private boolean isRolling = false;
+    private boolean slerp = false;
+    private boolean spin = false;
+    private final AssetManager assetManager;
+    private Runnable actionAfter;
+
+    public DiceControl(AssetManager assetManager){
+        this.assetManager = assetManager;
+    }
+
+
+    @Override
+    protected void controlUpdate(float tpf) {
+        if (isRolling) {
+            if(!slerp) {
+                // Apply rotational velocity to the dice
+                spinWithAngularVelocity(tpf);
+
+                // Gradually reduce rotational velocity (simulate deceleration)
+                angularVelocity.subtractLocal(
+                        angularVelocity.mult(deceleration * tpf)
+                );
+
+                // Stop rolling when angular velocity is close to zero
+                if (angularVelocity.lengthSquared() < 3f) {
+                    slerp = true;
+                }
+            }
+            else {
+                timeElapsed += tpf * rollDuration;
+
+
+                if (timeElapsed > 1.0f) timeElapsed = 1.0f;
+                Quaternion interpolated = spatial.getLocalRotation().clone();
+                interpolated.slerp(targetRotation, timeElapsed);
+                spatial.setLocalRotation(interpolated);
+
+                // Stop rolling once duration is complete
+                if (timeElapsed >= 1.0f) {
+                    isRolling = false;
+                    slerp = false;
+                    actionAfter.run();
+                }
+            }
+        }else if(spin){
+            spinWithAngularVelocity(tpf);
+        }
+    }
+
+    private void spinWithAngularVelocity(float tpf){
+        Quaternion currentRotation = spatial.getLocalRotation();
+        Quaternion deltaRotation = new Quaternion();
+        deltaRotation.fromAngles(
+                angularVelocity.x * tpf,
+                angularVelocity.y * tpf,
+                angularVelocity.z * tpf
+        );
+        spatial.setLocalRotation(currentRotation.mult(deltaRotation));
+    }
+
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+    }
+
+
+    public void rollDice(int diceNum, Runnable actionAfter) {
+        if (isRolling) return;
+        spin = false;
+        slerp = false;
+        this.actionAfter = actionAfter;
+        angularVelocity.set(
+                FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),
+                FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),
+                FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX)
+        );
+
+        targetRotation = getRotationForDiceNum(diceNum);
+
+        isRolling = true;
+    }
+
+    private Quaternion getRotationForDiceNum(int diceNum) {
+        return switch (diceNum) {
+            case 1 -> new Quaternion().fromAngleAxis((float) (1 * (Math.PI / 2)), Vector3f.UNIT_X);
+            case 2 -> new Quaternion().fromAngleAxis((float) (1 * (Math.PI / 2)), Vector3f.UNIT_Y);
+            case 3 -> new Quaternion().fromAngleAxis((float) (0 * (Math.PI / 2)), Vector3f.UNIT_X);
+            case 4 -> new Quaternion().fromAngleAxis((float) (2 * (Math.PI / 2)), Vector3f.UNIT_Y);
+            case 5 -> new Quaternion().fromAngleAxis((float) (3 * (Math.PI / 2)), Vector3f.UNIT_Y);
+            case 6 -> new Quaternion().fromAngleAxis((float) (3 * (Math.PI / 2)), Vector3f.UNIT_X);
+            default -> throw new IllegalArgumentException("Invalid dice number: " + diceNum);
+        };
+    }
+
+    public static float lerp(float t) {
+        return (float) Math.sqrt(1 - Math.pow(t - 1, 2));
+    }
+
+    public void randomRotation() {
+        Quaternion randomRotation = new Quaternion();
+        randomRotation.fromAngles(
+                FastMath.nextRandomFloat() * FastMath.TWO_PI, // Random X rotation
+                FastMath.nextRandomFloat() * FastMath.TWO_PI, // Random Y rotation
+                FastMath.nextRandomFloat() * FastMath.TWO_PI  // Random Z rotation
+        );
+        spatial.setLocalRotation(randomRotation);
+    }
+
+    public void spin(){
+        angularVelocity.set(ANGULAR_SPIN,ANGULAR_SPIN,ANGULAR_SPIN);
+        spin = true;
+    }
+
+    public void hide(){
+        spatial.removeFromParent();
+        spin = false;
+        isRolling = false;
+        slerp = false;
+    }
+
+    public void create(Vector3f pos, float scale, boolean shadow){
+        Spatial spatial = assetManager.loadModel(Asset.dice.getModelPath());
+        Material mat;
+        if(shadow){
+            mat = new Material(assetManager, LIGHTING);
+            mat.setTexture("DiffuseMap", assetManager.loadTexture(Asset.dice.getDiffPath()));
+            spatial.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
+        }
+        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.addControl(this);
+    }
+
+    public void setPos(Vector3f pos){
+        spatial.setLocalTranslation(pos);
+    }
+
+}

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

@@ -1,70 +1,132 @@
 package pp.mdga.client.gui;
 
-import com.jme3.material.Material;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Spatial;
-import pp.mdga.client.Asset;
+import com.jme3.renderer.Camera;
+import com.jme3.scene.Node;
+import com.jme3.texture.FrameBuffer;
+import com.jme3.texture.Image;
+import com.jme3.texture.Texture2D;
 import pp.mdga.client.MdgaApp;
-import pp.mdga.game.BonusCard;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import pp.mdga.game.Color;
 
+import java.util.List;
 
 public class GuiHandler {
+    private final MdgaApp app;
+    private final CardLayerHandler cardLayerHandler;
+    private final PlayerNameHandler playerNameHandler;
+    private final ActionTextHandler actionTextHandler;
+    private Color ownColor;
 
-    private MdgaApp app;
-    private CardLayer cardLayer;
-    private Map<UUID, CardControl> ownCardsMap;
+    private FrameBuffer backFrameBuffer;
 
-    private static final Vector3f START = new Vector3f(-3,-3,0);
-    private static final Vector3f MARGIN = new Vector3f(2.5f,0,0);
-
-    public GuiHandler(MdgaApp app) {
+    public GuiHandler(MdgaApp app, Node guiNode) {
         this.app = app;
+        this.ownColor = ownColor;
+
+        backFrameBuffer = new FrameBuffer(app.getCamera().getWidth(), app.getCamera().getHeight(), 1);
+        Texture2D backTexture = new Texture2D(app.getCamera().getWidth(), app.getCamera().getHeight(), Image.Format.RGBA8);
+        backFrameBuffer.setDepthTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.Depth));
+        backFrameBuffer.addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(backTexture));
+
+        cardLayerHandler = new CardLayerHandler(app, backTexture);
+        playerNameHandler = new PlayerNameHandler(guiNode, app.getAssetManager(), app.getContext().getSettings());
+        actionTextHandler = new ActionTextHandler(guiNode, app.getAssetManager(), app.getContext().getSettings());
     }
 
-    public void init(){
-        cardLayer = new CardLayer();
-        app.getStateManager().attach(cardLayer);
-        ownCardsMap = new HashMap<>();
-
-        addCard(BonusCard.SHIELD, UUID.randomUUID());
-        addCard(BonusCard.TURBO, UUID.randomUUID());
-        addCard(BonusCard.SWAP, UUID.randomUUID());
-
+    public void init(Color ownColor) {
+        cardLayerHandler.init();
+        playerNameHandler.show();
+        this.ownColor = ownColor;
+        app.getViewPort().setOutputFrameBuffer(backFrameBuffer);
     }
 
-    private Asset bonusToAsset(BonusCard card){
-        return switch (card){
-            case TURBO -> Asset.turboCard;
-            case SHIELD -> Asset.shieldCard;
-            case SWAP -> Asset.swapCard;
-            case HIDDEN -> throw new RuntimeException("HIDDEN is not allowed in GUI");
-        };
+    public void shutdown() {
+        cardLayerHandler.shutdown();
+        app.getViewPort().setOutputFrameBuffer(null);
     }
 
-    public void addCard(BonusCard card, UUID uuid) {
-        CardControl control = createCard(bonusToAsset(card), nextPos());
-        ownCardsMap.put(uuid, control);
-        cardLayer.addCard(control.getSpatial());
+    public void rollDice(int rollNum, int mult) {
+        cardLayerHandler.rollDice(rollNum, ()->{
+            if(mult == -1) actionTextHandler.ownDice(rollNum);
+            else actionTextHandler.ownDiceMult(rollNum, mult);
+            hideDice();
+            //TODO send Model finished
+        });
     }
 
-    private Vector3f nextPos() {
-        return START.add(MARGIN.mult(ownCardsMap.size()));
+    public void showRolledDiceMult(int rollNum, int mult, Color color) {
+        String name = playerNameHandler.getName(color);
+        if(mult == -1) actionTextHandler.diceNum(rollNum, name, color);
+        else actionTextHandler.diceNumMult(rollNum, mult, name, color);
     }
 
-    private CardControl createCard(Asset card, Vector3f pos){
-        Spatial spatial = app.getAssetManager().loadModel(card.getModelPath());
-        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        mat.setTexture("ColorMap", app.getAssetManager().loadTexture(card.getDiffPath()));
-        spatial.setMaterial(mat);
-        spatial.setLocalScale(1f);
-        spatial.setLocalTranslation(pos);
-        spatial.rotate((float)Math.toRadians(90), (float)Math.toRadians(180), (float)Math.toRadians(180));
-        CardControl control = new CardControl();
-        spatial.addControl(control);
-        return control;
+    public void showRolledDice(int rollNum, Color color) {
+        actionTextHandler.diceNum(rollNum, playerNameHandler.getName(color), color);
     }
+
+    public void showDice() {
+        cardLayerHandler.showDice();
+    }
+
+    public void hideDice() {
+        cardLayerHandler.hideDice();
+    }
+
+    public void addCard(pp.mdga.game.BonusCard card) {
+        cardLayerHandler.addCard(card);
+    }
+
+    public void clearSelectableCards() {
+        cardLayerHandler.clearSelectableCards();
+    }
+
+    public void setSelectableCards(List<pp.mdga.game.BonusCard> select) {
+        cardLayerHandler.setSelectableCards(select);
+    }
+
+    public void selectCard(CardControl cardControl) {
+        cardLayerHandler.selectCard(cardControl);
+    }
+
+    public Camera getCardLayerCamera() {
+        return cardLayerHandler.getCardLayerCamera();
+    }
+
+    public Node getCardLayerRootNode(){
+        return cardLayerHandler.getCardLayer().getRootNode();
+    }
+
+    public void addPlayer(Color color, String name) {
+        playerNameHandler.addPlayer(color, name, color == ownColor);
+    }
+
+    public void setActivePlayer(Color color) {
+        playerNameHandler.setActivePlayer(color);
+
+        if (ownColor == color) actionTextHandler.ownActive(color);
+        else actionTextHandler.activePlayer(playerNameHandler.getName(color), color);
+    }
+
+    public void shield(){
+        cardLayerHandler.shield();
+    }
+
+    public void swap(){
+        cardLayerHandler.swap();
+    }
+
+    public void turbo(){
+        cardLayerHandler.turbo();
+    }
+
+    public void hideText(){
+        actionTextHandler.hide();
+    }
+
+    public void drawCard(Color color) {
+        if (ownColor == color) actionTextHandler.drawCardOwn(color);
+        else actionTextHandler.drawCard(playerNameHandler.getName(color), color);
+    }
+
+
 }

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

@@ -0,0 +1,127 @@
+package pp.mdga.client.gui;
+
+import com.jme3.asset.AssetManager;
+import com.jme3.font.BitmapFont;
+import com.jme3.font.BitmapText;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
+import com.jme3.system.AppSettings;
+import com.jme3.ui.Picture;
+import pp.mdga.game.Color;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class PlayerNameHandler {
+    private final BitmapFont playerFont;
+    private final Node playerNameNode;
+    private final List<Color> playerOrder;
+    private final Map<Color, String> colorNameMap;
+    private final AppSettings appSettings;
+    private final AssetManager assetManager;
+    private Color ownColor;
+
+    private static final float PADDING_TOP = 35;
+    private static final float PADDING_LEFT = 50;
+    private static final float MARGIN_NAMES = 50;
+    private static final float IMAGE_SIZE = 50;
+    private static final float TEXT_SIZE = 28;
+    private static final ColorRGBA NORMAL_COLOR = ColorRGBA.White;
+    private static final ColorRGBA ACTIVE_COLOR = ColorRGBA.Blue;
+    private static final ColorRGBA OWN_COLOR = ColorRGBA.Cyan;
+
+    private final Node guiNode;
+
+    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<>();
+        this.appSettings = appSettings;
+        this.assetManager = assetManager;
+    }
+
+    public void show() {
+        guiNode.attachChild(playerNameNode);
+    }
+
+    public void hide() {
+        guiNode.detachChild(playerNameNode);
+    }
+
+    private void drawPlayers(){
+        playerNameNode.detachAllChildren();
+
+
+        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");
+
+            Node nameParent = new Node("nameParent");
+            nameParent.attachChild(createName(colorNameMap.get(color), i == 0, color == ownColor));
+            nameParent.attachChild(createColor(color));
+            nameParent.setLocalTranslation(50,appSettings.getWindowHeight()-PADDING_TOP- MARGIN_NAMES *i,0);
+            playerNameNode.attachChild(nameParent);
+        }
+    }
+
+    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";
+            default -> throw new RuntimeException("None is not valid");
+        };
+    }
+
+    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);
+        return pic;
+    }
+
+
+
+    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(name);
+        hudText.setLocalTranslation(PADDING_LEFT,hudText.getHeight()/2, 0);
+        return hudText;
+    }
+
+    public void addPlayer(Color color, String name, boolean own){
+        if(own) ownColor = color;
+        colorNameMap.put(color, name);
+        playerOrder.add(color);
+        drawPlayers();
+    }
+
+    public void setActivePlayer(Color color) {
+        Color lastFirst = playerOrder.remove(0);
+        playerOrder.remove(color);
+        playerOrder.add(0, color);
+        playerOrder.add(lastFirst);
+
+        drawPlayers();
+    }
+
+    public String getName(Color color){
+        return colorNameMap.get(color);
+    }
+
+
+}

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

@@ -0,0 +1,147 @@
+package pp.mdga.client.gui;
+
+import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.control.AbstractControl;
+import pp.mdga.game.BonusCard;
+
+public class SymbolControl extends AbstractControl {
+    private boolean zoomingIn = false;
+    private boolean zoomingOut = false;
+    private float zoomSpeed = 1f;
+    private float zoomFactor = 3f;
+    private float progress = 0;
+    private BonusCard state;
+    private float rotationSpeed = 0.8f;
+    private Quaternion initialRotation = null;
+    private float Y = 5;
+
+
+
+    @Override
+    protected void controlUpdate(float tpf) {
+        if(state == null) return;
+        switch (state){
+            case SHIELD -> shieldUpdate(tpf);
+            case SWAP -> swapUpdate(tpf);
+            case TURBO -> turboUpdate(tpf);
+            case HIDDEN -> throw new RuntimeException("forbidden state");
+        }
+    }
+
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+
+    }
+
+    private void shieldUpdate(float tpf){
+        if (zoomingIn) {
+            progress += tpf * zoomSpeed;
+            if (progress > 1) progress = 1;
+            spatial.setLocalScale(lerp(0, zoomFactor, easeOut(progress)));
+            if (progress >= 1) {
+                zoomingIn = false;
+                zoomingOut = true;
+                progress = 0;
+            }
+        } else if (zoomingOut) {
+            progress += tpf * zoomSpeed;
+            spatial.setLocalScale(lerp(zoomFactor, 0, easeIn(progress)));
+            if (progress > 1) {
+                zoomingIn = false;
+                spatial.removeFromParent();
+                state = null;
+                progress = 0;
+            }
+        }
+    }
+
+    private void swapUpdate(float tpf){
+        if (initialRotation == null) {
+            initialRotation = spatial.getLocalRotation().clone();
+        }
+
+        progress += tpf*rotationSpeed;
+        if(progress < 0) return;
+
+        float angle = lerp(0, 360, easeInOut(progress));
+
+        Quaternion newRotation = new Quaternion();
+        newRotation.fromAngleAxis((float) Math.toRadians(angle), new Vector3f(0, 1, 0));
+
+        spatial.setLocalRotation(initialRotation.mult(newRotation));
+
+        if (progress >= 1.2f) {
+            state = null;
+            initialRotation = null;
+            progress = 0;
+            spatial.removeFromParent();
+        }
+    }
+    private void turboUpdate(float tpf){
+        if (zoomingIn) {
+            progress += tpf * zoomSpeed;
+            if (progress > 1) progress = 1;
+            float y = lerp(-Y,0, easeOut(progress));
+            spatial.setLocalTranslation(0,y,0);
+            if (progress >= 1) {
+                zoomingIn = false;
+                zoomingOut = true;
+                progress = 0;
+            }
+        } else if (zoomingOut) {
+            progress += tpf * zoomSpeed;
+            float y = lerp(0,Y, easeIn(progress));
+            spatial.setLocalTranslation(0,y,0);
+            if (progress > 1) {
+                zoomingIn = false;
+                spatial.removeFromParent();
+                state = null;
+            }
+        }
+    }
+
+    public void shield(){
+        if(state != null) throw new RuntimeException("another state is avtive");
+        state = BonusCard.SHIELD;
+        zoomingIn = true;
+        zoomingOut = false;
+        progress = 0;
+        spatial.setLocalScale(1f);
+    }
+
+    public void swap(){
+        if(state != null) throw new RuntimeException("another state is avtive");
+        spatial.setLocalScale(3);
+        state = BonusCard.SWAP;
+        progress = -0.2f;
+    }
+
+    public void turbo(){
+        if(state != null) throw new RuntimeException("another state is avtive");
+        spatial.setLocalScale(2);
+        state = BonusCard.TURBO;
+        zoomingIn = true;
+        zoomingOut = false;
+        progress = 0;
+    }
+
+    private static float lerp(float start, float end, float t) {
+        return (1 - t) * start + t * end;
+    }
+
+    private static float easeOut(float t) {
+        return (float) Math.sqrt(1 - Math.pow(t - 1, 2));
+    }
+
+    private float easeInOut(float t) {
+        if(t>1) t=1;
+        return (float) -(Math.cos(Math.PI * t) - 1) / 2;
+    }
+
+    private float easeIn(float t) {
+        return t * t * t * t;
+    }
+}

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

@@ -0,0 +1,82 @@
+package pp.mdga.client.gui;
+
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.Spatial;
+import com.jme3.scene.control.AbstractControl;
+
+public class ZoomControl extends AbstractControl {
+    private boolean zoomingIn = false;
+    private boolean zoomingOut = false;
+    private float progress = 0;
+    private float zoomSpeed = 1f;
+    private float zoomFactor = 1f;
+
+    public ZoomControl(){}
+
+    public ZoomControl(float speed) {
+        zoomSpeed = speed;
+    }
+
+    @Override
+    public void setSpatial(Spatial spatial){
+        if(this.spatial == null && spatial != null){
+            super.setSpatial(spatial);
+            initSpatial();
+        }
+    }
+
+    private void initSpatial() {
+        zoomingIn = true;
+    }
+
+    @Override
+    protected void controlUpdate(float tpf) {
+        if (zoomingIn) {
+            progress += tpf * zoomSpeed;
+            if (progress > 1) progress = 1;
+            spatial.setLocalScale(lerp(0, zoomFactor, easeOut(progress)));
+            if (progress >= 1) {
+                zoomingIn = false;
+                zoomingOut = true;
+                progress = 0;
+            }
+        } else if (zoomingOut) {
+            progress += tpf * zoomSpeed;
+            spatial.setLocalScale(lerp(zoomFactor, 0, easeIn(progress)));
+            if (progress > 1) {
+                zoomingOut = false;
+                end();
+            }
+        }
+    }
+
+    private void end(){
+        spatial.removeFromParent();
+        spatial.removeControl(this);
+    }
+
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+
+    }
+
+    private static float lerp(float start, float end, float t) {
+        return (1 - t) * start + t * end;
+    }
+
+//    private static float easeOut(float t) {
+//        return (float) Math.sqrt(1 - Math.pow(t - 1, 2));
+//    }
+private float easeOut(float x) {
+        return x == 1 ? 1 : (float) (1 - Math.pow(2, -10 * x));
+
+    }
+//    private float easeIn(float t) {
+//        return t * t * t * t;
+//    }
+    private float easeIn(float x) {
+        return x == 0 ? 0 : (float) Math.pow(2, 10 * x - 10);
+
+    }
+}

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

@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.sql.Connection;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -25,6 +26,7 @@ public class MdgaServer implements MessageListener<HostedConnection>, Connection
     private static final Logger LOGGER = System.getLogger(MdgaServer.class.getName());
 
     private Server myServer;
+    private static int port;
     private final ServerGameLogic logic;
     private final BlockingQueue<ReceivedMessage> pendingMessages = new LinkedBlockingQueue<>();
 
@@ -40,37 +42,38 @@ public class MdgaServer implements MessageListener<HostedConnection>, Connection
     }
 
     /**
-     * Starts the Battleships server.
+     * Constructor.
+     *
+     * @param port as the port for this server
      */
-    public static void main(String[] args) {
-        new MdgaServer().run();
-    }
-
-    /**
-     * Creates a new MdgaServer.
-     */
-    public MdgaServer() {
+    public MdgaServer(int port) {
+        MdgaServer.port = port;
         LOGGER.log(Level.INFO, "Creating MdgaServer"); //NON-NLS
         logic = new ServerGameLogic(this, new Game());
     }
 
+    /**
+     *
+     */
     public void run() {
         startServer();
-        this.connectionAdded(myServer, myServer.getConnection(0));
         while (true)
             processNextMessage();
     }
 
+    /**
+     *
+     */
     private void startServer() {
         try {
             LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
-            myServer = Network.createServer(1234);
-
+            myServer = Network.createServer(port);
             initializeSerializables();
             myServer.start();
             registerListeners();
             LOGGER.log(Level.INFO, "Server started: {0}", myServer.isRunning()); //NON-NLS
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             LOGGER.log(Level.ERROR, "Couldn't start server: {0}", e.getMessage()); //NON-NLS
             exit(1);
         }
@@ -86,76 +89,98 @@ private void processNextMessage() {
     }
 
     private void initializeSerializables() {
-        Serializer.registerClass(AnimationEnd.class);
-        Serializer.registerClass(ClientStartGame.class);
-        Serializer.registerClass(DeselectTSK.class);
-        Serializer.registerClass(ForceContinueGame.class);
-        Serializer.registerClass(StartGame.class);
-        Serializer.registerClass(JoinServer.class);
-        Serializer.registerClass(LeaveGame.class);
-        Serializer.registerClass(LobbyNotReady.class);
-        Serializer.registerClass(LobbyReady.class);
-        Serializer.registerClass(NoPowerCard.class);
-        Serializer.registerClass(RequestBriefing.class);
-        Serializer.registerClass(RequestDie.class);
-        Serializer.registerClass(RequestMove.class);
-        Serializer.registerClass(RequestPlayCard.class);
-        Serializer.registerClass(SelectCard.class);
-        Serializer.registerClass(SelectedPieces.class);
-        Serializer.registerClass(SelectTSK.class);
+        Serializer.registerClass(AnimationEndMessage.class);
+        Serializer.registerClass(ClientStartGameMessage.class);
+        Serializer.registerClass(DeselectTSKMessage.class);
+        Serializer.registerClass(ForceContinueGameMessage.class);
+        Serializer.registerClass(StartGameMessage.class);
+        Serializer.registerClass(JoinedLobbyMessage.class);
+        Serializer.registerClass(LeaveGameMessage.class);
+        Serializer.registerClass(LobbyNotReadyMessage.class);
+        Serializer.registerClass(LobbyReadyMessage.class);
+        Serializer.registerClass(NoPowerCardMessage.class);
+        Serializer.registerClass(RequestBriefingMessage.class);
+        Serializer.registerClass(RequestDieMessage.class);
+        Serializer.registerClass(RequestMoveMessage.class);
+        Serializer.registerClass(RequestPlayCardMessage.class);
+        Serializer.registerClass(SelectCardMessage.class);
+        Serializer.registerClass(SelectedPiecesMessage.class);
+        Serializer.registerClass(SelectTSKMessage.class);
 
-        Serializer.registerClass(ActivePlayer.class);
-        Serializer.registerClass(AnyPiece.class);
-        Serializer.registerClass(Briefing.class);
+        Serializer.registerClass(ActivePlayerMessage.class);
+        Serializer.registerClass(AnyPieceMessage.class);
+        Serializer.registerClass(BriefingMessage.class);
         Serializer.registerClass(CeremonyMessage.class);
-        Serializer.registerClass(Die.class);
-        Serializer.registerClass(DiceAgain.class);
-        Serializer.registerClass(DiceNow.class);
-        Serializer.registerClass(EndOfTurn.class);
-        Serializer.registerClass(LobbyAccept.class);
-        Serializer.registerClass(LobbyDeny.class);
-        Serializer.registerClass(LobbyPlayerJoin.class);
-        Serializer.registerClass(LobbyPlayerLeave.class);
+        Serializer.registerClass(DieMessage.class);
+        Serializer.registerClass(DiceAgainMessage.class);
+        Serializer.registerClass(DiceNowMessage.class);
+        Serializer.registerClass(EndOfTurnMessage.class);
+        Serializer.registerClass(LobbyAcceptMessage.class);
+        Serializer.registerClass(LobbyDenyMessage.class);
+        Serializer.registerClass(LobbyPlayerJoinedMessage.class);
+        Serializer.registerClass(LobbyPlayerLeaveMessage.class);
         Serializer.registerClass(MoveMessage.class);
-        Serializer.registerClass(NoTurn.class);
-        Serializer.registerClass(PauseGame.class);
-        Serializer.registerClass(PlayCard.class);
-        Serializer.registerClass(PossibleCard.class);
-        Serializer.registerClass(PossiblePiece.class);
-        Serializer.registerClass(RankingResponse.class);
-        Serializer.registerClass(RankingRollAgain.class);
-        Serializer.registerClass(ReconnectBriefing.class);
-        Serializer.registerClass(ResumeGame.class);
-        Serializer.registerClass(ServerStartGame.class);
-        Serializer.registerClass(StartPiece.class);
-        Serializer.registerClass(UpdateReady.class);
-        Serializer.registerClass(UpdateTSK.class);
-        Serializer.registerClass(WaitPiece.class);
+        Serializer.registerClass(NoTurnMessage.class);
+        Serializer.registerClass(PauseGameMessage.class);
+        Serializer.registerClass(PlayCardMessage.class);
+        Serializer.registerClass(PossibleCardMessage.class);
+        Serializer.registerClass(PossiblePieceMessage.class);
+        Serializer.registerClass(RankingResponseMessage.class);
+        Serializer.registerClass(RankingRollAgainMessage.class);
+        Serializer.registerClass(ReconnectBriefingMessage.class);
+        Serializer.registerClass(ResumeGameMessage.class);
+        Serializer.registerClass(ServerStartGameMessage.class);
+        Serializer.registerClass(StartPieceMessage.class);
+        Serializer.registerClass(UpdateReadyMessage.class);
+        Serializer.registerClass(UpdateTSKMessage.class);
+        Serializer.registerClass(WaitPieceMessage.class);
     }
 
     private void registerListeners() {
-        myServer.addMessageListener(this, AnimationEnd.class);
-        myServer.addMessageListener(this, ClientStartGame.class);
-        myServer.addMessageListener(this, DeselectTSK.class);
-        myServer.addMessageListener(this, ForceContinueGame.class);
-        myServer.addMessageListener(this, StartGame.class);
-        myServer.addMessageListener(this, JoinServer.class);
-        myServer.addMessageListener(this, LeaveGame.class);
-        myServer.addMessageListener(this, LobbyNotReady.class);
-        myServer.addMessageListener(this, LobbyReady.class);
-        myServer.addMessageListener(this, NoPowerCard.class);
-        myServer.addMessageListener(this, RequestBriefing.class);
-        myServer.addMessageListener(this, RequestDie.class);
-        myServer.addMessageListener(this, RequestMove.class);
-        myServer.addMessageListener(this, RequestPlayCard.class);
-        myServer.addMessageListener(this, SelectCard.class);
-        myServer.addMessageListener(this, SelectedPieces.class);
-        myServer.addMessageListener(this, SelectTSK.class);
+        myServer.addMessageListener(this, AnimationEndMessage.class);
+        myServer.addMessageListener(this, ClientStartGameMessage.class);
+        myServer.addMessageListener(this, DeselectTSKMessage.class);
+        myServer.addMessageListener(this, ForceContinueGameMessage.class);
+        myServer.addMessageListener(this, StartGameMessage.class);
+        myServer.addMessageListener(this, JoinedLobbyMessage.class);
+        myServer.addMessageListener(this, LeaveGameMessage.class);
+        myServer.addMessageListener(this, LobbyNotReadyMessage.class);
+        myServer.addMessageListener(this, LobbyReadyMessage.class);
+        myServer.addMessageListener(this, NoPowerCardMessage.class);
+        myServer.addMessageListener(this, RequestBriefingMessage.class);
+        myServer.addMessageListener(this, RequestDieMessage.class);
+        myServer.addMessageListener(this, RequestMoveMessage.class);
+        myServer.addMessageListener(this, RequestPlayCardMessage.class);
+        myServer.addMessageListener(this, SelectCardMessage.class);
+        myServer.addMessageListener(this, SelectedPiecesMessage.class);
+        myServer.addMessageListener(this, SelectTSKMessage.class);
         myServer.addConnectionListener(this);
     }
 
+    /**
+     * This method will be used to receive network messages from the given source parameter.
+     * It will check if the given message parameter is a ClientMessage object. If yes it will call the messageReceived
+     * method with the casted ClientMessage object.
+     *
+     * @param source  as the connection which sends the message as a HostedConnection object.
+     * @param message as the received message as a Message object.
+     */
+    @Override
+    public void messageReceived(HostedConnection source, Message message) {
+        if (message instanceof ClientMessage) {
+            this.messageReceived(source, (ClientMessage) message);
+        }
+    }
 
-    public void messageReceived(HostedConnection source, ClientMessage message) {
+    /**
+     * This method will be used to received network messages from the given source parameter.
+     * It will add the given message parameter to the pendingMessage attribute of MdgaServer after creating
+     * a ReceivedMessage object with it and its id.
+     *
+     * @param source  as the connection which sends the message as a HostedConnection object.
+     * @param message as the received message as a Message object.
+     */
+    private void messageReceived(HostedConnection source, ClientMessage message) {
         LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
         pendingMessages.add(new ReceivedMessage(message, source.getId()));
     }
@@ -163,8 +188,6 @@ public void messageReceived(HostedConnection source, ClientMessage message) {
     @Override
     public void connectionAdded(Server server, HostedConnection hostedConnection) {
         LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS
-        // ToDo: Synchronize data between server and client.
-        logic.getGame().addPlayer(hostedConnection.getId(), new Player());
     }
 
     @Override
@@ -186,7 +209,7 @@ public void connectionRemoved(Server server, HostedConnection hostedConnection)
      * @param id as the id of the disconnected player.
      */
     public void handleDisconnect(int id) {
-        this.logic.received(new Disconnected(), id);
+        this.logic.received(new DisconnectedMessage(), id);
     }
 
     public void exit(int exitValue) { //NON-NLS
@@ -203,6 +226,7 @@ public void exit(int exitValue) { //NON-NLS
      * @param id      the connection id
      * @param message the message
      */
+    @Override
     public void send(int id, ServerMessage message) {
         if (myServer == null || !myServer.isRunning()) {
             LOGGER.log(Level.ERROR, "no server running when trying to send {0}", message); //NON-NLS
@@ -221,15 +245,20 @@ public void send(int id, ServerMessage message) {
      *
      * @param message as the message which will be sent to all players as a ServerMessage.
      */
+    @Override
     public void broadcast(ServerMessage message) {
         for (Map.Entry<Integer, Player> entry: this.logic.getGame().getPlayers().entrySet()) {
             this.send(entry.getKey(), message);
         }
     }
 
-    //TODO:
+    /**
+     * This method will be used to diconenect the client depending on the given id parameter.
+     *
+     * @param id as the connection id of the client as an Integer.
+     */
     @Override
-    public void messageReceived(HostedConnection source, Message m) {
-
+    public void disconnectClient(int id) {
+        this.myServer.getConnection(id).close("");
     }
 }

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

@@ -1,13 +1,25 @@
 package pp.mdga.client.view;
 
+import com.jme3.asset.TextureKey;
+import com.jme3.light.AmbientLight;
+import com.jme3.material.Material;
+import com.jme3.material.RenderState;
+import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
-import pp.mdga.client.dialog.SingleButtonLeftDialog;
-import pp.mdga.client.dialog.SingleButtonRightDialog;
+import com.jme3.scene.shape.Quad;
+import com.jme3.texture.Texture;
 import pp.mdga.client.MdgaApp;
 import pp.mdga.client.MdgaState;
+import pp.mdga.client.acoustic.MdgaSound;
+import pp.mdga.client.button.ButtonLeft;
+import pp.mdga.client.button.ButtonRight;
+import pp.mdga.client.button.CeremonyButton;
+import pp.mdga.client.dialog.CeremonyDialog;
+import pp.mdga.game.Color;
+
+import java.util.ArrayList;
 
 public class CeremonyView extends MdgaView {
-
     private enum SubState {
         AWARD_CEREMONY,
         STATISTICS,
@@ -15,54 +27,146 @@ private enum SubState {
 
     private SubState state;
 
-    private SingleButtonRightDialog continueButton;
-    private SingleButtonLeftDialog backButton;
-
     private Geometry background;
+    private Geometry podest;
+
+    private ButtonLeft backButton;
+    private ButtonRight continueButton;
+
+    private ArrayList<CeremonyButton> ceremonyButtons;
+
+    private CeremonyDialog ceremonyDialog;
+
+    private AmbientLight ambient = new AmbientLight();
 
     public CeremonyView(MdgaApp app) {
         super(app);
 
-        continueButton = new SingleButtonRightDialog(app, node, "Weiter", () -> forward());
-        backButton = new SingleButtonLeftDialog(app, node, "Zurück", () -> back());
+        backButton = new ButtonLeft(app, guiNode, this::back, "Zurück", 1);
+        continueButton = new ButtonRight(app, guiNode, this::forward, "Weiter", 1);
+
+        ceremonyButtons = new ArrayList<>(4);
+
+        ceremonyDialog = new CeremonyDialog(app, guiNode);
+
+        ambient.setColor(new ColorRGBA(0.3f, 0.3f, 0.3f, 1));
     }
 
     @Override
     public void onEnter() {
+        rootNode.addLight(ambient);
+
+        app.getAcousticHandler().playSound(MdgaSound.VICTORY);
+
+        float screenWidth = app.getCamera().getWidth();
+        float screenHeight = app.getCamera().getHeight();
+        float aspectRatio = screenWidth / screenHeight;
+
+        float scale = 3.5f;
+
+        float distanceFromCamera = 5f;
+        float verticalSize = (float) (2 * Math.tan(Math.toRadians(app.getCamera().getFov() / 2)) * distanceFromCamera * scale);
+        float horizontalSize = verticalSize * aspectRatio;
+
+        Quad backgroundQuad = new Quad(horizontalSize, verticalSize);
+        background = new Geometry("LobbyBackground", backgroundQuad);
+
+        TextureKey backgroundKey = new TextureKey("Images/lobby.png", true);
+        Texture backgroundTexture = app.getAssetManager().loadTexture(backgroundKey);
+        Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        backgroundMaterial.setTexture("ColorMap", backgroundTexture);
+        background.setMaterial(backgroundMaterial);
+        background.setLocalTranslation(-horizontalSize / 2, -verticalSize / 2, -distanceFromCamera);
+        rootNode.attachChild(background);
+
+        verticalSize *= 0.99f;
+
+        Quad overlayQuad = new Quad(horizontalSize, verticalSize * 0.8f);
+        podest = new Geometry("TransparentOverlay", overlayQuad);
+
+        TextureKey overlayKey = new TextureKey("Images/Ceremony.png", true);
+        Texture overlayTexture = app.getAssetManager().loadTexture(overlayKey);
+        Material overlayMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        overlayMaterial.setTexture("ColorMap", overlayTexture);
+
+        overlayMaterial.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
+        podest.setMaterial(overlayMaterial);
+
+        float overlayDistance = distanceFromCamera - 0.1f;
+        podest.setLocalTranslation(-horizontalSize / 2, -verticalSize * 0.415f, -overlayDistance);
+
         enterSub(SubState.AWARD_CEREMONY);
     }
 
     @Override
     public void onLeave() {
-        continueButton.hide();
         backButton.hide();
+        continueButton.hide();
+
+        if(null != background) {
+            guiNode.detachChild(background);
+        }
+
+        ceremonyButtons.clear();
+
+        rootNode.removeLight(ambient);
+
+        ceremonyDialog.prepare();
+
+        rootNode.detachChild(background);
+    }
+
+    @Override
+    protected void onEnterOverlay(Overlay overlay) {
+        if(rootNode.hasChild(podest)) {
+            rootNode.detachChild(podest);
+        }
+    }
+
+    @Override
+    protected void onLeaveOverlay(Overlay overlay) {
+        enterSub(state);
+    }
+
+    @Override
+    protected void onUpdate(float tpf) {
+        for (CeremonyButton c : ceremonyButtons) {
+            c.update(tpf);
+        }
     }
 
     private void awardCeremony() {
-        background = createBackground("b1.png");
-        node.attachChild(background);
-
         continueButton.show();
-        backButton.hide();
+
+        rootNode.attachChild(podest);
+
+        for (CeremonyButton c : ceremonyButtons) {
+            c.show();
+        }
     }
 
     private void statistics() {
-        background = createBackground("b2.png");
-        node.attachChild(background);
+        //background = createBackground("Images/b2.png");
+        //guiNode.attachChild(background);
 
-        continueButton.show();
         backButton.show();
+        continueButton.show();
+        ceremonyDialog.show();
     }
 
     private void enterSub(SubState state) {
         this.state = state;
 
-        if(null != background) {
-            node.detachChild(background);
+        if(rootNode.hasChild(podest)) {
+            rootNode.detachChild(podest);
         }
 
         backButton.hide();
         continueButton.hide();
+        for (CeremonyButton c : ceremonyButtons) {
+            c.hide();
+        }
+        ceremonyDialog.hide();
 
         switch (state) {
             case AWARD_CEREMONY:
@@ -74,13 +178,13 @@ private void enterSub(SubState state) {
         }
     }
 
-    private void forward() {
+    public void forward() {
         switch (state) {
             case AWARD_CEREMONY:
                 enterSub(SubState.STATISTICS);
                 break;
             case STATISTICS:
-                app.getModelSyncronizer().enter(MdgaState.MAIN);
+                app.getModelSynchronize().enter(MdgaState.MAIN);
                 break;
         }
     }
@@ -95,4 +199,18 @@ private void back() {
                 break;
         }
     }
+
+    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.equals(SubState.AWARD_CEREMONY)) {
+            button.show();
+        }
+    }
+
+    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);
+    }
 }

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

@@ -1,79 +1,169 @@
 package pp.mdga.client.view;
 
 import com.jme3.post.FilterPostProcessor;
+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.dialog.SingleButtonLeftDialog;
-import pp.mdga.client.dialog.SingleButtonRightDialog;
 import pp.mdga.client.MdgaApp;
-import pp.mdga.client.MdgaState;
+import pp.mdga.client.button.ButtonLeft;
+import pp.mdga.client.button.ButtonRight;
 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.ShieldActiveNotification;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 public class GameView extends MdgaView {
     private BoardHandler boardHandler;
     private CameraHandler camera;
     private GuiHandler guiHandler;
 
-    private SingleButtonLeftDialog leaveButton;
-    private SingleButtonRightDialog continueButton;
+    private ButtonRight cheatButton; //TODO
+
+    private ButtonLeft leaveButton;
+    private ButtonRight confirmButton;
+
+    private Color ownColor = null;
+
+    private FilterPostProcessor fpp;
 
     public GameView(MdgaApp app) {
         super(app);
 
-        //Filter für Outline: Reihenfolge CameraHandler(dlsf) -> BoardHandler -> viewPort.addProcessor einhalten!
-        FilterPostProcessor fpp = new FilterPostProcessor(app.getAssetManager());
+        cheatButton = new ButtonRight(app, overlayNode, () -> app.getModelSynchronize().enter(MdgaState.CEREMONY), "CHEAT", 1);
+        leaveButton = new ButtonLeft(app, overlayNode, () -> app.getModelSynchronize().leave(), "Spiel verlassen", 1);
+
+        confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1);
+
+        fpp = new FilterPostProcessor(app.getAssetManager());
         this.camera = new CameraHandler(app, fpp);
-        this.boardHandler = new BoardHandler(app, fpp);
-        app.getViewPort().addProcessor(fpp);
+        this.boardHandler = new BoardHandler(app, rootNode, fpp);
 
-        this.guiHandler = new GuiHandler(app);
+        guiHandler = new GuiHandler(app, guiNode);
 
-        leaveButton = new SingleButtonLeftDialog(app, settingsNode, "Verlassen", () -> leaveGame());
-
-        continueButton = new SingleButtonRightDialog(app, node, "Weiter", () -> app.getModelSyncronizer().enter(MdgaState.CEREMONY));
     }
 
     @Override
     public void onEnter() {
         camera.init();
         boardHandler.init();
-        guiHandler.init();
-        continueButton.show();
+        setOwnColor(Color.AIRFORCE);
+        guiHandler.init(ownColor);
+
+        app.getViewPort().addProcessor(fpp);
+
+        app.getAcousticHandler().playSound(MdgaSound.START);
+
+        //Test
+
+        List<UUID> uuid1 = new ArrayList<>();
+        UUID p1 = UUID.randomUUID();
+        UUID p2 = UUID.randomUUID();
+        uuid1.add(p1);
+        uuid1.add(p2);
+        uuid1.add(UUID.randomUUID());
+        uuid1.add(UUID.randomUUID());
+        List<UUID> uuid2 = new ArrayList<>();
+        UUID p1_2 = UUID.randomUUID();
+        UUID p2_2 = UUID.randomUUID();
+        uuid2.add(p1_2);
+        uuid2.add(p2_2);
+        uuid2.add(UUID.randomUUID());
+        uuid2.add(UUID.randomUUID());
+
+
+        app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.AIRFORCE, uuid1, "Cedric"));
+        app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.NAVY, uuid2, "Test"));
+        app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1, 0, true));
+        app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true));
+//        app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false)));
+        app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD));
+
+//        app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
+//        app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1));
+//        app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY));
+
+//        app.getNotificationSynchronizer().addTestNotification(new DiceNowNotification());
+//        app.getNotificationSynchronizer().addTestNotification(new RollDiceNotification(Color.AIRFORCE, 5, true, 2));
+
+
+
+        p1 = p1;
+
 
     }
 
     @Override
     public void onLeave() {
-        continueButton.hide();
-
-        camera.shutdown();
         boardHandler.shutdown();
+        guiHandler.shutdown();
+        camera.shutdown();
+
+
+        confirmButton.hide();
+
+        app.getViewPort().removeProcessor(fpp);
     }
 
     @Override
-    public void onUpdate() {
-        camera.update(app.getInputSyncronizer().getScroll(), app.getInputSyncronizer().getRotation());
+    public void onUpdate(float tpf) {
+        camera.update(app.getInputSynchronize().getScroll(), app.getInputSynchronize().getRotation());
     }
 
     @Override
-    protected void enterExtendedSettings() {
+    protected void onEnterOverlay(Overlay overlay) {
+        if(overlay == Overlay.SETTINGS) {
             leaveButton.show();
+            cheatButton.show();
+        }
     }
 
     @Override
-    protected void leaveExtendedSettings() {
+    protected void onLeaveOverlay(Overlay overlay) {
+        if(overlay == Overlay.SETTINGS) {
             leaveButton.hide();
+            cheatButton.hide();
+        }
     }
 
     private void leaveGame() {
-        leaveSettings(false);
-
-        app.getModelSyncronizer().leave();
-
-        app.afteGameCleanup();
+        app.getModelSynchronize().leave();
     }
 
     public BoardHandler getBoardHandler() {
         return  boardHandler;
     }
+
+    public GuiHandler getGuiHandler() {
+        return guiHandler;
+    }
+
+    public void setOwnColor(Color ownColor) {
+        this.ownColor = ownColor;
+    }
+
+    public Color getOwnColor() {
+        return ownColor;
+    }
+
+    public void needConfirm() {
+        confirmButton.show();
+    }
+
+    public void noConfirm() {
+        confirmButton.hide();
+    }
 }

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

@@ -1,58 +1,255 @@
 package pp.mdga.client.view;
 
+import com.jme3.asset.TextureKey;
+import com.jme3.light.AmbientLight;
+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 pp.mdga.client.dialog.LobbyButtonDialog;
-import pp.mdga.client.dialog.SingleButtonLeftDialog;
-import pp.mdga.client.dialog.SingleButtonRightDialog;
+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 java.util.ArrayList;
+import pp.mdga.notification.GameNotification;
 
 public class LobbyView extends MdgaView {
     private Geometry background;
 
-    private SingleButtonRightDialog readyButton;
-    private SingleButtonLeftDialog leaveButton;
+    private ButtonLeft leaveButton;
+    private ButtonRight readyButton;
 
-    private ArrayList<LobbyButtonDialog> lobbyButtons = new ArrayList<>();
+    private LobbyButton cyberButton;
+    private LobbyButton airforceButton;
+    private LobbyButton armyButton;
+    private LobbyButton navyButton;
+
+    private AmbientLight ambient = new AmbientLight();
+
+    private boolean isReady = false;
+
+    private Color own = null;
 
     public LobbyView(MdgaApp app) {
         super(app);
 
-        background = createBackground("lobby.png");
-        node.attachChild(background);
+        leaveButton = new ButtonLeft(app, guiNode, this::leaveLobby, "Verlassen", 1);
+        readyButton = new ButtonRight(app, guiNode, this::ready, "Bereit", 1);
 
-        readyButton = new SingleButtonRightDialog(app, node, "Fertig", () -> app.getModelSyncronizer().setReady());
-        leaveButton = new SingleButtonLeftDialog(app, node, "Verlassen", () -> app.getModelSyncronizer().leave());
+        cyberButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.CYBER), Color.CYBER);
+        airforceButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.AIRFORCE), Color.AIRFORCE);
+        armyButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.ARMY), Color.ARMY);
+        navyButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.NAVY), Color.NAVY);
 
-        lobbyButtons.add(new LobbyButtonDialog(app, node, "HEER", 0));
-        lobbyButtons.add(new LobbyButtonDialog(app, node, "MARINE", 1));
-        lobbyButtons.add(new LobbyButtonDialog(app, node, "CIR", 2));
-        lobbyButtons.add(new LobbyButtonDialog(app, node, "LUFTWAFFE", 3));
+        ambient.setColor(new ColorRGBA(0.3f, 0.3f, 0.3f, 1));
     }
 
     @Override
     public void onEnter() {
-        readyButton.show();
-        leaveButton.show();
+        app.getCamera().setParallelProjection(true);
+        float aspect = (float) app.getCamera().getWidth() / app.getCamera().getHeight();
+        float size = 1.65f;
+        app.getCamera().setFrustum(-1000, 1000, -aspect * size, aspect * size, size, -size);
 
-        for (LobbyButtonDialog b : lobbyButtons) {
-            b.show();
-        }
+        leaveButton.show();
+        readyButton.show();
+
+        cyberButton.show();
+        airforceButton.show();
+        armyButton.show();
+        navyButton.show();
+
+        rootNode.addLight(ambient);
+
+        float screenWidth = app.getCamera().getWidth();
+        float screenHeight = app.getCamera().getHeight();
+
+        float aspectRatio = screenWidth / screenHeight;
+        float scale = 3.5f;
+
+        float quadWidth = scale * aspectRatio;
+        float quadHeight = scale;
+
+        Quad quad = new Quad(quadWidth, quadHeight);
+        background = new Geometry("LobbyBackground", quad);
+
+        TextureKey key = new TextureKey("Images/lobby.png", true);
+        Texture texture = app.getAssetManager().loadTexture(key);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setTexture("ColorMap", texture);
+        background.setMaterial(material);
+
+        background.setLocalTranslation(-quadWidth / 2, -quadHeight / 2, -5);
+
+        rootNode.attachChild(background);
     }
 
     @Override
     public void onLeave() {
-        for (LobbyButtonDialog b : lobbyButtons) {
-            b.hide();
+        leaveButton.hide();
+        readyButton.hide();
+
+        airforceButton.hide();
+        armyButton.hide();
+        navyButton.hide();
+        cyberButton.hide();
+
+        rootNode.removeLight(ambient);
+
+        app.getCamera().setParallelProjection(false);
+
+        app.getCamera().setFrustumPerspective(
+            45.0f,
+            (float) app.getCamera().getWidth() / app.getCamera().getHeight(),
+            0.1f,
+            1000.0f
+        );
+
+        app.getCamera().setLocation(new Vector3f(0, 0, 10));
+        app.getCamera().lookAt(Vector3f.ZERO, Vector3f.UNIT_Y);
+
+        airforceButton.setReady(false);
+        armyButton.setReady(false);
+        navyButton.setReady(false);
+        cyberButton.setReady(false);
+
+        airforceButton.setTaken(LobbyButton.Taken.NOT, null);
+        armyButton.setTaken(LobbyButton.Taken.NOT, null);
+        navyButton.setTaken(LobbyButton.Taken.NOT, null);
+        cyberButton.setTaken(LobbyButton.Taken.NOT, null);
+
+        rootNode.detachChild(background);
     }
 
-        readyButton.hide();
-        leaveButton.hide();
+    @Override
+    protected void onUpdate(float tpf) {
+        airforceButton.update(tpf);
+        armyButton.update(tpf);
+        navyButton.update(tpf);
+        cyberButton.update(tpf);
+    }
+
+    @Override
+    protected void onEnterOverlay(Overlay overlay) {
+
+    }
+
+    @Override
+    protected void onLeaveOverlay(Overlay overlay)
+    {
+
     }
 
     public void setTaken(Color color, boolean isTaken, boolean isSelf, String name) {
-        lobbyButtons.get(color.ordinal()).setTaken(isTaken, isSelf, name);
+        LobbyButton.Taken taken;
+
+        if(isTaken) {
+            if(isSelf) {
+                own = color;
+                taken = LobbyButton.Taken.SELF;
+            } else {
+                taken = LobbyButton.Taken.OTHER;
+            }
+        } else {
+            if(isSelf) {
+                own = null;
+            }
+
+            taken = LobbyButton.Taken.NOT;
+        }
+
+        switch (color) {
+            case CYBER:
+                cyberButton.setTaken(taken, name);
+                break;
+            case AIRFORCE:
+                airforceButton.setTaken(taken, name);
+                break;
+            case ARMY:
+                armyButton.setTaken(taken, name);
+                break;
+            case NAVY:
+                navyButton.setTaken(taken, name);
+                break;
+        }
+    }
+
+    public void setReady(Color color, boolean isReady) {
+        LobbyButton button = switch (color) {
+            case CYBER -> cyberButton;
+            case AIRFORCE -> airforceButton;
+            case ARMY -> armyButton;
+            case NAVY -> navyButton;
+            default -> throw new RuntimeException("None is not valid");
+        };
+
+        button.setReady(isReady);
+
+        if (button.getTaken() == LobbyButton.Taken.SELF) {
+            this.isReady = isReady;
+        }
+
+        if(!isReady) {
+            app.getAcousticHandler().playSound(MdgaSound.NOT_READY);
+        } else {
+            if(button.getTaken() != LobbyButton.Taken.SELF) {
+                app.getAcousticHandler().playSound(MdgaSound.OTHER_READY);
+            }
+        }
+    }
+
+    private void toggleTsk(Color color) {
+        LobbyButton.Taken taken = LobbyButton.Taken.NOT;
+
+        switch (color) {
+            case CYBER:
+                taken = cyberButton.getTaken();
+                break;
+            case AIRFORCE:
+                taken = airforceButton.getTaken();
+                break;
+            case ARMY:
+                taken = armyButton.getTaken();
+                break;
+            case NAVY:
+                taken = navyButton.getTaken();
+                break;
+        }
+
+        switch (taken) {
+            case NOT:
+                app.getModelSynchronize().selectTsk(color);
+                break;
+            case SELF:
+                app.getModelSynchronize().unselectTsk();
+                break;
+            case OTHER:
+                //nothing
+                break;
+        }
+    }
+
+    public void ready() {
+        if(own == null) {
+            app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
+            return;
+        }
+
+        if(!isReady) {
+            app.getAcousticHandler().playSound(MdgaSound.SELF_READY);
+        }
+
+        app.getModelSynchronize().setReady(!isReady);
+    }
+
+    private void leaveLobby() {
+        app.getModelSynchronize().leave();
     }
 }

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

@@ -1,79 +1,220 @@
 package pp.mdga.client.view;
 
 import com.jme3.scene.Geometry;
-import pp.mdga.client.dialog.Dialog;
+import pp.mdga.client.MdgaApp;
+import pp.mdga.client.acoustic.MdgaSound;
 import pp.mdga.client.dialog.HostDialog;
 import pp.mdga.client.dialog.JoinDialog;
 import pp.mdga.client.dialog.StartDialog;
-import pp.mdga.client.MdgaApp;
-
-import com.jme3.math.Vector3f;
 
 public class MainView extends MdgaView {
+    private enum SubState {
+        HOST,
+        JOIN,
+        MAIN,
+    }
+
+    private SubState state;
+
     private Geometry background;
 
-    private StartDialog dialog;
-    private Dialog subDialog;
+    private StartDialog startDialog;
+    private JoinDialog joinDialog;
+    private HostDialog hostDialog;
 
     public MainView(MdgaApp app) {
         super(app);
 
-        background = createBackground("powercards.png");
-        node.attachChild(background);
+        startDialog = new StartDialog(app, guiNode, this);
+        joinDialog = new JoinDialog(app, guiNode, this);
+        hostDialog = new HostDialog(app, guiNode, this);
 
-        Vector3f size = new Vector3f(280, 60, 0);
-        dialog = new StartDialog(app, node);
-        dialog.addButton("Spiel beitreten", () -> enterJoin(), size);
-        dialog.addButton("Spiel hosten", () -> enterHost(), size);
-        dialog.addButton("Einstellungen", () -> enterSettings(false), size);
-        dialog.addButton("Spiel beenden", () -> app.stop(), size);
+        background = createBackground("Images/startmenu.png");
     }
 
     @Override
     public void onEnter() {
-        dialog.show();
+        app.setup();
+
+        guiNode.attachChild(background);
+
+        enterSub(SubState.MAIN);
     }
 
     @Override
     public void onLeave() {
-        dialog.hide();
+        startDialog.hide();
+        joinDialog.hide();
+        hostDialog.hide();
 
-        if(subDialog != null) {
-            subDialog.hide();
-            subDialog = null;
+        guiNode.detachChild(background);
+    }
+
+    @Override
+    public void onUpdate(float tpf) {
+        startDialog.update();
+        joinDialog.update();
+        hostDialog.update();
+    }
+
+    @Override
+    protected void onEnterOverlay(Overlay overlay) {
+        guiNode.detachChild(background);
+        overlayNode.attachChild(background);
+    }
+
+    @Override
+    protected void onLeaveOverlay(Overlay overlay) {
+        overlayNode.detachChild(background);
+        guiNode.attachChild(background);
+    }
+
+    private void joinMenu() {
+        startDialog.hide();
+        hostDialog.hide();
+
+        joinDialog.show();
+    }
+
+    private void hostMenu() {
+        startDialog.hide();
+        joinDialog.hide();
+
+        hostDialog.show();
+    }
+
+    private void mainMenu() {
+        joinDialog.hide();
+        hostDialog.hide();
+
+        startDialog.show();
+    }
+
+    private void tryHost() {
+        int port = 0;
+        String text = hostDialog.getPort();
+
+        try {
+            port = Integer.parseInt(text);
+
+            if(port >= 1 && port <= 65535) {
+                app.getModelSynchronize().setName(startDialog.getName());
+                app.getModelSynchronize().setHost(port);
+                //app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
+                return;
+            }
+        } catch (NumberFormatException e) {
+            //nothing
+        }
+
+        hostDialog.resetPort();
+        app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
+    }
+
+    private void tryJoin() {
+        int port = 0;
+        String ip = joinDialog.getIpt();
+        String portText = hostDialog.getPort();
+
+        try {
+            // Validate the port
+            port = Integer.parseInt(portText);
+            if (port < 1 || port > 65535) {
+                throw new IllegalArgumentException("Invalid port");
+            }
+
+            // Validate the IP address
+            if (isValidIpAddress(ip)) {
+                app.getModelSynchronize().setName(startDialog.getName());
+                app.getModelSynchronize().setJoin(ip, port);
+                return;
+            }
+        } catch (IllegalArgumentException e) {
+            // Invalid input, fall through to reset
+        }
+
+        hostDialog.resetPort();
+        joinDialog.resetIp();
+        app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
+    }
+
+    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]?)$";
+
+        return ip != null && ip.matches(ipRegex);
+    }
+
+    private void enterSub(SubState state) {
+        this.state = state;
+
+        if(null != background) {
+            rootNode.detachChild(background);
+        }
+
+        switch (state) {
+            case HOST:
+                hostMenu();
+                break;
+            case JOIN:
+                joinMenu();
+                break;
+            case MAIN:
+                mainMenu();
+                break;
         }
     }
 
-    private void enterJoin() {
-        app.getModelSyncronizer().setName(dialog.getName());
-
-        subDialog = new JoinDialog(app, node, () -> leaveJoin());
-
-        dialog.hide();
-        subDialog.show();
-    }
-
-    private void leaveJoin() {
-        subDialog.hide();
-        dialog.show();
-
-        subDialog = null;
-    }
-
-    private void enterHost() {
-        app.getModelSyncronizer().setName(dialog.getName());
-
-        subDialog = new HostDialog(app, node, () -> leaveHost());
-
-        dialog.hide();
-        subDialog.show();
-    }
-
-    private void leaveHost() {
-        subDialog.hide();
-        dialog.show();
-
-        subDialog = null;
+    public void forward() {
+        switch (state) {
+            case HOST:
+                tryHost();
+                break;
+            case JOIN:
+                tryJoin();
+                break;
+            case MAIN:
+                throw new RuntimeException("call forward(boolean host) insted of forward()");
+        }
+    }
+
+    public void forward(boolean host) {
+        switch (state) {
+            case HOST:
+                tryHost();
+                break;
+            case JOIN:
+                tryJoin();
+                break;
+            case MAIN:
+                if(host) {
+                    enterSub(SubState.HOST);
+                    //TODO playSound
+                } else {
+                    enterSub(SubState.JOIN);
+                    //TODO: playSound
+                }
+                break;
+        }
+    }
+
+    public void back() {
+        switch (state) {
+            case HOST:
+                enterSub(SubState.MAIN);
+                //TODO: playSound
+                break;
+            case JOIN:
+                enterSub(SubState.MAIN);
+                //TODO: playSound
+                break;
+            case MAIN:
+                //nothing
+                break;
+        }
     }
 }
 

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

@@ -2,81 +2,48 @@
 
 import com.jme3.asset.TextureKey;
 import com.jme3.material.Material;
-import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
-import pp.mdga.client.dialog.GetPercentRunnable;
-import pp.mdga.client.dialog.PercentRunnable;
-import pp.mdga.client.dialog.SettingsButtonDialog;
 import pp.mdga.client.MdgaApp;
+import pp.mdga.client.acoustic.MdgaSound;
+import pp.mdga.client.button.*;
+import pp.mdga.client.dialog.AudioSettingsDialog;
 import pp.mdga.client.dialog.SettingsDialog;
+import pp.mdga.client.dialog.VideoSettingsDialog;
 
 public abstract class MdgaView {
+    public enum Overlay {
+        INTERRUPT,
+        SETTINGS,
+    }
+
     protected MdgaApp app;
-    protected Node node;
+    protected Node rootNode = new Node("View Root");
+    protected Node guiNode = new Node("View Root GUI");
+    protected Node overlayNode = new Node("View Root Overlay");
 
-    protected int depth = 0;
-    private boolean isVideo = false;
-    private boolean isAudio = false;
+    private SettingsButton settingsButton;
 
-    protected Node settingsNode;
-    protected Node audioSettingsNode;
-    protected Node videoSettingsNode;
+    private SettingsDialog settingsDialog;
+    private VideoSettingsDialog videoSettingsDialog;
+    private AudioSettingsDialog audioSettingsDialog;
 
-    private SettingsButtonDialog settingsButton;
-
-    private Geometry settingsBackground;
-    private Geometry audioBackground;
-    private Geometry videoBackground;
-
-    private SettingsDialog settings;
-    private SettingsDialog audio;
-    private SettingsDialog video;
+    private int settingsDepth = 0;
 
     public MdgaView(MdgaApp app) {
         this.app = app;
-        this.node = new Node();
+        settingsButton = new SettingsButton(app, guiNode, this::enterSettings);
 
-        this.settingsNode = new Node();
-        this.audioSettingsNode = new Node();
-        this.videoSettingsNode = new Node();
-
-        this.settingsButton = new SettingsButtonDialog(app, node, "", () -> enterSettings(false));
-
-        this.settingsBackground = createBackground("background/zahnräder.png");
-        settingsNode.attachChild(settingsBackground);
-
-        this.audioBackground = createBackground("background/lautsprecher.png");
-        audioSettingsNode.attachChild(audioBackground);
-
-        this.videoBackground = createBackground("background/monitors.png");
-        videoSettingsNode.attachChild(videoBackground);
-
-        Vector3f size = new Vector3f(280, 60, 0);
-
-        this.settings = new SettingsDialog(app, settingsNode, "zahnrad.png");
-        this.settings.addButton("Video", () -> enterVideo(), size);
-        this.settings.addButton("Audio", () -> enterAudio(), size);
-        this.settings.addButton("Zurück", () -> leaveSettings(false), size);
-
-        this.audio = new SettingsDialog(app, audioSettingsNode, "audio_icon.png");
-        this.audio.addSlider("Lautstärke", new PercentRunnable(app.getAcousticHandler()::setMainVolume), new GetPercentRunnable(app.getAcousticHandler()::getMainVolume), size, (int) app.getAcousticHandler().getMainVolume() * 100);
-        this.audio.addSlider("Musik", new PercentRunnable(app.getAcousticHandler()::setMusicVolume), new GetPercentRunnable(app.getAcousticHandler()::getMusicVolume), size, (int) app.getAcousticHandler().getMusicVolume() * 100);
-        this.audio.addSlider("Sound", new PercentRunnable(app.getAcousticHandler()::setSoundVolume), new GetPercentRunnable(app.getAcousticHandler()::getSoundVolume), size, (int) app.getAcousticHandler().getSoundVolume() * 100);
-        this.audio.addButton("Zurück", () -> leaveAudio(), size);
-
-        this.video = new SettingsDialog(app, videoSettingsNode, "monitor.png");
-        this.video.addButton("A", () -> System.out.println("A"), size);
-        this.video.addButton("B", () -> System.out.println("B"), size);
-        this.video.addButton("Zurück", () -> leaveVideo(), size);
+        settingsDialog = new SettingsDialog(app, overlayNode, this);
+        videoSettingsDialog = new VideoSettingsDialog(app, overlayNode, this);
+        audioSettingsDialog = new AudioSettingsDialog(app, overlayNode, this);
     }
 
     public void enter() {
-        app.getGuiNode().attachChild(node);
-
-        audio.initVolume();
+        app.getRootNode().attachChild(rootNode);
+        app.getGuiNode().attachChild(guiNode);
 
         settingsButton.show();
 
@@ -86,121 +53,140 @@ public void enter() {
     public void leave() {
         onLeave();
 
+
         settingsButton.hide();
 
-        app.getGuiNode().detachChild(node);
+        while (settingsDepth > 0) {
+            pressEscape();
         }
 
-    public void update() {
-        audio.update();
-        onUpdate();
+        app.getRootNode().detachChild(rootNode);
+        app.getGuiNode().detachChild(guiNode);
+    }
+
+    public void enterOverlay(Overlay overlay) {
+        app.getGuiNode().detachChild(guiNode);
+
+        onEnterOverlay(overlay);
+    }
+
+    public void leaveOverlay(Overlay overlay) {
+        app.getGuiNode().attachChild(guiNode);
+
+        onLeaveOverlay(overlay);
+    }
+
+    public void update(float tpf) {
+        videoSettingsDialog.update();
+        audioSettingsDialog.update();
+
+        onUpdate(tpf);
     }
 
     protected abstract void onEnter();
     protected abstract void onLeave();
-    protected void onUpdate() {}
+    protected void onUpdate(float tpf) {}
+
+    protected abstract void onEnterOverlay(Overlay overlay);
+    protected abstract void onLeaveOverlay(Overlay overlay);
 
     protected Geometry createBackground(String texturePath) {
         TextureKey key = new TextureKey(texturePath, true);
         Texture backgroundTexture = app.getAssetManager().loadTexture(key);
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry background = new Geometry("Background", quad);
+
         Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
         mat.setTexture("ColorMap", backgroundTexture);
+
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+
+        Geometry background = new Geometry("Background", quad);
         background.setMaterial(mat);
-        background.setLocalTranslation(0, 0, -1);
+        background.setLocalTranslation(0, 0, -2);
+
         return background;
     }
 
-    protected void enterExtendedSettings() {}
-    protected void leaveExtendedSettings() {}
+    public void enterSettings() {
+        enterOverlay(Overlay.SETTINGS);
 
-    protected void enterSettings(boolean soft) {
-        leave();
+        app.getGuiNode().attachChild(overlayNode);
 
-        app.getGuiNode().attachChild(settingsNode);
+        settingsDialog.show();
 
-        if(!soft) {
-            depth++;
-
-            enterExtendedSettings();
+        settingsDepth++;
     }
 
-        settings.show();
+    public void leaveSettings() {
+        leaveOverlay(Overlay.SETTINGS);
+
+        app.getGuiNode().detachChild(overlayNode);
+
+        settingsDialog.hide();
+
+        settingsDepth--;
     }
 
-    protected void leaveSettings(boolean soft) {
-        settings.hide();
+    public void enterVideoSettings() {
+        settingsDialog.hide();
+        videoSettingsDialog.show();
 
-        app.getGuiNode().detachChild(settingsNode);
-
-        if(!soft) {
-            leaveExtendedSettings();
-            enter();
-            depth--;
-        }
+        settingsDepth++;
     }
 
-    protected void enterAudio() {
-        leaveSettings(true);
+    public void leaveVideoSettings() {
+        settingsDialog.show();
+        videoSettingsDialog.hide();
 
-        depth++;
-        isAudio = true;
-
-        app.getGuiNode().attachChild(audioSettingsNode);
-
-        audio.show();
+        settingsDepth--;
     }
 
-    protected void leaveAudio() {
-        audio.hide();
+    public void enterAudioSettings() {
+        settingsDialog.hide();
+        audioSettingsDialog.show();
 
-        app.getGuiNode().detachChild(audioSettingsNode);
-
-        isAudio = false;
-        depth--;
-
-        enterSettings(true);
+        settingsDepth++;
     }
 
-    protected void enterVideo() {
-        leaveSettings(true);
+    public void leaveAudioSettings() {
+        settingsDialog.show();
+        audioSettingsDialog.hide();
 
-        app.getGuiNode().attachChild(videoSettingsNode);
-
-        depth++;
-
-        isVideo = true;
-
-        video.show();
+        settingsDepth--;
     }
 
-    protected void leaveVideo() {
-        video.hide();
-
-        app.getGuiNode().detachChild(videoSettingsNode);
-
-        depth--;
-        isVideo = false;
-
-        enterSettings(true);
+    private void leaveAdvanced() {
+        settingsDialog.show();
+        audioSettingsDialog.hide();
+        videoSettingsDialog.hide();
+        settingsDepth--;
     }
 
     public void pressEscape() {
-        if(depth == 0) {
-            enterSettings(false);
-        } else if(depth == 1) {
-            leaveSettings(false);
-        }
-        else if (depth == 2){
-            if(isVideo) {
-                leaveVideo();
-            }
-            if(isAudio) {
-                leaveAudio();
-            }
+        if(settingsDepth == 0) {
+            enterSettings();
+        } else if(settingsDepth == 1) {
+            leaveSettings();
         } else {
-            throw new RuntimeException();
+            leaveAdvanced();
+        }
+    }
+
+    public void pressForward() {
+        if(this instanceof MainView mainView) {
+            mainView.forward(false);
+            app.getAcousticHandler().playSound(MdgaSound.BUTTON_PRESSED);
+        }
+
+        if(this instanceof LobbyView lobbyView) {
+            lobbyView.ready();
+        }
+
+        if(this instanceof GameView gameView) {
+            app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
+        }
+
+        if(this instanceof CeremonyView ceremonyView) {
+            ceremonyView.forward();
         }
     }
 }

Projekte/mdga/client/src/main/resources/Fonts/Gunplay.fnt

@@ -0,0 +1,195 @@
+info face=null size=178 bold=0 italic=0 charset=ASCII unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 
+common lineHeight=214 base=26 scaleW=2048 scaleH=2048 pages=1 packed=0 
+page id=0 file="Gunplay.png"
+chars count=255
+char id=9    x=0    y=46    width=6    height=220    xoffset=0    yoffset=0    xadvance=-1     page=0    chnl=0
+char id=10    x=6    y=46    width=6    height=220    xoffset=0    yoffset=0    xadvance=-1     page=0    chnl=0
+char id=13    x=12    y=46    width=6    height=220    xoffset=0    yoffset=0    xadvance=-1     page=0    chnl=0
+char id=32    x=18    y=46    width=6    height=220    xoffset=0    yoffset=0    xadvance=59     page=0    chnl=0
+char id=33    x=24    y=46    width=40    height=220    xoffset=8    yoffset=0    xadvance=49     page=0    chnl=0
+char id=34    x=64    y=46    width=62    height=220    xoffset=8    yoffset=0    xadvance=71     page=0    chnl=0
+char id=35    x=126    y=46    width=95    height=220    xoffset=3    yoffset=0    xadvance=95     page=0    chnl=0
+char id=36    x=221    y=46    width=84    height=220    xoffset=4    yoffset=0    xadvance=86     page=0    chnl=0
+char id=37    x=305    y=46    width=148    height=220    xoffset=6    yoffset=0    xadvance=153     page=0    chnl=0
+char id=38    x=453    y=46    width=127    height=220    xoffset=6    yoffset=0    xadvance=131     page=0    chnl=0
+char id=39    x=580    y=46    width=31    height=220    xoffset=8    yoffset=0    xadvance=39     page=0    chnl=0
+char id=40    x=611    y=46    width=44    height=220    xoffset=4    yoffset=0    xadvance=44     page=0    chnl=0
+char id=41    x=655    y=46    width=44    height=220    xoffset=4    yoffset=0    xadvance=44     page=0    chnl=0
+char id=42    x=699    y=46    width=71    height=220    xoffset=4    yoffset=0    xadvance=71     page=0    chnl=0
+char id=43    x=770    y=46    width=86    height=220    xoffset=3    yoffset=0    xadvance=85     page=0    chnl=0
+char id=44    x=856    y=46    width=38    height=220    xoffset=7    yoffset=0    xadvance=43     page=0    chnl=0
+char id=45    x=894    y=46    width=65    height=220    xoffset=8    yoffset=0    xadvance=75     page=0    chnl=0
+char id=46    x=959    y=46    width=39    height=220    xoffset=8    yoffset=0    xadvance=48     page=0    chnl=0
+char id=47    x=998    y=46    width=102    height=220    xoffset=1    yoffset=0    xadvance=97     page=0    chnl=0
+char id=48    x=1100    y=46    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=49    x=1207    y=46    width=61    height=220    xoffset=2    yoffset=0    xadvance=64     page=0    chnl=0
+char id=50    x=1268    y=46    width=104    height=220    xoffset=6    yoffset=0    xadvance=111     page=0    chnl=0
+char id=51    x=1372    y=46    width=100    height=220    xoffset=6    yoffset=0    xadvance=106     page=0    chnl=0
+char id=52    x=1472    y=46    width=111    height=220    xoffset=3    yoffset=0    xadvance=109     page=0    chnl=0
+char id=53    x=1583    y=46    width=98    height=220    xoffset=7    yoffset=0    xadvance=105     page=0    chnl=0
+char id=54    x=1681    y=46    width=104    height=220    xoffset=8    yoffset=0    xadvance=112     page=0    chnl=0
+char id=55    x=1785    y=46    width=92    height=220    xoffset=6    yoffset=0    xadvance=93     page=0    chnl=0
+char id=56    x=1877    y=46    width=100    height=220    xoffset=7    yoffset=0    xadvance=107     page=0    chnl=0
+char id=57    x=0    y=266    width=105    height=220    xoffset=7    yoffset=0    xadvance=112     page=0    chnl=0
+char id=58    x=105    y=266    width=36    height=220    xoffset=8    yoffset=0    xadvance=43     page=0    chnl=0
+char id=59    x=141    y=266    width=37    height=220    xoffset=7    yoffset=0    xadvance=43     page=0    chnl=0
+char id=60    x=178    y=266    width=59    height=220    xoffset=1    yoffset=0    xadvance=58     page=0    chnl=0
+char id=61    x=237    y=266    width=92    height=220    xoffset=8    yoffset=0    xadvance=97     page=0    chnl=0
+char id=62    x=329    y=266    width=59    height=220    xoffset=8    yoffset=0    xadvance=61     page=0    chnl=0
+char id=63    x=388    y=266    width=96    height=220    xoffset=4    yoffset=0    xadvance=98     page=0    chnl=0
+char id=64    x=484    y=266    width=132    height=220    xoffset=4    yoffset=0    xadvance=136     page=0    chnl=0
+char id=65    x=616    y=266    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=66    x=736    y=266    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=67    x=843    y=266    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=68    x=950    y=266    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=69    x=1057    y=266    width=87    height=220    xoffset=8    yoffset=0    xadvance=93     page=0    chnl=0
+char id=70    x=1144    y=266    width=87    height=220    xoffset=8    yoffset=0    xadvance=91     page=0    chnl=0
+char id=71    x=1231    y=266    width=105    height=220    xoffset=8    yoffset=0    xadvance=114     page=0    chnl=0
+char id=72    x=1336    y=266    width=105    height=220    xoffset=8    yoffset=0    xadvance=114     page=0    chnl=0
+char id=73    x=1441    y=266    width=41    height=220    xoffset=8    yoffset=0    xadvance=50     page=0    chnl=0
+char id=74    x=1482    y=266    width=63    height=220    xoffset=3    yoffset=0    xadvance=67     page=0    chnl=0
+char id=75    x=1545    y=266    width=114    height=220    xoffset=8    yoffset=0    xadvance=118     page=0    chnl=0
+char id=76    x=1659    y=266    width=83    height=220    xoffset=8    yoffset=0    xadvance=87     page=0    chnl=0
+char id=77    x=1742    y=266    width=142    height=220    xoffset=8    yoffset=0    xadvance=151     page=0    chnl=0
+char id=78    x=1884    y=266    width=111    height=220    xoffset=8    yoffset=0    xadvance=121     page=0    chnl=0
+char id=79    x=0    y=486    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=80    x=107    y=486    width=105    height=220    xoffset=8    yoffset=0    xadvance=108     page=0    chnl=0
+char id=81    x=212    y=486    width=107    height=220    xoffset=6    yoffset=0    xadvance=113     page=0    chnl=0
+char id=82    x=319    y=486    width=107    height=220    xoffset=8    yoffset=0    xadvance=113     page=0    chnl=0
+char id=83    x=426    y=486    width=112    height=220    xoffset=6    yoffset=0    xadvance=117     page=0    chnl=0
+char id=84    x=538    y=486    width=107    height=220    xoffset=3    yoffset=0    xadvance=105     page=0    chnl=0
+char id=85    x=645    y=486    width=107    height=220    xoffset=8    yoffset=0    xadvance=116     page=0    chnl=0
+char id=86    x=752    y=486    width=117    height=220    xoffset=1    yoffset=0    xadvance=111     page=0    chnl=0
+char id=87    x=869    y=486    width=169    height=220    xoffset=1    yoffset=0    xadvance=165     page=0    chnl=0
+char id=88    x=1038    y=486    width=123    height=220    xoffset=3    yoffset=0    xadvance=124     page=0    chnl=0
+char id=89    x=1161    y=486    width=119    height=220    xoffset=2    yoffset=0    xadvance=115     page=0    chnl=0
+char id=90    x=1280    y=486    width=101    height=220    xoffset=5    yoffset=0    xadvance=104     page=0    chnl=0
+char id=91    x=1381    y=486    width=37    height=220    xoffset=8    yoffset=0    xadvance=44     page=0    chnl=0
+char id=92    x=1418    y=486    width=102    height=220    xoffset=1    yoffset=0    xadvance=97     page=0    chnl=0
+char id=93    x=1520    y=486    width=37    height=220    xoffset=8    yoffset=0    xadvance=44     page=0    chnl=0
+char id=94    x=1557    y=486    width=95    height=220    xoffset=4    yoffset=0    xadvance=96     page=0    chnl=0
+char id=95    x=1652    y=486    width=125    height=220    xoffset=-1    yoffset=0    xadvance=115     page=0    chnl=0
+char id=96    x=1777    y=486    width=57    height=220    xoffset=-2    yoffset=0    xadvance=56     page=0    chnl=0
+char id=97    x=1834    y=486    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=98    x=1932    y=486    width=91    height=220    xoffset=8    yoffset=0    xadvance=96     page=0    chnl=0
+char id=99    x=0    y=706    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=100    x=91    y=706    width=90    height=220    xoffset=4    yoffset=0    xadvance=96     page=0    chnl=0
+char id=101    x=181    y=706    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=102    x=272    y=706    width=70    height=220    xoffset=1    yoffset=0    xadvance=66     page=0    chnl=0
+char id=103    x=342    y=706    width=89    height=220    xoffset=6    yoffset=0    xadvance=96     page=0    chnl=0
+char id=104    x=431    y=706    width=91    height=220    xoffset=8    yoffset=0    xadvance=96     page=0    chnl=0
+char id=105    x=522    y=706    width=37    height=220    xoffset=8    yoffset=0    xadvance=46     page=0    chnl=0
+char id=106    x=559    y=706    width=57    height=220    xoffset=-14    yoffset=0    xadvance=44     page=0    chnl=0
+char id=107    x=616    y=706    width=98    height=220    xoffset=8    yoffset=0    xadvance=101     page=0    chnl=0
+char id=108    x=714    y=706    width=37    height=220    xoffset=8    yoffset=0    xadvance=46     page=0    chnl=0
+char id=109    x=751    y=706    width=138    height=220    xoffset=8    yoffset=0    xadvance=147     page=0    chnl=0
+char id=110    x=889    y=706    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=111    x=980    y=706    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=112    x=1071    y=706    width=91    height=220    xoffset=8    yoffset=0    xadvance=96     page=0    chnl=0
+char id=113    x=1162    y=706    width=90    height=220    xoffset=5    yoffset=0    xadvance=96     page=0    chnl=0
+char id=114    x=1252    y=706    width=65    height=220    xoffset=8    yoffset=0    xadvance=69     page=0    chnl=0
+char id=115    x=1317    y=706    width=91    height=220    xoffset=6    yoffset=0    xadvance=96     page=0    chnl=0
+char id=116    x=1408    y=706    width=73    height=220    xoffset=1    yoffset=0    xadvance=68     page=0    chnl=0
+char id=117    x=1481    y=706    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=118    x=1572    y=706    width=99    height=220    xoffset=1    yoffset=0    xadvance=95     page=0    chnl=0
+char id=119    x=1671    y=706    width=146    height=220    xoffset=3    yoffset=0    xadvance=144     page=0    chnl=0
+char id=120    x=1817    y=706    width=102    height=220    xoffset=4    yoffset=0    xadvance=103     page=0    chnl=0
+char id=121    x=1919    y=706    width=99    height=220    xoffset=2    yoffset=0    xadvance=96     page=0    chnl=0
+char id=122    x=0    y=926    width=84    height=220    xoffset=5    yoffset=0    xadvance=86     page=0    chnl=0
+char id=123    x=84    y=926    width=67    height=220    xoffset=3    yoffset=0    xadvance=68     page=0    chnl=0
+char id=124    x=151    y=926    width=27    height=220    xoffset=8    yoffset=0    xadvance=36     page=0    chnl=0
+char id=125    x=178    y=926    width=67    height=220    xoffset=6    yoffset=0    xadvance=68     page=0    chnl=0
+char id=126    x=245    y=926    width=93    height=220    xoffset=12    yoffset=0    xadvance=110     page=0    chnl=0
+char id=161    x=338    y=926    width=40    height=220    xoffset=8    yoffset=0    xadvance=49     page=0    chnl=0
+char id=162    x=378    y=926    width=82    height=220    xoffset=8    yoffset=0    xadvance=90     page=0    chnl=0
+char id=163    x=460    y=926    width=93    height=220    xoffset=5    yoffset=0    xadvance=95     page=0    chnl=0
+char id=164    x=553    y=926    width=80    height=220    xoffset=12    yoffset=0    xadvance=97     page=0    chnl=0
+char id=165    x=633    y=926    width=119    height=220    xoffset=4    yoffset=0    xadvance=120     page=0    chnl=0
+char id=166    x=752    y=926    width=27    height=220    xoffset=8    yoffset=0    xadvance=35     page=0    chnl=0
+char id=167    x=779    y=926    width=95    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=168    x=874    y=926    width=68    height=220    xoffset=8    yoffset=0    xadvance=78     page=0    chnl=0
+char id=169    x=942    y=926    width=153    height=220    xoffset=7    yoffset=0    xadvance=157     page=0    chnl=0
+char id=170    x=1095    y=926    width=68    height=220    xoffset=7    yoffset=0    xadvance=75     page=0    chnl=0
+char id=171    x=1163    y=926    width=77    height=220    xoffset=8    yoffset=0    xadvance=88     page=0    chnl=0
+char id=172    x=1240    y=926    width=102    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=174    x=1342    y=926    width=93    height=220    xoffset=5    yoffset=0    xadvance=95     page=0    chnl=0
+char id=175    x=1435    y=926    width=65    height=220    xoffset=8    yoffset=0    xadvance=75     page=0    chnl=0
+char id=176    x=1500    y=926    width=70    height=220    xoffset=6    yoffset=0    xadvance=73     page=0    chnl=0
+char id=177    x=1570    y=926    width=93    height=220    xoffset=12    yoffset=0    xadvance=110     page=0    chnl=0
+char id=178    x=1663    y=926    width=55    height=220    xoffset=8    yoffset=0    xadvance=63     page=0    chnl=0
+char id=179    x=1718    y=926    width=53    height=220    xoffset=8    yoffset=0    xadvance=60     page=0    chnl=0
+char id=180    x=1771    y=926    width=60    height=220    xoffset=9    yoffset=0    xadvance=61     page=0    chnl=0
+char id=182    x=1831    y=926    width=73    height=220    xoffset=14    yoffset=0    xadvance=92     page=0    chnl=0
+char id=183    x=1904    y=926    width=39    height=220    xoffset=8    yoffset=0    xadvance=48     page=0    chnl=0
+char id=184    x=1943    y=926    width=44    height=220    xoffset=8    yoffset=0    xadvance=48     page=0    chnl=0
+char id=185    x=1987    y=926    width=33    height=220    xoffset=9    yoffset=0    xadvance=46     page=0    chnl=0
+char id=186    x=0    y=1146    width=69    height=220    xoffset=7    yoffset=0    xadvance=78     page=0    chnl=0
+char id=187    x=69    y=1146    width=77    height=220    xoffset=8    yoffset=0    xadvance=88     page=0    chnl=0
+char id=188    x=146    y=1146    width=128    height=220    xoffset=10    yoffset=0    xadvance=139     page=0    chnl=0
+char id=189    x=274    y=1146    width=126    height=220    xoffset=9    yoffset=0    xadvance=140     page=0    chnl=0
+char id=190    x=400    y=1146    width=135    height=220    xoffset=3    yoffset=0    xadvance=138     page=0    chnl=0
+char id=191    x=535    y=1146    width=97    height=220    xoffset=4    yoffset=0    xadvance=98     page=0    chnl=0
+char id=192    x=632    y=1146    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=193    x=752    y=1146    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=194    x=872    y=1146    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=195    x=992    y=1146    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=196    x=1112    y=1146    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=197    x=1232    y=1146    width=120    height=220    xoffset=1    yoffset=0    xadvance=114     page=0    chnl=0
+char id=198    x=1352    y=1146    width=131    height=220    xoffset=1    yoffset=0    xadvance=133     page=0    chnl=0
+char id=199    x=1483    y=1146    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=200    x=1590    y=1146    width=87    height=220    xoffset=8    yoffset=0    xadvance=93     page=0    chnl=0
+char id=201    x=1677    y=1146    width=87    height=220    xoffset=8    yoffset=0    xadvance=93     page=0    chnl=0
+char id=202    x=1764    y=1146    width=87    height=220    xoffset=8    yoffset=0    xadvance=93     page=0    chnl=0
+char id=203    x=1851    y=1146    width=87    height=220    xoffset=8    yoffset=0    xadvance=93     page=0    chnl=0
+char id=204    x=1938    y=1146    width=56    height=220    xoffset=-3    yoffset=0    xadvance=50     page=0    chnl=0
+char id=205    x=0    y=1366    width=60    height=220    xoffset=2    yoffset=0    xadvance=50     page=0    chnl=0
+char id=206    x=60    y=1366    width=69    height=220    xoffset=-6    yoffset=0    xadvance=50     page=0    chnl=0
+char id=207    x=129    y=1366    width=68    height=220    xoffset=-5    yoffset=0    xadvance=50     page=0    chnl=0
+char id=208    x=197    y=1366    width=117    height=220    xoffset=5    yoffset=0    xadvance=123     page=0    chnl=0
+char id=209    x=314    y=1366    width=111    height=220    xoffset=8    yoffset=0    xadvance=121     page=0    chnl=0
+char id=210    x=425    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=211    x=532    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=212    x=639    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=213    x=746    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=214    x=853    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=215    x=960    y=1366    width=77    height=220    xoffset=8    yoffset=0    xadvance=85     page=0    chnl=0
+char id=216    x=1037    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=115     page=0    chnl=0
+char id=217    x=1144    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=116     page=0    chnl=0
+char id=218    x=1251    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=116     page=0    chnl=0
+char id=219    x=1358    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=116     page=0    chnl=0
+char id=220    x=1465    y=1366    width=107    height=220    xoffset=8    yoffset=0    xadvance=116     page=0    chnl=0
+char id=221    x=1572    y=1366    width=119    height=220    xoffset=2    yoffset=0    xadvance=115     page=0    chnl=0
+char id=222    x=1691    y=1366    width=84    height=220    xoffset=8    yoffset=0    xadvance=92     page=0    chnl=0
+char id=223    x=1775    y=1366    width=99    height=220    xoffset=7    yoffset=0    xadvance=106     page=0    chnl=0
+char id=224    x=1874    y=1366    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=225    x=0    y=1586    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=226    x=98    y=1586    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=227    x=196    y=1586    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=228    x=294    y=1586    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=229    x=392    y=1586    width=98    height=220    xoffset=7    yoffset=0    xadvance=103     page=0    chnl=0
+char id=230    x=490    y=1586    width=148    height=220    xoffset=7    yoffset=0    xadvance=155     page=0    chnl=0
+char id=231    x=638    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=232    x=729    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=233    x=820    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=234    x=911    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=235    x=1002    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=98     page=0    chnl=0
+char id=236    x=1093    y=1586    width=56    height=220    xoffset=-5    yoffset=0    xadvance=46     page=0    chnl=0
+char id=237    x=1149    y=1586    width=61    height=220    xoffset=8    yoffset=0    xadvance=46     page=0    chnl=0
+char id=238    x=1210    y=1586    width=69    height=220    xoffset=-8    yoffset=0    xadvance=46     page=0    chnl=0
+char id=239    x=1279    y=1586    width=67    height=220    xoffset=-7    yoffset=0    xadvance=46     page=0    chnl=0
+char id=240    x=1346    y=1586    width=105    height=220    xoffset=8    yoffset=0    xadvance=112     page=0    chnl=0
+char id=241    x=1451    y=1586    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=242    x=1542    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=243    x=1633    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=244    x=1724    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=245    x=1815    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=246    x=1906    y=1586    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=247    x=0    y=1806    width=65    height=220    xoffset=8    yoffset=0    xadvance=75     page=0    chnl=0
+char id=248    x=65    y=1806    width=91    height=220    xoffset=7    yoffset=0    xadvance=99     page=0    chnl=0
+char id=249    x=156    y=1806    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=250    x=247    y=1806    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=251    x=338    y=1806    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=252    x=429    y=1806    width=91    height=220    xoffset=8    yoffset=0    xadvance=100     page=0    chnl=0
+char id=253    x=520    y=1806    width=99    height=220    xoffset=2    yoffset=0    xadvance=96     page=0    chnl=0
+char id=254    x=619    y=1806    width=91    height=220    xoffset=8    yoffset=0    xadvance=96     page=0    chnl=0
+char id=255    x=710    y=1806    width=99    height=220    xoffset=2    yoffset=0    xadvance=96     page=0    chnl=0

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

@@ -4,10 +4,10 @@ world 0,0 90
 #tree_big 0,0 0
 
 #Marine Pos
-marine 4,-5 -90
-marine 4,-4 -90
-marine 5,-4 -90
-marine 5,-5 -90
+marine 4,-5 270
+marine 4,-4 270
+marine 5,-4 270
+marine 5,-5 270
 
 #Blue (Marine) wait Node
 node_wait_blue 4,-5 0
@@ -46,17 +46,21 @@ cir 5,4 0
 cir 5,5 0
 
 #Assets
-jet -10,-1 45
-ship 11,0 169
-big_tent -9,-7 130
-big_tent 7,-10 225
+jet -12,0 45
+jet -17,-2 55
 small_tent -9,7 45
 small_tent -10,5 60
+small_tent -7,8 30
+ship 11,0 169
+small_tent 6,8 340
+small_tent 8,7 320
+big_tent -10,-9 130
+big_tent 9,-10 225
 radar 0,10 -20
-small_tent 6,8 190
-small_tent 8,7 160
 tank -1,-10 135
-
+tank 0,-18 180
+tank 3,-18 180
+tank -3,-18 180
 
 #Yellow (CIR) wait Node
 node_wait_yellow 4,5 0

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

@@ -1,29 +1,40 @@
+// Samplers for textures
 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;
+
+// Resolution of the screen and outline settings
 uniform vec2 m_Resolution;
 uniform vec4 m_OutlineColor;
 uniform float m_OutlineWidth;
 
+// Output color of the fragment
+out vec4 fragColor;
+
 void main() {
-	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);
-	//如果是背景
-	if(depth==vec4(0.) && (depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth||depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)){
-		gl_FragColor = m_OutlineColor;
+    // 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);
+
+    // Sample the main texture
+    vec4 color = texture(m_Texture, texCoord);
+
+    // 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 {
-		gl_FragColor = color;
+        fragColor = color; // Use the original texture color
     }
-	//debug
-	//gl_FragColor = vec4(0.,(1.-ratio),0.,1.);
 }

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

@@ -1,10 +1,18 @@
-varying vec2 texCoord;
 
+// Use 'in' instead of 'varying' for inputs from the vertex shader
+in vec2 texCoord;
+
+// Declare a custom output variable for the fragment color
+out vec4 fragColor;
+
+// Uniform samplers
 uniform sampler2D m_Texture;
 uniform sampler2D m_NormalsTexture;
 uniform sampler2D m_DepthTexture;
 
 void main() {
-    vec4 color = texture2D(m_Texture, texCoord);
-	gl_FragColor=color;
+    // 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

@@ -0,0 +1,109 @@
+uniform sampler2D m_Texture;
+uniform sampler2D m_OutlineDepthTexture;
+uniform sampler2D m_DepthTexture;
+varying vec2 texCoord;
+
+uniform vec2 m_Resolution;
+uniform vec4 m_OutlineColor;
+uniform float m_OutlineWidth;
+
+void main() {
+	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/OutlinePro.j3md

@@ -0,0 +1,21 @@
+MaterialDef Cartoon Edge {
+
+    MaterialParameters {
+	    Int NumSamples
+        Int NumSamplesDepth
+        Texture2D Texture
+        Texture2D OutlineDepthTexture
+        Texture2D DepthTexture
+    	Vector2 Resolution
+    	Color OutlineColor
+    	Float OutlineWidth
+    }
+
+    Technique {
+        VertexShader GLSL150:   MatDefs/SelectObjectOutliner/Post15.vert
+        FragmentShader GLSL150: MatDefs/SelectObjectOutliner/OutlinePro.frag
+
+        WorldParameters {
+        }
+    }
+}

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

@@ -1,10 +1,15 @@
+// Use 'in' for vertex attributes
 in vec4 inPosition;
 in vec2 inTexCoord;
 
+// Use 'out' for passing data to the fragment shader
 out vec2 texCoord;
 
 void main() {
+    // Transform position to clip space
     vec2 pos = inPosition.xy * 2.0 - 1.0;
     gl_Position = vec4(pos, 0.0, 1.0);
+
+    // Pass texture coordinates to the fragment shader
     texCoord = inTexCoord;
 }