fixed incorrect splash effect

Added map4 with ship colliding each other

Projekte/battleship/client/build.gradle

@@ -7,9 +7,6 @@ description = 'Battleship Client'
 dependencies {
     implementation project(":jme-common")
     implementation project(":battleship:model")
-    implementation 'org.jmonkeyengine:jme3-core:3.6.0-stable'
-    implementation 'org.jmonkeyengine:jme3-effects:3.6.0-stable'
-
 
     implementation libs.jme3.desktop
 
@@ -17,8 +14,6 @@ dependencies {
     runtimeOnly libs.jme3.plugins
     runtimeOnly libs.jme3.jogg
     runtimeOnly libs.jme3.testdata
-
-
 }
 
 application {

Projekte/battleship/client/client.properties

@@ -9,7 +9,7 @@
 #
 # Specifies the map used by the opponent in single mode.
 # Single mode is activated if this property is set.
-#map.opponent=maps/map2.json
+map.opponent=maps/map2.json
 #
 # Specifies the map used by the player in single mode.
 # The player must define their own map if this property is not set.

Projekte/battleship/client/maps/map3.json

@@ -0,0 +1,66 @@
+{
+  "width": 10,
+  "height": 10,
+  "ships": [
+    {
+      "length": 4,
+      "x": 15,
+      "y": 5,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 0,
+      "y": 9,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 2,
+      "y": 6,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 4,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 4,
+      "rot": "DOWN"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 1,
+      "rot": "DOWN"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 0,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 0,
+      "rot": "RIGHT"
+    }
+  ]
+}

Projekte/battleship/client/maps/map4.json

@@ -0,0 +1,66 @@
+{
+  "width": 10,
+  "height": 10,
+  "ships": [
+    {
+      "length": 4,
+      "x": 0,
+      "y": 5,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 0,
+      "y": 9,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 2,
+      "y": 6,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 0,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 4,
+      "rot": "DOWN"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 1,
+      "rot": "DOWN"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 0,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 0,
+      "rot": "RIGHT"
+    }
+  ]
+}

Projekte/battleship/client/maps/map5.json

@@ -0,0 +1,66 @@
+{
+  "width": 10,
+  "height": 10,
+  "ships": [
+    {
+      "length": 4,
+      "x": 0,
+      "y": 5,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 0,
+      "y": 9,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 0,
+      "y": 6,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 4,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 4,
+      "rot": "DOWN"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 1,
+      "rot": "DOWN"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 0,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 0,
+      "rot": "RIGHT"
+    }
+  ]
+}

Projekte/battleship/client/maps/map6.json

@@ -0,0 +1,60 @@
+{
+  "width": 10,
+  "height": 10,
+  "ships": [
+    {
+      "length": 3,
+      "x": 0,
+      "y": 9,
+      "rot": "DOWN"
+    },
+    {
+      "length": 3,
+      "x": 2,
+      "y": 6,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 4,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 4,
+      "rot": "DOWN"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 1,
+      "rot": "DOWN"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 0,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 0,
+      "rot": "RIGHT"
+    }
+  ]
+}

Projekte/battleship/client/maps/map7.json

@@ -0,0 +1,66 @@
+{
+  "width": 10,
+  "height": 10,
+  "ships": [
+    {
+      "length": 4,
+      "x": 0,
+      "y": 9,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 3,
+      "x": 4,
+      "y": 9,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 3,
+      "x": 7,
+      "y": 9,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 0,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 2,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 4,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 6,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 7,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 8,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 9,
+      "y": 8,
+      "rot": "RIGHT"
+    }
+  ]
+}

Projekte/battleship/client/maps/map8.json

@@ -0,0 +1,66 @@
+{
+  "width": 10,
+  "height": 10,
+  "ships": [
+    {
+      "length": 4,
+      "x": 0,
+      "y": 9,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 3,
+      "x": 0,
+      "y": 8,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 3,
+      "x": 0,
+      "y": 7,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 0,
+      "y": 6,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 0,
+      "y": 5,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 2,
+      "x": 0,
+      "y": 4,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 0,
+      "y": 3,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 0,
+      "y": 2,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 0,
+      "y": 1,
+      "rot": "RIGHT"
+    },
+    {
+      "length": 1,
+      "x": 0,
+      "y": 0,
+      "rot": "RIGHT"
+    }
+  ]
+}

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

@@ -23,7 +23,6 @@ import com.simsilica.lemur.style.BaseStyles;
 import pp.battleship.client.gui.BattleAppState;
 import pp.battleship.client.gui.EditorAppState;
 import pp.battleship.client.gui.SeaAppState;
-import pp.battleship.client.GameMusic;
 import pp.battleship.game.client.BattleshipClient;
 import pp.battleship.game.client.ClientGameLogic;
 import pp.battleship.game.client.ServerConnection;
@@ -269,7 +268,6 @@ public class BattleshipApp extends SimpleApplication implements BattleshipClient
 
         attachGameSound();
         attachGameMusic();
-
         stateManager.attachAll(new EditorAppState(), new BattleAppState(), new SeaAppState());
     }
 
@@ -292,6 +290,7 @@ public class BattleshipApp extends SimpleApplication implements BattleshipClient
         stateManager.attach(gameMusic);
     }
 
+
     /**
      * Updates the application state every frame.
      * This method is called once per frame during the game loop.

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

@@ -1,5 +1,10 @@
 package pp.battleship.client;
 
+import static pp.util.PreferencesUtils.getPreferences;
+
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.prefs.Preferences;
 
 import com.jme3.app.Application;
 import com.jme3.app.state.AbstractAppState;
@@ -9,25 +14,13 @@ import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;
 
-
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.prefs.Preferences;
-
-import static pp.util.PreferencesUtils.getPreferences;
-
-/**
- * An application state that plays music.
- */
 public class GameMusic extends AbstractAppState{
     private static final Logger LOGGER = System.getLogger(GameMusic.class.getName());
     private static final Preferences PREFERENCES = getPreferences(GameMusic.class);
     private static final String ENABLED_PREF = "enabled"; //NON-NLS
     private static final String VOLUME_PREF = "volume"; //NON-NLS
 
-    private AudioNode battleMusic;
-    private AudioNode menuMusicModern;
-    private AudioNode menuMusicTraditional;
+    private AudioNode music;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -37,47 +30,18 @@ public class GameMusic extends AbstractAppState {
     public static boolean enabledInPreferences() {
         return PREFERENCES.getBoolean(ENABLED_PREF, true);
     }
+
     /**
-     * Checks enabled volume in preferences.
+     * Checks if sound is enabled in the preferences.
      *
-     * @return {@code float} if a volumePreference is set, the volume is set to the Value in  PREFERENCES,
-     *         {@code 0.25f} if no volumePreference is set in  PREFERENCES, the Volume is set to a default of 0.25f
      *
      */
-
-    public static float volumePreference() {
-        return PREFERENCES.getFloat(VOLUME_PREF, 0.25f);
+    public static float volumeInPreferences() {
+        return PREFERENCES.getFloat(VOLUME_PREF, 0.5f);
     }
 
     /**
-     * Toggles the game sound on or off.
-     */
-    public void toggleSound() {
-        setEnabled(!isEnabled());
-    }
-
-    /**
-     * Sets the enabled state of this AppState.
-     * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
-     *
-     * @param enabled {@code true} to enable the AppState, {@code false} to disable it.
-     */
-    @Override
-    public void setEnabled(boolean enabled) {
-        if (isEnabled() == enabled) return;
-         else if (!isEnabled() && enabled) {
-             if (menuMusicModern != null) menuMusicModern.play();
-        } else if (isEnabled() && !enabled) {
-             if (menuMusicModern != null) menuMusicModern.stop();
-        }
-
-        super.setEnabled(enabled);
-        LOGGER.log(Level.INFO, "Music enabled: {0}", enabled); //NON-NLS
-        PREFERENCES.putBoolean(ENABLED_PREF, enabled);
-    }
-
-    /**
-     * Initializes the music.
+     * Initializes the sound effects for the game.
      * Overrides {@link AbstractAppState#initialize(AppStateManager, Application)}
      *
      * @param stateManager The state manager
@@ -86,17 +50,16 @@ public class GameMusic extends AbstractAppState {
     @Override
     public void initialize(AppStateManager stateManager, Application app) {
         super.initialize(stateManager, app);
-        menuMusicModern =loadSound(app, "Sound/BackgroundMusic/menu-music-modern.ogg");
-        setVolume(volumePreference());
-        menuMusicModern.setLooping(true);
-        if (isEnabled() && menuMusicModern != null) {
-            menuMusicModern.play();
+        music = loadSound(app, "Sound/DasBootMenu.ogg");
+        setVolume(volumeInPreferences());
+        music.setLooping(true);
+        if (isEnabled() && music != null) {
+            music.play();
         }
-
     }
 
     /**
-     * Loads the music from the specified file.
+     * Loads a sound from the specified file.
      *
      * @param app  The application
      * @param name The name of the sound file.
@@ -116,14 +79,33 @@ public class GameMusic extends AbstractAppState {
     }
 
     /**
-     * Sets the vol param to the level set in PREFERENCES
-     *
-     * @param vol  Volume level of the music as indicated by the Volume control Slider
+     * Sets the enabled state of this AppState.
+     * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
      *
+     * @param enabled {@code true} to enable the AppState, {@code false} to disable it.
      */
-    public void setVolume(float vol){
-        menuMusicModern.setVolume(vol);
-        PREFERENCES.putFloat(VOLUME_PREF, vol);
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (isEnabled() == enabled) return;
+        else if(!isEnabled() && enabled) {
+            if (music != null) music.play();
+        } else if (isEnabled() && !enabled) {
+            if (music != null) music.stop();
+        }
+        super.setEnabled(enabled);
+        LOGGER.log(Level.INFO, "Sound enabled: {0}", enabled); //NON-NLS
+        PREFERENCES.putBoolean(ENABLED_PREF, enabled);
     }
 
+    /**
+     * Toggles the game sound on or off.
+     */
+    public void toggleSound() {
+        setEnabled(!isEnabled());
+    }
+
+    public void setVolume(float vol){
+        music.setVolume(vol);
+        PREFERENCES.putFloat(VOLUME_PREF, vol);
+    }
 }

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

@@ -34,6 +34,7 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     private AudioNode splashSound;
     private AudioNode shipDestroyedSound;
     private AudioNode explosionSound;
+    private AudioNode shellFlyingSound;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -78,6 +79,8 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         shipDestroyedSound = loadSound(app, "Sound/Effects/sunken.wav"); //NON-NLS
         splashSound = loadSound(app, "Sound/Effects/splash.wav"); //NON-NLS
         explosionSound = loadSound(app, "Sound/Effects/explosion.wav"); //NON-NLS
+        shellFlyingSound = loadSound(app, "Sound/Effects/shell_flying.wav");
+
     }
 
     /**
@@ -124,12 +127,28 @@ public class GameSound extends AbstractAppState implements GameEventListener {
             shipDestroyedSound.playInstance();
     }
 
+    /**
+     * Plays the shell flying sound effect.
+     */
+    public void shellFly() {
+        if (isEnabled() && shellFlyingSound != null) {
+            shellFlyingSound.playInstance();
+        }
+    }
+
+    /**
+     * Handles a recieved {@code SoundEvent} and plays the according sound.
+     *
+     * @param event the Sound event to be processed
+     */
     @Override
     public void receivedEvent(SoundEvent event) {
         switch (event.sound()) {
             case EXPLOSION -> explosion();
             case SPLASH -> splash();
             case DESTROYED_SHIP -> shipDestroyed();
+            case SHELL_FLYING -> shellFly();
+
         }
     }
 }

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

@@ -11,11 +11,13 @@ import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Checkbox;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.style.ElementId;
-import pp.battleship.client.gui.VolumeControl;
 import pp.dialog.Dialog;
 import pp.dialog.StateCheckboxModel;
 import pp.dialog.TextInputDialog;
 
+import pp.battleship.client.GameMusic;
+import pp.battleship.client.VolumeSlider;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.prefs.Preferences;
@@ -34,7 +36,7 @@ class Menu extends Dialog {
     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 VolumeControl volumeSlider;
+    private final VolumeSlider slider;
 
     /**
      * Constructs the Menu dialog for the Battleship application.
@@ -44,16 +46,13 @@ class Menu extends Dialog {
     public Menu(BattleshipApp app) {
         super(app.getDialogManager());
         this.app = app;
-
+        slider = new VolumeSlider(app.getStateManager().getState(GameMusic.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 VolumeControl(app.getStateManager().getState(GameMusic.class));
-
-        addChild(volumeSlider);
+        addChild(slider);
 
         addChild(loadButton)
                 .addClickCommands(s -> ifTopDialog(this::loadDialog));
@@ -75,15 +74,6 @@ class Menu extends Dialog {
         saveButton.setEnabled(app.getGameLogic().maySaveMap());
     }
 
-    /**
-     * Updates the position of the volume control slider.
-     */
-    @Override
-    public void update(float delta) {
-        volumeSlider.update();
-    }
-
-
     /**
      * As an escape action, this method closes the menu if it is the top dialog.
      */
@@ -159,4 +149,13 @@ class Menu extends Dialog {
     private void saveDialog() {
         fileDialog(app.getGameLogic()::saveMap, lookup("menu.map.save"));
     }
+
+    /**
+     * Updates the position of the volume control slider.
+     */
+
+    @Override
+    public void update(float delta) {
+        slider.update();
+    }
 }

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

@@ -7,12 +7,12 @@
 
 package pp.battleship.client;
 
-import com.simsilica.lemur.Checkbox;
+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 pp.battleship.client.server.BattleshipSelfhostServer;
+import pp.battleship.server.BattleshipServer;
 import pp.dialog.Dialog;
 import pp.dialog.DialogBuilder;
 import pp.dialog.SimpleDialog;
@@ -35,7 +35,8 @@ class NetworkDialog extends SimpleDialog {
     private final NetworkSupport network;
     private final TextField host = new TextField(LOCALHOST);
     private final TextField port = new TextField(DEFAULT_PORT);
-    private static final Checkbox HOST  = new Checkbox(lookup("server.host"));
+    // 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 Future<Object> connectionFuture;
@@ -59,7 +60,6 @@ class NetworkDialog extends SimpleDialog {
         input.addChild(host, 1);
         input.addChild(new Label(lookup("port.number") + ":  "));
         input.addChild(port, 1);
-        input.addChild(HOST).addClickCommands(s -> ifTopDialog(this::startClientServer));
 
         DialogBuilder.simple(app.getDialogManager())
                      .setTitle(lookup("server.dialog"))
@@ -69,6 +69,9 @@ class NetworkDialog extends SimpleDialog {
                      .setOkClose(false)
                      .setNoClose(false)
                      .build(this);
+
+        //Add the button to start the sever
+        addChild(serverButton).addClickCommands(s -> ifTopDialog(this::startServerInThread));
     }
 
     /**
@@ -156,15 +159,15 @@ class NetworkDialog extends SimpleDialog {
     }
 
     /**
-     * Starts the server of the client in a new thread and catches connectivity issues.
+     * Starts the server in a separate thread.
      */
-    private void startClientServer() {
-        HOST.setEnabled(false);
+    private void startServerInThread() {
+        serverButton.setEnabled(false);
         Thread serverThread = new Thread(() -> {
             try {
-                BattleshipSelfhostServer.main(null);
+                BattleshipServer.main(null);
             } catch (Exception e) {
-                HOST.setEnabled(true);
+                serverButton.setEnabled(true);
                 LOGGER.log(Level.ERROR, "Server could not be started", e);
                 network.getApp().errorDialog("Could not start server: " + e.getMessage());
             }
@@ -172,4 +175,3 @@ class NetworkDialog extends SimpleDialog {
         serverThread.start();
     }
 }
-

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

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

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

@@ -19,9 +19,9 @@ import pp.battleship.model.Battleship;
 import pp.battleship.model.Shell;
 import pp.battleship.model.Shot;
 import pp.util.Position;
-
 import static com.jme3.material.Materials.UNSHADED;
 
+
 /**
  * Synchronizes the visual representation of the ship map with the game model.
  * It handles the rendering of ships and shots on the map view, updating the view

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

@@ -0,0 +1,284 @@
+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;
+
+public class ParticleCreator {
+    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;
+
+    ParticleCreator(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(0.5f);
+        spark.setHighLife(1.5f);
+        spark.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 8, 0)); // y20
+        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

@@ -8,13 +8,9 @@
 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.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Vector3f;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
@@ -34,16 +30,16 @@ import static pp.util.FloatMath.PI;
 
 /**
  * The {@code SeaSynchronizer} class is responsible for synchronizing the graphical
- * representation of the ships and shots on the sea map with the underlying  model.
+ * representation of the ships and shots on the sea map with the underlying data model.
  * It extends the {@link ShipMapSynchronizer} to provide specific synchronization
  * logic for the sea map.
  */
 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 SMALL_BOAT_MODEL = "Models/BoatSmall/12219_boat_v2_L2.j3o";
-    private static final String BATTLE_MODEL = "Models/Battle/Battle.j3o"; //NON-NLS
-    private static final String CV_MODEL = "Models/CV/CV.j3o"; //NON-NLS
+    private static final String SMALL_SHIP_MODEL = "Models/SmallShip/SmallShip.j3o"; //NON-NLS
+    private static final String U_BOAT_MODEL = "Models/WWII_ship_German_Type_II_U-boat_v2/WW2Uboat.j3o"; //NON-NLS
+    private static final String TUG_BOAT_MODEL = "Models/TugBoat/TugBoat.j3o"; //NON-NLS
     private static final String LIGHTING = "Common/MatDefs/Light/Lighting.j3md";
     private static final String COLOR = "Color"; //NON-NLS
     private static final String SHIP = "ship"; //NON-NLS
@@ -54,273 +50,8 @@ class SeaSynchronizer extends ShipMapSynchronizer {
 
     private final ShipMap map;
     private final BattleshipApp app;
-    private Shell shell;
-    private Spatial shellModel;
+    private final ParticleCreator particlecreator;
 
-    private ParticleEmitter flame, flash, spark, roundspark, smoketrail, debris,
-            shockwave;
-
-
-    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;
-
-    /**
-     * Creates a Flame texture with indefinite Lifetime
-     * @return flame texture
-     */
-    private ParticleEmitter createFlame(){
-        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 texture
-     * @return flash texture
-     */
-    private ParticleEmitter createFlash(){
-        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 small spark particles, that dissipate into the air
-     * @return spark texture
-     */
-    private ParticleEmitter createRoundSpark(){
-        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 small, thin smoke trails that enhance the flying debris
-     * @return crates a thin smoke trail texture
-     */
-    private ParticleEmitter createSpark(){
-        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 dynamic smoke trail
-     * @return smoke texture
-     */
-    private ParticleEmitter createSmokeTrail(){
-        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.setShape(new EmitterSphereShape(Vector3f.ZERO, 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 flying debris particles
-     * @return debris texture
-     */
-    private ParticleEmitter createDebris(){
-        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.setShape(new EmitterSphereShape(Vector3f.ZERO, .05f));
-        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 an expanding circular shockwave
-     * @return shockwave texture
-     */
-    private ParticleEmitter createShockwave(){
-        shockwave = new ParticleEmitter("Shockwave", Type.Triangle, 1 * COUNT_FACTOR);
-//        shockwave.setRandomAngle(true);
-        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 an animated smoke column.
-     * @return moving smoke texture
-     */
-    private 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
-
-        // Set the material for the emitter
-        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 small burst of bubbles.
-     *
-     * @return  bubbling water texture.
-     */
-    public ParticleEmitter createWaterSplash() {
-        ParticleEmitter waterSplash = new ParticleEmitter("WaterSplash", Type.Triangle, 30);
-
-        waterSplash.setShape(new EmitterSphereShape(Vector3f.ZERO, 0.2f));
-
-        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
-
-        waterSplash.setStartSize(0.05f);
-        waterSplash.setEndSize(0.1f);
-
-        waterSplash.setLowLife(0.5f);
-        waterSplash.setHighLife(1f);
-
-
-        waterSplash.setGravity(0, 0, 0);  // No gravity to simulate a horizontal water splash
-
-        waterSplash.getParticleInfluencer().setInitialVelocity(new Vector3f(1f, 0f, 1f));  // Horizontal spread
-        waterSplash.getParticleInfluencer().setVelocityVariation(1f);  // Add randomness to splash
-        waterSplash.setParticlesPerSec(0);
-
-        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;
-    }
 
     /**
      * Constructs a {@code SeaSynchronizer} object with the specified application, root node, and ship map.
@@ -333,6 +64,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         super(app.getGameLogic().getOwnMap(), root);
         this.app = app;
         this.map = map;
+        this.particlecreator = new ParticleCreator(app);
         addExisting();
     }
 
@@ -349,6 +81,45 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         return shot.isHit() ? handleHit(shot) : handleMiss(shot);
     }
 
+    /**
+     * Handles a miss by representing it with a blue cylinder
+     * and attaching a water splash effect to it.
+     * @param shot the shot to be processed
+     * @return a Spatial simulating a miss with water splash effect
+     */
+    private Spatial handleMiss(Shot shot) {
+        Node shotNode = new Node("ShotNode");
+        Geometry shotCylinder = createCylinder(shot);
+        shotNode.attachChild(shotCylinder);
+        ParticleEmitter waterSplash = particlecreator.createWaterSplash();
+        waterSplash.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
+        shotNode.attachChild(waterSplash);
+        waterSplash.emitAllParticles();
+
+        return shotNode;
+    }
+
+    /**
+     * Handles the sinking animation and removal of ship if destroyed
+     * @param ship the ship to be sunk
+     */
+    private void sinkAndRemoveShip(Battleship ship) {
+        Battleship dasIstGelebteTeamarbeit = ship;
+        final Node shipNode = (Node) getSpatial(dasIstGelebteTeamarbeit);
+        if (shipNode == null) return;
+
+        // Add sinking control to animate the sinking
+        shipNode.addControl(new SinkControl(shipNode));
+
+        // Add particle effects
+        ParticleEmitter bubbles = particlecreator.createWaterSplash();
+        bubbles.setLocalTranslation(shipNode.getLocalTranslation());
+        shipNode.attachChild(bubbles);
+        bubbles.emitAllParticles();
+    }
+
+
+
     /**
      * 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.
@@ -361,20 +132,18 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         final Battleship ship = requireNonNull(map.findShipAt(shot), "Missing ship");
         final Node shipNode = requireNonNull((Node) getSpatial(ship), "Missing ship node");
 
-
-
         // Create a new node specifically for the hit effects
         Node hitEffectNode = new Node("HitEffectNode");
 
         // Create particle effects
-        ParticleEmitter flame = createFlame();
-        ParticleEmitter flash = createFlash();
-        ParticleEmitter spark = createSpark();
-        ParticleEmitter roundSpark = createRoundSpark();
-        ParticleEmitter smokeTrail = createSmokeTrail();
-        ParticleEmitter debris = createDebris();
-        ParticleEmitter shockwave = createShockwave();
-        ParticleEmitter movingSmoke = createMovingSmokeEmitter(); // New moving smoke emitter
+        ParticleEmitter flame = particlecreator.createFlame();
+        ParticleEmitter flash = particlecreator.createFlash();
+        ParticleEmitter spark = particlecreator.createSpark();
+        ParticleEmitter roundSpark = particlecreator.createRoundSpark();
+        ParticleEmitter smokeTrail = particlecreator.createSmokeTrail();
+        ParticleEmitter debris = particlecreator.createDebris();
+        ParticleEmitter shockwave = particlecreator.createShockwave();
+        ParticleEmitter movingSmoke = particlecreator.createMovingSmokeEmitter();
 
         // Attach all effects to the hitEffectNode
         hitEffectNode.attachChild(flame);
@@ -403,36 +172,14 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         flame.emitAllParticles();
         roundSpark.emitAllParticles();
 
+        //Checks if ship is destroyed and triggers animation accordingly
         if (ship.isDestroyed()) {
-            // Add ShipSinkingControl to the shipNode
-            ShipSinkingControl sinkingControl = new ShipSinkingControl(2f, 5f, -5f, 60f);
-            shipNode.addControl(sinkingControl);
-            sinkingControl.startSinking(); // Start the sinking process
-
+            sinkAndRemoveShip(ship);
         }
 
         return null;
     }
 
-    /**
-     * Handles a miss by representing it with a blue cylinder
-     * and attaching a water splash effect to it.
-     * @param shot the shot to be processed
-     * @return a Spatial simulating a miss with water splash effect
-     */
-    private Spatial handleMiss(Shot shot) {
-        Node shotNode = new Node("ShotNode");
-        Geometry shotCylinder = createCylinder(shot);
-        shotNode.attachChild(shotCylinder);
-        ParticleEmitter waterSplash = createWaterSplash();
-        waterSplash.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
-        shotNode.attachChild(waterSplash);
-        waterSplash.emitAllParticles();
-
-        return shotNode;
-    }
-
-
     /**
      * Creates a cylinder geometry representing the specified shot.
      * The appearance of the cylinder depends on whether the shot is a hit or a miss.
@@ -487,15 +234,15 @@ class SeaSynchronizer extends ShipMapSynchronizer {
             case 4:
                 return createBattleship(ship);
             case 3:
-                return createCV(ship);
+                return createLargeship(ship);
             case 2:
-                return createBattle(ship);
+               return createMediumship(ship);
             case 1:
-                return createSmallShip(ship);
-
+               return createSmallship(ship);
             default:
                 return createBox(ship);
         }
+
     }
 
     /**
@@ -538,7 +285,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
      * Creates a detailed 3D model to represent a "King George V" battleship.
      *
      * @param ship the battleship to be represented
-     * @return the spatial representing the "King George V" battleship.
+     * @return the spatial representing the "King George V" battleship
      */
     private Spatial createBattleship(Battleship ship) {
         final Spatial model = app.getAssetManager().loadModel(KING_GEORGE_V_MODEL);
@@ -550,14 +297,8 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         return model;
     }
 
-    /**
-     * Creates a detailed 3D model to represent a small tugboat.
-     *
-     * @param ship the battleship to be represented
-     * @return the spatial representing the small tugboat.
-     */
-    private Spatial createSmallShip(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(SMALL_BOAT_MODEL);
+    private Spatial createSmallship(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(SMALL_SHIP_MODEL);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
         model.scale(0.0005f);
@@ -566,35 +307,21 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         return model;
     }
 
-    /**
-     * Creates a detailed 3D model to represent a U-Boat .
-     *
-     * @param ship the battleship to be represented
-     * @return the spatial representing the U-Boat.
-     */
-    private Spatial createBattle(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(BATTLE_MODEL);
+    private Spatial createMediumship(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(U_BOAT_MODEL);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        // model.move(0f, -0.05f, 0f);
         model.scale(0.27f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;
     }
 
-    /**
-     * Creates a detailed 3D model to represent an aircraft carrier
-     *
-     * @param ship the battleship to be represented
-     * @return the spatial representing the aircraft carrier.
-     */
-    private Spatial createCV(Battleship ship) {
-        final Spatial model = app.getAssetManager().loadModel(CV_MODEL);
+    private Spatial createLargeship(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(TUG_BOAT_MODEL);
 
-        model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f);
-        model.move(0f, 0.25f, 0f);
-        model.scale(0.85f);
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
+        model.scale(0.0004f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;
@@ -635,5 +362,4 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         model.addControl(new ShellControl(shell));
         return model;
     }
-
 }

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

@@ -47,4 +47,3 @@ public class Shell2DControl extends AbstractControl {
         // No rendering-specific behavior required for this control
     }
 }
-

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

@@ -48,4 +48,3 @@ public class ShellControl extends AbstractControl {
         // No rendering-specific behavior required for this control
     }
 }
-

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

@@ -1,116 +0,0 @@
-package pp.battleship.client.gui;
-
-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.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.control.AbstractControl;
-
-/**
- * Controls the burning, tilting, and sinking behavior of a battleship.
- * The ship will burn and tilt for a specified duration, then sink below the water surface.
- */
-public class ShipSinkingControl extends AbstractControl {
-
-    private float elapsedTime = 0f;
-    private final float burnTiltDuration;
-    private final float sinkDuration;
-    private final float sinkDepth;
-    private final float tiltAngle;
-    private final Vector3f initialPosition;
-    private boolean sinkingStarted = false;
-
-    /**
-     * Constructs a new ShipSinkingControl instance.
-     *
-     * @param burnTiltDuration Time in seconds for the ship to burn and tilt on the surface
-     * @param sinkDuration     Time in seconds for the ship to fully sink
-     * @param sinkDepth        Depth below the water to sink the ship
-     * @param tiltAngle        Final tilt angle in degrees
-     */
-    public ShipSinkingControl(float burnTiltDuration, float sinkDuration, float sinkDepth, float tiltAngle) {
-        this.burnTiltDuration = burnTiltDuration;
-        this.sinkDuration = sinkDuration;
-        this.sinkDepth = sinkDepth;
-        this.tiltAngle = tiltAngle;
-        this.initialPosition = new Vector3f(); // Placeholder; will be set in controlUpdate
-    }
-
-    /**
-     * Overrides controlUpdate in AbstractControl
-     * regulates the burn and tilt timeframe
-     * @param tpf time per frame (in seconds)
-     */
-
-    @Override
-    protected void controlUpdate(float tpf) {
-        if (spatial == null) return;
-
-        elapsedTime += tpf;
-
-        if (elapsedTime < burnTiltDuration) {
-            float progress = elapsedTime / burnTiltDuration;
-
-            float angleInRadians = FastMath.DEG_TO_RAD * FastMath.interpolateLinear(progress, 0f, -tiltAngle);
-            Quaternion tiltRotation = new Quaternion().fromAngles(angleInRadians, 0, 0);
-            spatial.setLocalRotation(tiltRotation);
-            return;
-        }
-
-        // Start sinking if it hasn't started yet
-        if (!sinkingStarted) {
-            sinkingStarted = true;
-            // Save the initial position when sinking starts
-            initialPosition.set(spatial.getLocalTranslation());
-
-            // Remove the hitEffectNode
-            Node parentNode = (Node) spatial;
-            Spatial hitEffects = parentNode.getChild("HitEffectNode");
-            if (hitEffects != null) {
-                parentNode.detachChild(hitEffects);
-            }
-        }
-
-        // Calculate the progress of the sinking (0 to 1)
-        float progress = Math.min((elapsedTime - burnTiltDuration) / sinkDuration, 1f);
-
-        // Apply the tilt angle (remains constant during sinking)
-        Quaternion tiltRotation = new Quaternion().fromAngles(-FastMath.DEG_TO_RAD * tiltAngle, 0, 0);
-        spatial.setLocalRotation(tiltRotation);
-
-        // Sink the ship by interpolating the Y position
-        float currentY = FastMath.interpolateLinear(progress, initialPosition.y, sinkDepth);
-        spatial.setLocalTranslation(initialPosition.x, currentY, initialPosition.z);
-
-        if (currentY <= sinkDepth) {
-            Node parentNode = (Node) spatial.getParent();
-            if (parentNode != null) {
-                parentNode.detachChild(spatial);
-            }
-            spatial.removeControl(this);
-        }
-    }
-
-    /**
-     * This method is called during the rendering phase, but it does not perform any
-     * operations in this implementation as the control only influences the spatial's
-     * transformation, not its rendering process.
-     *
-     * @param rm the RenderManager rendering the controlled Spatial (not null)
-     * @param vp the ViewPort being rendered (not null)
-     */
-    @Override
-    protected void controlRender(RenderManager rm, ViewPort vp) {
-        // No rendering logic is needed for this control
-    }
-
-    /**
-     * Starts the sinking process for the ship.
-     */
-    public void startSinking() {
-        // Nothing to do here as the control update handles the timing and sequence
-    }
-}

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

@@ -0,0 +1,54 @@
+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 SinkControl 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} object with the shipNode to be to be sunk
+     * @param shipNode the node to handeld
+     */
+    public SinkControl(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/VolumeControl.java

@@ -1,34 +0,0 @@
-package pp.battleship.client.gui;
-
-import com.simsilica.lemur.Slider;
-import pp.battleship.client.GameMusic;
-
-
-public class VolumeControl extends Slider {
-
-    private final GameMusic menuMusicModern;
-
-    private double vol;
-
-    public VolumeControl(GameMusic music) {
-        super();
-        this.menuMusicModern = music;
-        vol = GameMusic.volumePreference();
-        getModel().setPercent(vol);
-    }
-
-    /**
-     * Updates the volume of the music to the appropriate level set by the User through the Volume control Slider
-     *
-     */
-    public void update() {
-        if (vol != getModel().getPercent()) {
-            vol = getModel().getPercent();
-            menuMusicModern.setVolume( (float) vol);
-        }
-    }
-
-}
-
-
-

Projekte/battleship/client/src/main/java/pp/battleship/server/BattleshipServer.java

@@ -5,7 +5,7 @@
 // (c) Mark Minas (mark.minas@unibw.de)
 ////////////////////////////////////////
 
-package pp.battleship.client.server;
+package pp.battleship.server;
 
 import com.jme3.network.ConnectionListener;
 import com.jme3.network.HostedConnection;
@@ -18,8 +18,8 @@ import pp.battleship.BattleshipConfig;
 import pp.battleship.game.server.Player;
 import pp.battleship.game.server.ServerGameLogic;
 import pp.battleship.game.server.ServerSender;
-import pp.battleship.message.client.AnimationFinishedMessage;
 import pp.battleship.message.client.ClientMessage;
+import pp.battleship.message.client.AnimationFinishedMessage;
 import pp.battleship.message.client.MapMessage;
 import pp.battleship.message.client.ShootMessage;
 import pp.battleship.message.server.EffectMessage;
@@ -42,14 +42,14 @@ import java.util.logging.LogManager;
 /**
  * Server implementing the visitor pattern as MessageReceiver for ClientMessages
  */
-public class BattleshipSelfhostServer implements MessageListener<HostedConnection>, ConnectionListener, ServerSender {
-    private static final Logger LOGGER = System.getLogger(BattleshipSelfhostServer.class.getName());
+public class BattleshipServer implements MessageListener<HostedConnection>, ConnectionListener, ServerSender {
+    private static final Logger LOGGER = System.getLogger(BattleshipServer.class.getName());
     private static final File CONFIG_FILE = new File("server.properties");
 
     private final BattleshipConfig config = new BattleshipConfig();
     private Server myServer;
     private final ServerGameLogic logic;
-    private final BlockingQueue<ReceivedMessageSelfhost> pendingMessages = new LinkedBlockingQueue<>();
+    private final BlockingQueue<ReceivedMessage> pendingMessages = new LinkedBlockingQueue<>();
 
     static {
         // Configure logging
@@ -64,16 +64,16 @@ public class BattleshipSelfhostServer implements MessageListener<HostedConnectio
     }
 
     /**
-     * Starts the server.
+     * Starts the Battleships server.
      */
     public static void main(String[] args) {
-        new BattleshipSelfhostServer().run();
+        new BattleshipServer().run();
     }
 
     /**
      * Creates the server.
      */
-    BattleshipSelfhostServer() {
+    BattleshipServer() {
         config.readFromIfExists(CONFIG_FILE);
         LOGGER.log(Level.INFO, "Configuration: {0}", config); //NON-NLS
         logic = new ServerGameLogic(this, config);
@@ -133,7 +133,7 @@ public class BattleshipSelfhostServer implements MessageListener<HostedConnectio
     public void messageReceived(HostedConnection source, Message message) {
         LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
         if (message instanceof ClientMessage clientMessage)
-            pendingMessages.add(new ReceivedMessageSelfhost(clientMessage, source.getId()));
+            pendingMessages.add(new ReceivedMessage(clientMessage, source.getId()));
     }
 
     @Override
@@ -180,3 +180,4 @@ public class BattleshipSelfhostServer implements MessageListener<HostedConnectio
             LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS
     }
 }
+

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

@@ -5,13 +5,14 @@
 // (c) Mark Minas (mark.minas@unibw.de)
 ////////////////////////////////////////
 
-package pp.battleship.client.server;
+package pp.battleship.server;
 
 import pp.battleship.message.client.ClientInterpreter;
 import pp.battleship.message.client.ClientMessage;
 
-record ReceivedMessageSelfhost(ClientMessage message, int from) {
+record ReceivedMessage(ClientMessage message, int from) {
     void process(ClientInterpreter interpreter) {
         message.accept(interpreter, from);
     }
 }
+

Projekte/battleship/client/src/main/resources/Models/CV/essex_scb-125_generic.mtl

@@ -1,180 +0,0 @@
-newmtl Model001_Material001
-map_Kd Yorktown_paint6.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material002
-map_Kd diff_null_7.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material003
-map_Kd diff_null_14.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material004
-map_Kd diff_null_Color005.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material005
-map_Kd diff_null_8.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material006
-map_Kd diff_null_Color007.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material007
-map_Kd diff_null_17.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material008
-map_Kd diff_null_FrontColor.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material009
-map_Kd diff_null_BackColor.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material010
-map_Kd diff_null_4.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material011
-map_Kd Color_004.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material012
-map_Kd diff_null_Gray1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material013
-map_Kd diff_null_3.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material014
-map_Kd Metal_Rough.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material015
-map_Kd diff_null_12.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material016
-map_Kd diff_null_19.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material017
-map_Kd diff_null_Color003.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material018
-map_Kd diff_null_mat1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material019
-map_Kd diff_null_1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material020
-map_Kd diff_null_2.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material021
-map_Kd diff_null_Black1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material022
-map_Kd diff_null_Model001Materia.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material023
-map_Kd diff_null_Model001Mate1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material024
-map_Kd diff_null_13.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material025
-map_Kd _6.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material026
-map_Kd Metal_Aluminum_Anodized.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material027
-map_Kd diff_null_Color006.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material028
-map_Kd Blinds_Vertical_Stripe_Gray.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material029
-map_Kd diff_null_15.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material030
-map_Kd diff_null_Color002.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material031
-map_Kd Cladding_Siding_Tan.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material032
-map_Kd diff_null_Color008.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material033
-map_Kd diff_null_16.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material034
-map_Kd _2.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material035
-map_Kd Blinds_Roman_Hobbled_Blue.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material036
-map_Kd Blinds_Wood_White.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material037
-map_Kd Metal_Seamed.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material038
-map_Kd image_16.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material039
-map_Kd diff_null_9.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material040
-map_Kd image_15.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material041
-map_Kd _Blinds_Roman_Hobbled_Blue_1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material042
-map_Kd diff_null_10.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material043
-map_Kd diff_null_Material5.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material044
-map_Kd diff_null_Material1.png
-map_bump bumpmap_flat.png
-
-newmtl Model001_Material045
-map_Kd diff_null_11.png
-map_bump bumpmap_flat.png
-

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

@@ -42,13 +42,9 @@ public class ModelExporter extends SimpleApplication {
     @Override
     public void simpleInitApp() {
         export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o"); //NON-NLS
-        export("Models/BoatSmall/12219_boat_v2_L2.obj", "12219_boat_v2_L2.j3o");
-        export("Models/Battle/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj", "Battle.j3o"); //NON-NLS
-        export("Models/CV/essex_scb-125_generic.obj", "CV.j3o"); //NON-NLS
-        export("Models/Shell/Shell/45.obj", "Shell.j3o");
-
-
-
+        export("Models/SmallShip/12219_boat_v2_L2.obj", "SmallShip.j3o"); //NON-NLS
+        export("Models/WWII_ship_German_Type_II_U-boat_v2/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj", "WW2Uboat.j3o"); //NON-NLS
+        export("Models/TugBoat/12218_tugboat_v1_L2.obj", "TugBoat.j3o"); //NON-NLS
         stop();
     }
 

Projekte/battleship/converter/src/main/resources/Models/Battle/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.mtl

@@ -1,16 +0,0 @@
-# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 29.03.2012 14:25:39
-
-newmtl default
-	Ns 35.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 1.0000 1.0000 1.0000
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.5400 0.5400 0.5400
-	Ke 0.0000 0.0000 0.0000
-	map_Ka 14084_WWII_ship_German_Type_II_U-boat_diff.jpg
-	map_Kd 14084_WWII_ship_German_Type_II_U-boat_diff.jpg

Projekte/battleship/converter/src/main/resources/Models/BoatSmall/12219_boat_v2_L2.mtl

@@ -1,104 +0,0 @@
-# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 16.12.2011 14:18:52
-
-newmtl white
-	Ns 53.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.6667 0.6667 0.6667
-	Kd 0.6667 0.6667 0.6667
-	Ks 0.1800 0.1800 0.1800
-	Ke 0.0000 0.0000 0.0000
-
-newmtl boat_elements_black
-	Ns 55.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.0000 0.0000 0.0000
-	Kd 0.0000 0.0000 0.0000
-	Ks 0.3600 0.3600 0.3600
-	Ke 0.0000 0.0000 0.0000
-
-newmtl boat_glass
-	Ns 60.0000
-	Ni 7.0000
-	d 0.4000
-	Tr 0.6000
-	Tf 0.4000 0.4000 0.4000 
-	illum 2
-	Ka 0.1059 0.1569 0.1451
-	Kd 0.1059 0.1569 0.1451
-	Ks 0.6750 0.6750 0.6750
-	Ke 0.0000 0.0000 0.0000
-
-newmtl boat_screw_hooks_bronze
-	Ns 80.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.2941 0.2157 0.0510
-	Kd 0.2941 0.2157 0.0510
-	Ks 0.7200 0.7200 0.7200
-	Ke 0.0000 0.0000 0.0000
-
-newmtl boat_silver
-	Ns 80.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.3333 0.3333 0.3333
-	Kd 0.3333 0.3333 0.3333
-	Ks 0.7200 0.7200 0.7200
-	Ke 0.0000 0.0000 0.0000
-
-newmtl boat_buffer
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 1.0000 1.0000 1.0000
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.2700 0.2700 0.2700
-	Ke 0.0000 0.0000 0.0000
-	map_Ka boat_buffer_diffuse.jpg
-	map_Kd boat_buffer_diffuse.jpg
-
-newmtl boat_roof_accessory
-	Ns 15.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 1.0000 1.0000 1.0000
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.3600 0.3600 0.3600
-	Ke 0.0000 0.0000 0.0000
-	map_Ka boat_roof_accessory_diffuse.jpg
-	map_Kd boat_roof_accessory_diffuse.jpg
-
-newmtl boat_body
-	Ns 55.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 1.0000 1.0000 1.0000
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.3600 0.3600 0.3600
-	Ke 0.0000 0.0000 0.0000
-	map_Ka boat_body_diffuse.jpg
-	map_Kd boat_body_diffuse.jpg