added new models and fixed loading of 3d interface

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

@@ -25,6 +25,7 @@ import pp.battleship.model.Shot;
 import static java.util.Objects.requireNonNull;
 import static pp.util.FloatMath.HALF_PI;
 import static pp.util.FloatMath.PI;
+import static pp.util.FloatMath.QUARTER_PI;
 
 /**
  * The {@code SeaSynchronizer} class is responsible for synchronizing the graphical
@@ -37,7 +38,9 @@ class SeaSynchronizer extends ShipMapSynchronizer {
     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 UBOAT_MODEL = "Models/UBoat/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.j30";
-    private static final String BATTLECRUISER_MODEL = "Models/Battlecruiser/10619_Battleship.j30";
+    private static final String BATTLECRUISER_MODEL = "Models/Battlecruiser/16025_Naval_Ship_Destroyer_Italy_new.j30";
+    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 COLOR = "Color"; //NON-NLS
     private static final String SHIP = "ship"; //NON-NLS
     private static final String SHOT = "shot"; //NON-NLS
@@ -148,10 +151,10 @@ class SeaSynchronizer extends ShipMapSynchronizer {
             case 4:
                 return createBattleship(ship);
             case 3:
-                return createBattlecruiser(ship);
+                return createCV(ship);
 
             case 2:
-                return createUBoat(ship);
+                return createBattle(ship);
             case 1:
                 return createSmallShip(ship);
 
@@ -232,22 +235,48 @@ class SeaSynchronizer extends ShipMapSynchronizer {
         final Spatial model = app.getAssetManager().loadModel(UBOAT_MODEL);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(1.48f);
+        // model.move(0f, -0.05f, 0f);
+        model.scale(0.27f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;
     }
 
+
     private Spatial createBattlecruiser(Battleship ship) {
         final Spatial model = app.getAssetManager().loadModel(BATTLECRUISER_MODEL);
 
         model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
-        model.scale(0.0005f);
+        model.scale(0.00005f);
         model.setShadowMode(ShadowMode.CastAndReceive);
 
         return model;
     }
 
+    private Spatial createBattle(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(BATTLE_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;
+    }
+
+    private Spatial createCV(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(CV_MODEL);
+
+        model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f);
+        model.move(0f, 0.25f, 0f);
+        model.scale(0.85f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+
+        return model;
+    }
+
+
+
     /**
      * Calculates the rotation angle for the specified rotation.
      *

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

@@ -0,0 +1,16 @@
+# 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/client/src/main/resources/Models/Battlecruiser/10619_Battleship.mtl

@@ -1,73 +0,0 @@
-newmtl Battleship
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-map_Kd BattleshipC.jpg
-Ni 1.00
-Ks 0.00 0.00 0.00
-Ns 256.00
-newmtl blinn1SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.00 0.00 0.00
-Ns 256.00
-newmtl blinn2SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.00 0.00 0.00
-Ns 256.00
-newmtl blinn3SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn4SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn5SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn6SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn7SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn8SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00

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

@@ -0,0 +1,180 @@
+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,9 +42,13 @@ 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", "BoatSmall.j3o");
+        export("Models/BoatSmall/12219_boat_v2_L2.obj", "12219_boat_v2_L2.j3o");
         export("Models/UBoat/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj", "14084_WWII_Ship_German_Type_II_U-boat_v2_L1.j3o");
-        export("Models/Battlecruiser/10619_Battleship.obj", "10619_Battleship.j3o");
+        export("Models/Battlecruiser/16025_Naval_Ship_Destroyer_Italy_new.obj", "16025_Naval_Ship_Destroyer_Italy_new.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
+
+
 
         stop();
     }

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

@@ -0,0 +1,16 @@
+# 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/Battlecruiser/10619_Battleship.mtl

@@ -1,73 +0,0 @@
-newmtl Battleship
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-map_Kd BattleshipC.jpg
-Ni 1.00
-Ks 0.00 0.00 0.00
-Ns 256.00
-newmtl blinn1SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.00 0.00 0.00
-Ns 256.00
-newmtl blinn2SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.00 0.00 0.00
-Ns 256.00
-newmtl blinn3SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn4SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn5SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn6SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn7SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00
-newmtl blinn8SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 256.00