added boat with length 1 and 3

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

@@ -35,7 +35,10 @@ import static pp.util.FloatMath.PI;
 class SeaSynchronizer extends ShipMapSynchronizer {
     private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
 
+    private static final String UX23 = "Models/UX23/UX23.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"; //NON-NLS
     private static final String COLOR = "Color"; //NON-NLS
     private static final String SHIP = "ship"; //NON-NLS
@@ -144,6 +147,12 @@ class SeaSynchronizer extends ShipMapSynchronizer {
      */
     private Spatial createShip(Battleship ship) {
         switch (ship.getLength()) {
+
+            case 1:
+                return createUX23(ship);
+
+            case 3:
+                return createMarlow66(ship);
             case 4:
                 return createBattleship(ship);
             case 5:
@@ -161,9 +170,32 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         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.0027f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+
+        return model;
+    }
 
 
-        /**
+    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.0085f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+
+        return model;
+    }
+
+
+
+    /**
          * Creates a simple box to represent a battleship that is not of the "King George V" type.
          *
          * @param ship the battleship to be represented

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

@@ -43,8 +43,8 @@ public class ModelExporter extends SimpleApplication {
     public void simpleInitApp() {
         export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o");//NON-NLS
         export("Models/Alienship/Alienship.obj", "Alienship.j3o");//NON-NLS
-        export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o");//NON-NLS
-        export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o");//NON-NLS
+        export("Models/Marlow66/Marlow66.obj", "Marlow66.j3o");//NON-NLS
+        export("Models/UX23/UX23.obj", "UX23.j3o");//NON-NLS
         export("Models/KingGeorgeV/King_George_V.obj", "KingGeorgeV.j3o");//NON-NLS
 
         stop();

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