task 13

Projekte/battleship/client/build.gradle

@@ -9,8 +9,9 @@ dependencies {
     implementation project(":battleship:model")
 
     implementation libs.jme3.desktop
-    implementation 'com.simsilica:lemur:1.14.0'
-    implementation 'com.simsilica:lemur-proto:1.10.0'
+    implementation libs.jme3.effects
+    implementation project(path: ':battleship:server')
+    implementation project(path: ':battleship:server')
 
     runtimeOnly libs.jme3.awt.dialogs
     runtimeOnly libs.jme3.plugins

Projekte/battleship/client/src/main/java/pp/battleship/client/BattleshipApp.java

@@ -25,6 +25,7 @@ import pp.battleship.client.gui.EditorAppState;
 import pp.battleship.client.gui.SeaAppState;
 import pp.battleship.game.client.BattleshipClient;
 import pp.battleship.game.client.ClientGameLogic;
+import pp.battleship.game.client.GameMusic;
 import pp.battleship.game.client.ServerConnection;
 import pp.battleship.game.singlemode.BattleshipClientConfig;
 import pp.battleship.game.singlemode.ServerConnectionMockup;
@@ -265,13 +266,24 @@ public class BattleshipApp extends SimpleApplication implements BattleshipClient
         flyCam.setEnabled(false);
         stateManager.detach(stateManager.getState(StatsAppState.class));
         stateManager.detach(stateManager.getState(DebugKeysAppState.class));
+        atttachGameMusic();
 
         attachGameSound();
         stateManager.attachAll(new EditorAppState(), new BattleAppState(), new SeaAppState());
     }
 
+    private void atttachGameMusic() {
+        final GameMusic gameSound = new GameMusic();
+        gameSound.setEnabled(GameMusic.enabledInPreferences());
+        stateManager.attach(gameSound);
+
+    }
+
+
+
     /**
      * Attaches the game sound state and sets its initial enabled state.
+     *
      */
     private void attachGameSound() {
         final GameSound gameSound = new GameSound();

Projekte/battleship/client/src/main/java/pp/battleship/client/BattleshipAppState.java

@@ -12,6 +12,8 @@ import com.jme3.app.state.AbstractAppState;
 import com.jme3.app.state.AppStateManager;
 import pp.battleship.game.client.ClientGameLogic;
 
+
+
 /**
  * Abstract class representing a state in the Battleship game.
  * Extends the AbstractAppState from jMonkeyEngine to manage state behavior.

Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java

@@ -87,7 +87,7 @@ public class GameSound extends AbstractAppState implements GameEventListener {
      * @param name The name of the sound file.
      * @return The loaded AudioNode.
      */
-    private AudioNode loadSound(Application app, String name) {
+    public AudioNode loadSound(Application app, String name) {
         try {
             final AudioNode sound = new AudioNode(app.getAssetManager(), name, AudioData.DataType.Buffer);
             sound.setLooping(false);

Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java

@@ -7,14 +7,11 @@
 
 package pp.battleship.client;
 
-import com.jme3.math.Vector3f;
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Checkbox;
 import com.simsilica.lemur.Label;
-import com.simsilica.lemur.RangedValueModel;
 import com.simsilica.lemur.style.ElementId;
-import com.simsilica.lemur.Slider;
-import pp.battleship.client.gui.VolumeSlider;
+import pp.battleship.game.client.GameMusic;
 import pp.dialog.Dialog;
 import pp.dialog.StateCheckboxModel;
 import pp.dialog.TextInputDialog;
@@ -34,42 +31,25 @@ import static pp.util.PreferencesUtils.getPreferences;
 class Menu extends Dialog {
     private static final Preferences PREFERENCES = getPreferences(Menu.class);
     private static final String LAST_PATH = "last.file.path";
+
+  //  private final VolumeSlider slider;
     private final BattleshipApp app;
     private final Button loadButton = new Button(lookup("menu.map.load"));
     private final Button saveButton = new Button(lookup("menu.map.save"));
-    private final VolumeSlider volumeSlider;
 
     /**
      * Constructs the Menu dialog for the Battleship application.
      *
      * @param app the BattleshipApp instance
      */
+
     public Menu(BattleshipApp app) {
         super(app.getDialogManager());
         this.app = app;
         addChild(new Label(lookup("battleship.name"), new ElementId("header"))); //NON-NLS
         addChild(new Checkbox(lookup("menu.sound-enabled"),
                               new StateCheckboxModel(app, GameSound.class)));
-        addChild(new Label(lookup("battleship.name"), new ElementId("header")));//NON-NLS
-
-        addChild(new Checkbox(lookup("menu.sound-enabled"), new StateCheckboxModel(app, GameSound.class)));
-
-        addChild(new Checkbox(lookup("menu.background-sound-enabled"), new StateCheckboxModel(app, GameMusic.class)));
-
-        volumeSlider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
-
-        addChild(volumeSlider);
-
-        addChild(loadButton)
-                .addClickCommands(s -> ifTopDialog(this::loadDialog));
-        addChild(saveButton);
-        saveButton.setEnabled(app.getGameLogic().maySaveMap());
-
-
-
-    // Füge den Slider zum GUI hinzu
-        addChild(volumeSlider);
-
+       // slider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
         addChild(loadButton)
                 .addClickCommands(s -> ifTopDialog(this::loadDialog));
         addChild(saveButton)
@@ -79,6 +59,11 @@ class Menu extends Dialog {
         addChild(new Button(lookup("menu.quit")))
                 .addClickCommands(s -> ifTopDialog(app::closeApp));
         update();
+        addChild(new Checkbox(lookup("menu.sound-enabled"), new StateCheckboxModel(app, GameSound.class)));
+
+        addChild(new Checkbox(lookup("menu.background-sound-enabled"), new StateCheckboxModel(app, GameMusic.class)));
+      //  addChild(slider);
+
     }
 
     /**
@@ -90,6 +75,14 @@ class Menu extends Dialog {
         saveButton.setEnabled(app.getGameLogic().maySaveMap());
     }
 
+  /*  @Override
+    public void update(float delta) {
+        slider.update();
+    }
+
+   */
+
+
     /**
      * As an escape action, this method closes the menu if it is the top dialog.
      */
@@ -165,6 +158,4 @@ class Menu extends Dialog {
     private void saveDialog() {
         fileDialog(app.getGameLogic()::saveMap, lookup("menu.map.save"));
     }
-
-
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java

@@ -7,11 +7,11 @@
 
 package pp.battleship.client;
 
+import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.TextField;
 import com.simsilica.lemur.component.SpringGridLayout;
-import com.simsilica.lemur.Button;
 import pp.battleship.server.BattleshipServer;
 import pp.dialog.Dialog;
 import pp.dialog.DialogBuilder;
@@ -35,10 +35,9 @@ class NetworkDialog extends SimpleDialog {
     private final NetworkSupport network;
     private final TextField host = new TextField(LOCALHOST);
     private final TextField port = new TextField(DEFAULT_PORT);
-    // private final Button serverButton = new Button(lookup("client.server-star"));
-    private final Button serverButton = new Button(lookup("client.server-start"));
     private String hostname;
     private int portNumber;
+    private final Button serverButton = new Button(lookup("client.server-start"));
     private Future<Object> connectionFuture;
     private Dialog progressDialog;
 
@@ -69,11 +68,11 @@ class NetworkDialog extends SimpleDialog {
                      .setOkClose(false)
                      .setNoClose(false)
                      .build(this);
-
-        //Add the button to start the sever
         addChild(serverButton).addClickCommands(s -> ifTopDialog(this::startServerInThread));
-
     }
+    //Add the button to start the sever
+
+
 
     /**
      * Handles the action for the connect button in the connection dialog.
@@ -158,7 +157,6 @@ class NetworkDialog extends SimpleDialog {
         network.getApp().errorDialog(lookup("server.connection.failed"));
         network.getApp().setInfoText(e.getLocalizedMessage());
     }
-
     /**
      * Starts the server in a separate thread.
      */
@@ -175,4 +173,5 @@ class NetworkDialog extends SimpleDialog {
         });
         serverThread.start();
     }
+
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/MapViewSynchronizer.java

@@ -125,10 +125,6 @@ class MapViewSynchronizer extends ShipMapSynchronizer {
     private Geometry shipLine(float x1, float y1, float x2, float y2, ColorRGBA color) {
         return view.getApp().getDraw().makeFatLine(x1, y1, x2, y2, SHIP_DEPTH, color, SHIP_LINE_WIDTH);
     }
-    /**
-     *
-     * @param deltaTime
-     */
     public void update(float deltaTime) {
         if (shell != null) {
             shell.updatePosition(deltaTime);
@@ -136,8 +132,9 @@ class MapViewSynchronizer extends ShipMapSynchronizer {
         }
     }
 
-    private void drawShell(Vector3f position) {
-        // Methode zum Zeichnen des Geschosses auf der 2D-Karte TODO
+    private void drawShell(Vector3f position){
+        //TODO implement
     }
 
+
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ParticleEffectFactory.java

@@ -0,0 +1,285 @@
+package pp.battleship.client.gui;
+
+import com.jme3.effect.ParticleEmitter;
+import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterSphereShape;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.FastMath;
+import com.jme3.math.Vector3f;
+import pp.battleship.client.BattleshipApp;
+
+/**
+ * Factory class responsible for creating particle effects used in the game.
+ * This centralizes the creation of various types of particle emitters.
+ */
+public class ParticleEffectFactory {
+    private static final int COUNT_FACTOR = 1;
+    private static final float COUNT_FACTOR_F = 1f;
+    private static final boolean POINT_SPRITE = true;
+    private static final Type EMITTER_TYPE = POINT_SPRITE ? Type.Point : Type.Triangle;
+    
+    private final BattleshipApp app;
+
+    ParticleEffectFactory(BattleshipApp app) {
+        this.app = app;
+    }
+
+    /**
+     * Creates a flame particle emitter.
+     * 
+     * @return a configured flame particle emitter
+     */
+    ParticleEmitter createFlame() {
+        ParticleEmitter flame = new ParticleEmitter("Flame", EMITTER_TYPE, 32 * COUNT_FACTOR);
+        flame.setSelectRandomImage(true);
+        flame.setStartColor(new ColorRGBA(1f, 0.4f, 0.05f, (1f / COUNT_FACTOR_F)));
+        flame.setEndColor(new ColorRGBA(.4f, .22f, .12f, 0f));
+        flame.setStartSize(0.1f);
+        flame.setEndSize(0.5f);
+        flame.setShape(new EmitterSphereShape(Vector3f.ZERO, 1f));
+        flame.setParticlesPerSec(0);
+        flame.setGravity(0, -5, 0);
+        flame.setLowLife(.4f);
+        flame.setHighLife(.5f);
+        flame.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 7, 0));
+        flame.getParticleInfluencer().setVelocityVariation(1f);
+        flame.setImagesX(2);
+        flame.setImagesY(2);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/flame.png"));
+        mat.setBoolean("PointSprite", POINT_SPRITE);
+        flame.setMaterial(mat);
+
+        return flame;
+    }
+
+    /**
+     * Creates a flash particle emitter.
+     * 
+     * @return a configured flash particle emitter
+     */
+    ParticleEmitter createFlash() {
+        ParticleEmitter flash = new ParticleEmitter("Flash", EMITTER_TYPE, 24 * COUNT_FACTOR);
+        flash.setSelectRandomImage(true);
+        flash.setStartColor(new ColorRGBA(1f, 0.8f, 0.36f, 1f / COUNT_FACTOR_F));
+        flash.setEndColor(new ColorRGBA(1f, 0.8f, 0.36f, 0f));
+        flash.setStartSize(.1f);
+        flash.setEndSize(0.5f);
+        flash.setShape(new EmitterSphereShape(Vector3f.ZERO, .05f));
+        flash.setParticlesPerSec(0);
+        flash.setGravity(0, 0, 0);
+        flash.setLowLife(.2f);
+        flash.setHighLife(.2f);
+        flash.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 5f, 0));
+        flash.getParticleInfluencer().setVelocityVariation(1);
+        flash.setImagesX(2);
+        flash.setImagesY(2);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/flash.png"));
+        mat.setBoolean("PointSprite", POINT_SPRITE);
+        flash.setMaterial(mat);
+
+        return flash;
+    }
+
+    /**
+     * Creates a round spark particle emitter.
+     * 
+     * @return a configured round spark particle emitter
+     */
+    ParticleEmitter createRoundSpark() {
+        ParticleEmitter roundSpark = new ParticleEmitter("RoundSpark", EMITTER_TYPE, 20 * COUNT_FACTOR);
+        roundSpark.setStartColor(new ColorRGBA(1f, 0.29f, 0.34f, (float) (1.0 / COUNT_FACTOR_F)));
+        roundSpark.setEndColor(new ColorRGBA(0, 0, 0, 0.5f / COUNT_FACTOR_F));
+        roundSpark.setStartSize(0.2f);
+        roundSpark.setEndSize(0.8f);
+        roundSpark.setShape(new EmitterSphereShape(Vector3f.ZERO, 1f));
+        roundSpark.setParticlesPerSec(0);
+        roundSpark.setGravity(0, -.5f, 0);
+        roundSpark.setLowLife(1.8f);
+        roundSpark.setHighLife(2f);
+        roundSpark.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 3, 0));
+        roundSpark.getParticleInfluencer().setVelocityVariation(.5f);
+        roundSpark.setImagesX(1);
+        roundSpark.setImagesY(1);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/roundspark.png"));
+        mat.setBoolean("PointSprite", POINT_SPRITE);
+        roundSpark.setMaterial(mat);
+
+        return roundSpark;
+    }
+
+    /**
+     * Creates a spark particle emitter.
+     * 
+     * @return a configured spark particle emitter
+     */
+    ParticleEmitter createSpark() {
+        ParticleEmitter spark = new ParticleEmitter("Spark", Type.Triangle, 30 * COUNT_FACTOR);
+        spark.setStartColor(new ColorRGBA(1f, 0.8f, 0.36f, 1.0f / COUNT_FACTOR_F));
+        spark.setEndColor(new ColorRGBA(1f, 0.8f, 0.36f, 0f));
+        spark.setStartSize(.5f);
+        spark.setEndSize(.5f);
+        spark.setFacingVelocity(true);
+        spark.setParticlesPerSec(0);
+        spark.setGravity(0, 5, 0);
+        spark.setLowLife(1.1f);
+        spark.setHighLife(1.5f);
+        spark.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 20, 0));
+        spark.getParticleInfluencer().setVelocityVariation(1);
+        spark.setImagesX(1);
+        spark.setImagesY(1);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/spark.png"));
+        spark.setMaterial(mat);
+
+        return spark;
+    }
+
+    /**
+     * Creates a smoke trail particle emitter.
+     * 
+     * @return a configured smoke trail particle emitter
+     */
+    ParticleEmitter createSmokeTrail() {
+        ParticleEmitter smokeTrail = new ParticleEmitter("SmokeTrail", Type.Triangle, 22 * COUNT_FACTOR);
+        smokeTrail.setStartColor(new ColorRGBA(1f, 0.8f, 0.36f, 1.0f / COUNT_FACTOR_F));
+        smokeTrail.setEndColor(new ColorRGBA(1f, 0.8f, 0.36f, 0f));
+        smokeTrail.setStartSize(.2f);
+        smokeTrail.setEndSize(1f);
+        smokeTrail.setFacingVelocity(true);
+        smokeTrail.setParticlesPerSec(0);
+        smokeTrail.setGravity(0, 1, 0);
+        smokeTrail.setLowLife(.4f);
+        smokeTrail.setHighLife(.5f);
+        smokeTrail.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 12, 0));
+        smokeTrail.getParticleInfluencer().setVelocityVariation(1);
+        smokeTrail.setImagesX(1);
+        smokeTrail.setImagesY(3);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/smoketrail.png"));
+        smokeTrail.setMaterial(mat);
+
+        return smokeTrail;
+    }
+
+    /**
+     * Creates a debris particle emitter.
+     * 
+     * @return a configured debris particle emitter
+     */
+    ParticleEmitter createDebris() {
+        ParticleEmitter debris = new ParticleEmitter("Debris", Type.Triangle, 15 * COUNT_FACTOR);
+        debris.setSelectRandomImage(true);
+        debris.setRandomAngle(true);
+        debris.setRotateSpeed(FastMath.TWO_PI * 4);
+        debris.setStartColor(new ColorRGBA(1f, 0.59f, 0.28f, 1.0f / COUNT_FACTOR_F));
+        debris.setEndColor(new ColorRGBA(.5f, 0.5f, 0.5f, 0f));
+        debris.setStartSize(.10f);
+        debris.setEndSize(.15f);
+        debris.setParticlesPerSec(0);
+        debris.setGravity(0, 12f, 0);
+        debris.setLowLife(1.4f);
+        debris.setHighLife(1.5f);
+        debris.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 15, 0));
+        debris.getParticleInfluencer().setVelocityVariation(.60f);
+        debris.setImagesX(3);
+        debris.setImagesY(3);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/Debris.png"));
+        debris.setMaterial(mat);
+
+        return debris;
+    }
+
+    /**
+     * Creates a shockwave particle emitter.
+     * 
+     * @return a configured shockwave particle emitter
+     */
+    ParticleEmitter createShockwave() {
+        ParticleEmitter shockwave = new ParticleEmitter("Shockwave", Type.Triangle, 1 * COUNT_FACTOR);
+        shockwave.setFaceNormal(Vector3f.UNIT_Y);
+        shockwave.setStartColor(new ColorRGBA(.48f, 0.17f, 0.01f, .8f / COUNT_FACTOR_F));
+        shockwave.setEndColor(new ColorRGBA(.48f, 0.17f, 0.01f, 0f));
+        shockwave.setStartSize(0f);
+        shockwave.setEndSize(3f);
+        shockwave.setParticlesPerSec(0);
+        shockwave.setGravity(0, 0, 0);
+        shockwave.setLowLife(0.5f);
+        shockwave.setHighLife(0.5f);
+        shockwave.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 0, 0));
+        shockwave.getParticleInfluencer().setVelocityVariation(0f);
+        shockwave.setImagesX(1);
+        shockwave.setImagesY(1);
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/shockwave.png"));
+        shockwave.setMaterial(mat);
+
+        return shockwave;
+    }
+
+    /**
+     * Creates a moving smoke emitter.
+     * 
+     * @return a configured smoke emitter
+     */
+    ParticleEmitter createMovingSmokeEmitter() {
+        ParticleEmitter smokeEmitter = new ParticleEmitter("SmokeEmitter", Type.Triangle, 300);
+        smokeEmitter.setGravity(0, 0, 0);
+        smokeEmitter.getParticleInfluencer().setVelocityVariation(1);
+        smokeEmitter.setLowLife(1);
+        smokeEmitter.setHighLife(1);
+        smokeEmitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0, .5f, 0));
+        smokeEmitter.setImagesX(15); // Assuming the smoke texture is a sprite sheet with 15 frames
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Smoke/Smoke.png"));
+        smokeEmitter.setMaterial(mat);
+
+        return smokeEmitter;
+    }
+    /**
+     * Creates a one-time water splash particle emitter.
+     *
+     * @return a configured one-time water splash particle emitter
+     */
+    public ParticleEmitter createWaterSplash() {
+        // Create a new particle emitter for the splash effect
+        ParticleEmitter waterSplash = new ParticleEmitter("WaterSplash", Type.Triangle, 30);
+
+        // Set the shape of the emitter, making particles emit from a point or small area
+        waterSplash.setShape(new EmitterSphereShape(Vector3f.ZERO, 0.2f));
+
+        // Start and end colors for water (blue, fading out)
+        waterSplash.setStartColor(new ColorRGBA(0.4f, 0.4f, 1f, 1f));  // Light blue at start
+        waterSplash.setEndColor(new ColorRGBA(0.4f, 0.4f, 1f, 0f));    // Transparent at the end
+
+        // Particle size: small at start, larger before fading out
+        waterSplash.setStartSize(0.1f);
+        waterSplash.setEndSize(0.3f);
+
+        // Particle lifespan (how long particles live)
+        waterSplash.setLowLife(0.5f);
+        waterSplash.setHighLife(1f);
+
+        // Gravity: Pull the water particles downwards
+        waterSplash.setGravity(0, -9.81f, 0);  // Earth's gravity simulation
+
+        // Velocity: Give particles an initial burst upward (simulates splash)
+        waterSplash.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 3, 0));
+        waterSplash.getParticleInfluencer().setVelocityVariation(0.6f);  // Add randomness to splash
+
+        // Set how many particles are emitted per second (0 to emit all particles at once)
+        waterSplash.setParticlesPerSec(0);
+
+        // Load a texture for the water splash (assuming a texture exists at this path)
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
+        mat.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Splash/splash.png"));
+        waterSplash.setMaterial(mat);
+
+        return waterSplash;
+    }
+
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java

@@ -7,6 +7,7 @@
 
 package pp.battleship.client.gui;
 
+import com.jme3.effect.ParticleEmitter;
 import com.jme3.material.Material;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
@@ -21,7 +22,6 @@ import pp.battleship.model.Battleship;
 import pp.battleship.model.Rotation;
 import pp.battleship.model.ShipMap;
 import pp.battleship.model.Shot;
-
 import static java.util.Objects.requireNonNull;
 import static pp.util.FloatMath.HALF_PI;
 import static pp.util.FloatMath.PI;
@@ -32,13 +32,15 @@ import static pp.util.FloatMath.PI;
  * It extends the {@link ShipMapSynchronizer} to provide specific synchronization
  * logic for the sea map.
  */
-//ANPASSEN!!!!
 class SeaSynchronizer extends ShipMapSynchronizer {
     private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
-    private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o"; //NON-NLS
-    private static final String FLUGZEUGTRAEGER = "Models/Flugzeugträger_5er/Flugzeugträger.j3o";
-    private static final String KORVETTE = "Models/Korvette_3er/Korvette.j3o";
-    private static final String ZERSTOERER = "Models/Zerstörer_2er/Zerstörer.j3o";
+    private static final String UX23 = "Models/UX23/UX23.j3o";
+    private static final String BOJE = "Models/Boje/Boje.j3o";
+
+    private static final String ALIENSHIP = "Models/Alienship/Alienship.j3o";
+    private static final String MARLOW66 = "Models/Marlow66/Marlow66.j3o";
+    private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o";
+
     private static final String COLOR = "Color"; //NON-NLS
     private static final String SHIP = "ship"; //NON-NLS
     private static final String SHOT = "shot"; //NON-NLS
@@ -75,10 +77,10 @@ class SeaSynchronizer extends ShipMapSynchronizer {
      */
     @Override
     public Spatial visit(Shot shot) {
-        return shot.isHit() ? handleHit(shot) : createCylinder(shot);
+        return shot.isHit() ? handleHit(shot) : handleMiss(shot);
     }
 
-    /**
+        /**
      * Handles a hit by attaching its representation to the node that
      * contains the ship model as a child so that it moves with the ship.
      *
@@ -86,21 +88,6 @@ class SeaSynchronizer extends ShipMapSynchronizer {
      * @return always null to prevent the representation from being attached
      * to the items node as well
      */
-    private Spatial handleMiss(Shot shot) {
-        Node shotNode = new Node("ShotNode");
-        Geometry shotCylinder = createCylinder(shot);
-        shotNode.attachChild(shotCylinder);
-        ParticleEmitter waterSplash = particleFactory.createWaterSplash();
-        waterSplash.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
-        shotNode.attachChild(waterSplash);
-        waterSplash.emitAllParticles();
-
-        return shotNode;
-    }
-
-     * @param shot a hit
-     * @return always null to prevent the representation from being attached to the items node as well
-     */
     private Spatial handleHit(Shot shot) {
         final Battleship ship = requireNonNull(map.findShipAt(shot), "Missing ship");
         final Node shipNode = requireNonNull((Node) getSpatial(ship), "Missing ship node");
@@ -146,32 +133,19 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         shockwave.emitAllParticles();
         flame.emitAllParticles();
         roundSpark.emitAllParticles();
-
-        //Checks if ship is destroyed and triggers animation accordingly
-        if (ship.isDestroyed()) {
-            sinkAndRemoveShip(ship);
-        }
-
+        
         return null;
     }
+    private Spatial handleMiss(Shot shot) {
+        Node shotNode = new Node("ShotNode");
+        Geometry shotCylinder = createCylinder(shot);
+        shotNode.attachChild(shotCylinder);
+        ParticleEmitter waterSplash = particleFactory.createWaterSplash();
+        waterSplash.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
+        shotNode.attachChild(waterSplash);
+        waterSplash.emitAllParticles();
 
-    /**
-     * Handles the sinking animation and removal of ship if destroyed
-     * @param ship the ship to be sunk
-     */
-    private void sinkAndRemoveShip(Battleship ship) {
-
-        final Node shipNode = (Node) getSpatial(ship);
-        if (shipNode == null) return;
-
-        // Add sinking control to animate the sinking
-        shipNode.addControl(new SinkingControl(shipNode));
-
-        // Add particle effects
-        ParticleEmitter bubbles = particleFactory.createWaterSplash();
-        bubbles.setLocalTranslation(shipNode.getLocalTranslation());
-        shipNode.attachChild(bubbles);
-        bubbles.emitAllParticles();
+        return shotNode;
     }
 
 
@@ -224,14 +198,14 @@ class SeaSynchronizer extends ShipMapSynchronizer {
      * @param ship the battleship to be represented
      * @return the spatial representing the battleship
      */
-    //ANPASSEN!!!!!!
     private Spatial createShip(Battleship ship) {
-        if( ship.getLength() == 4){ createBox(ship); return createBattleship(ship); }
-        else if(ship.getLength()==5){createBox(ship);return createFlugzeugtraeger(ship); }
-        else if(ship.getLength()==3){createBox(ship);return createKorvette(ship); }
-        else if(ship.getLength()==2){createBox(ship);return createZerstoerer(ship); }
-        else if(ship.getLength()==1){createBox(ship);return createZerstoerer(ship); }
-        else throw new IllegalArgumentException("Deine Länge ist nicht definiert!");
+        switch (ship.getLength()) {
+            case 4: return createBattleship(ship);
+            case 3: return createMarlow66(ship);
+            case 2: return createUX23(ship);
+            case 1: return createAllienship(ship);
+            default: return createBox(ship);
+        }
     }
 
     /**
@@ -276,42 +250,47 @@ class SeaSynchronizer extends ShipMapSynchronizer {
      * @param ship the battleship to be represented
      * @return the spatial representing the "King George V" battleship
      */
-    //ANPASSEN!!!!
     private Spatial createBattleship(Battleship ship) {
         final Spatial model = app.getAssetManager().loadModel(KING_GEORGE_V_MODEL);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
         model.scale(1.48f);
+        // model.scale(0.0007f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;
     }
 
-    private Spatial createFlugzeugtraeger(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(FLUGZEUGTRAEGER);
+    private Spatial createAllienship(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(ALIENSHIP);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(1.48f);
+        model.scale(0.10f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+
+        return model;}
+    private Spatial createUX23(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(UX23);
+
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
+        // model.move(0f, -0.05f, 0f);
+        model.scale(0.89f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;
     }
 
-    private Spatial createKorvette(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(KORVETTE);
 
-        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(1.48f);
-        model.setShadowMode(ShadowMode.CastAndReceive);
 
-        return model;
-    }
 
-    private Spatial createZerstoerer(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(ZERSTOERER);
 
-        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(1.48f);
+
+    private Spatial createMarlow66(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(MARLOW66);
+
+        model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f);
+        model.move(0f, 0.25f, 0f);
+        model.scale(0.135f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SinkingControl.java

@@ -1,53 +0,0 @@
-package pp.battleship.client.gui;
-
-import com.jme3.scene.control.AbstractControl;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
-import com.jme3.scene.Node;
-
-/**
- * Control that handles the sinking effect for destroyed ships.
- * It will gradually move the ship downwards and then remove it from the scene.
- */
-class SinkingControl extends AbstractControl {
-    private static final float SINK_DURATION = 5f;  // Duration of the sinking animation
-    private static final float SINK_SPEED = 0.1f;   // Speed at which the ship sinks
-    private float elapsedTime = 0;
-
-    private final Node shipNode;
-
-    /**
-     * Constructs a {@code SinkingControl.java} object with the shipNode to be to be sunk
-     * @param shipNode the node to handeld
-     */
-    public SinkingControl(Node shipNode) {
-        this.shipNode = shipNode;
-    }
-
-    /**
-     * Updated the Map to sink the ship
-     *
-     * @param tpf time per frame
-     */
-    @Override
-    protected void controlUpdate(float tpf) {
-        // Update the sinking effect
-        elapsedTime += tpf;
-
-        // Move the ship down over time
-        Vector3f currentPos = shipNode.getLocalTranslation();
-        shipNode.setLocalTranslation(currentPos.x, currentPos.y - SINK_SPEED * tpf, currentPos.z);
-
-        // Check if sinking duration has passed
-        if (elapsedTime >= SINK_DURATION) {
-            // Remove the ship from the scene
-            shipNode.removeFromParent();
-        }
-    }
-
-    @Override
-    protected void controlRender(RenderManager rm, ViewPort vp) {
-        // No rendering-related code needed
-    }
-}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/VolumeSlider.java

@@ -1,29 +0,0 @@
-package pp.battleship.client.gui;
-
-import com.simsilica.lemur.Slider;
-import pp.battleship.client.GameMusic;
-
-
-    public class VolumeSlider extends Slider {
-
-        private final GameMusic piratenMusic;
-
-        private double vol;
-
-        public VolumeSlider(GameMusic music) {
-            super();
-            this.piratenMusic = music;
-            vol = GameMusic.volumePreference();
-            getModel().setPercent(vol);
-        }
-
-        public void update() {
-            if (vol != getModel().getPercent()) {
-                vol = getModel().getPercent();
-                piratenMusic.setVolume( (float) vol);
-            }
-        }
-
-    }
-
-

Projekte/battleship/converter/src/main/java/pp/battleship/exporter/ModelExporter.java

@@ -41,14 +41,15 @@ public class ModelExporter extends SimpleApplication {
      */
     @Override
     public void simpleInitApp() {
-        export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o"); //NON-NLS
-        export("Models/Flugzeugträger_5er/Flugzeugträger.obj", "Flugzeugträger.j3o");
-        export("Models/Korvette_3er/caravel.obj", "Korvette.j3o");
-        export("Models/Zerstörer_2er/ShipV_LOW.obj", "Zerstörer.j3o");
+        export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o");//NON-NLS
+        export("Models/Alienship/Alienship.obj", "Alienship.j3o");//NON-NLS
+        export("Models/Marlow66/Marlow66.obj", "Marlow66.j3o");//NON-NLS
+        export("Models/UX23/UX23.obj", "UX23.j3o");//NON-NLS
+        export("Models/Boje/Boje.obj", "Boje.j3o");//NON-NLS
+
         stop();
     }
 
-
     /**
      * Exports spatial into a file
      *

Projekte/battleship/converter/src/main/resources/Models/Alienship/Alienship.mtl

@@ -0,0 +1,11 @@
+# Blender MTL File: 'water ship.blend'
+# Material Count: 1
+
+newmtl Material
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2

Projekte/battleship/converter/src/main/resources/Models/Flugzeugträger_5er/Flugzeugträger.mtl

@@ -1,112 +0,0 @@
-# Blender 4.2.2 LTS MTL File: 'None'
-# www.blender.org
-
-newmtl Main.002
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.490000 0.257495 0.132300
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.016
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.000000 0.000000 0.000000
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.017
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.190000 0.077615 0.017100
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.018
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.266600 0.466860 0.620000
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.019
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.990000 0.990000 0.990000
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.020
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.070000 0.062265 0.058100
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.021
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.160000 0.151680 0.147200
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.022
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.340000 0.164333 0.000000
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.023
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.940000 0.561180 0.206800
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Mat.1_1.002
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.320000 0.151520 0.060800
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-
-newmtl Sail.002
-Ns 319.999939
-Ka 1.000000 1.000000 1.000000
-Kd 0.070000 0.070000 0.070000
-Ks 1.000000 1.000000 1.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2

Projekte/battleship/converter/src/main/resources/Models/Korvette_3er/caravel.mtl

@@ -1,52 +0,0 @@
-# Blender 4.2.2 LTS MTL File: 'None'
-# www.blender.org
-
-newmtl DeckStuff.003
-Ns 20.000006
-Ka 1.000000 1.000000 1.000000
-Kd 0.184314 0.600000 0.792157
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 1
-
-newmtl Hull.003
-Ns 20.000006
-Ka 1.000000 1.000000 1.000000
-Kd 0.701961 0.678431 0.019608
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 1
-
-newmtl MastsRigging.003
-Ns 20.000006
-Ka 1.000000 1.000000 1.000000
-Kd 0.086275 0.768628 0.117647
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 1
-
-newmtl Poopdeck.003
-Ns 20.000006
-Ka 1.000000 1.000000 1.000000
-Kd 0.976471 0.211765 0.211765
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 1
-
-newmtl Sail.007
-Ns 20.000006
-Ka 1.000000 1.000000 1.000000
-Kd 0.588000 0.588000 0.588000
-Ks 0.000000 0.000000 0.000000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 1

Projekte/battleship/converter/src/main/resources/Models/Marlow66/Marlow66.mtl

@@ -0,0 +1,90 @@
+# Blender MTL File: 'Marlow66.blend'
+# Material Count: 6
+
+# DISCLOSURE:
+# This model obj or mtl files are NOT intended for commercial purposes.
+# Do not copy or sell in part or in full without explicit permission from original author
+# including accompanying textures, jpgs etc...
+# One or more textures bundled with this project have been created with images from Textures.com. 
+# These images may not be redistributed by default. Please visit www.textures.com for more information.
+#
+# AUTHOR: PapaySailor  Copyright 2020
+# WEB SITE: www.archipelagosim.com 
+
+newmtl Aluminum
+Ns 40.0
+Ka 0.2 0.2 0.2
+Kd 0.8 0.8 0.8
+Ks 0.1 0.1 0.1
+
+newmtl Black
+Ns 517.690314
+Ka 0.235955 0.235955 0.235955
+Kd 0.000000 0.000000 0.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 3
+
+newmtl Chrome
+Ns 10
+Ka 0.05 0.05 0.1
+Kd 0.99 0.99 0.99
+Ks 1.0 1.0 1.0
+
+newmtl DarkWood
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.58 0.41 0.25
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd WoodPlanks.jpg
+
+newmtl LightBlue
+Ns 440.461707
+Ka 0.3 0.3 0.3
+Kd 0.25 1.0 1.0
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 3
+map_Kd HullTexture.png
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+
+newmtl White
+Ka 0.38 0.39 0.38
+Kd 0.9 0.9 0.9
+Ks 0.57 0.49 0.37
+Ke 0.0 0.0 0.0
+Ns 579.0
+
+newmtl WindowShaded
+Ka 0.184744 0.184744 0.184744
+Kd 0.166368 0.218014 0.259048
+Ks 0.6283 0.5559 0.3661
+Ke 0.0 0.0 0.0
+Ns 427.451019
+Tr 0.2
+
+newmtl Wood
+Ns 50
+Ka 0.2 0.2 0.2
+Kd 0.93 0.82 0.63
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd FineWood.jpg

Projekte/battleship/converter/src/main/resources/Models/UX23/Nave UX 23.mtl

@@ -0,0 +1,55 @@
+# Blender MTL File: 'None'
+# Material Count: 5
+
+newmtl mat_0_0
+Ns 1.000002
+Ka 1.000000 1.000000 1.000000
+Kd 0.686275 0.686275 0.686275
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl mat_0_1
+Ns 1.000002
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd 001.JPG
+
+newmtl mat_0_2
+Ns 1.000002
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd 001.JPG
+
+newmtl mat_0_3
+Ns 1.000002
+Ka 1.000000 1.000000 1.000000
+Kd 0.058824 0.058824 0.058824
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl mat_0_4
+Ns 1.000002
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd 001.JPG

Projekte/battleship/converter/src/main/resources/Models/Zerstörer_2er/ShipV_LOW.mtl

@@ -1,32 +0,0 @@
-# Blender 4.2.2 LTS MTL File: 'None'
-# www.blender.org
-
-newmtl map_ShipV_001
-Ns 224.999985
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.144874 0.000708
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-
-newmtl map_ShipV_002
-Ns 224.999985
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.035888 0.004678
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-
-newmtl map_ShipV_003
-Ns 224.999985
-Ka 1.000000 1.000000 1.000000
-Kd 0.001405 0.006690 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2