Added models as .j3o file

added color & bump texture path in 'ShipModelÃ'
added lighting texture for models

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

@@ -41,6 +41,7 @@
  */
 class SeaSynchronizer extends ShipMapSynchronizer {
     private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //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
     private static final String SHOT = "shot"; //NON-NLS
@@ -206,6 +207,15 @@ private Spatial createBattleship(Battleship ship, ShipModel shipModel) {
         model.setLocalTranslation(shipModel.getTranslation());
         model.setShadowMode(ShadowMode.CastAndReceive);
 
+        Material mat = new Material(app.getAssetManager(), LIGHTING);
+
+        String colorPath = shipModel.getColorPath();
+        String bumpPath = shipModel.getBumpPath();
+        if (colorPath != null) mat.setTexture("DiffuseMap",app.getAssetManager().loadTexture(colorPath));
+        if (bumpPath != null) mat.setTexture("NormalMap", app.getAssetManager().loadTexture(bumpPath));
+
+        mat.setReceivesShadows(true);
+        model.setMaterial(mat);
         return model;
     }
 

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

@@ -3,19 +3,31 @@
 import com.jme3.math.Vector3f;
 
 public enum ShipModel {
-    SHIP1("Models/Ships/1/ship1.obj",0.15f, new Vector3f(0f, 0f, 0f)),
-    SHIP2("Models/Ships/2/ship2.obj",0.03f, new Vector3f(0f, 0.2f, 0f)),
-    SHIP3("Models/Ships/3/ship3.obj",0.47f, new Vector3f(0f, -0.2f, 0f)),
-    SHIP4("Models/Ships/4/ship4.obj",1.48f, new Vector3f(0f, 0f, 0f));
+    SHIP1("Models/Ships/1/ship1.j3o",0.15f, new Vector3f(0f, 0f, 0f), "Models/Ships/1/ship1_color.png", null),
+    SHIP2("Models/Ships/2/ship2.j3o",0.03f, new Vector3f(0f, 0.2f, 0f), "Models/Ships/2/ship2.jpg", null),
+    SHIP3("Models/Ships/3/ship3.j3o",0.47f, new Vector3f(0f, -0.2f, 0f), "Models/Ships/3/ship3_color.jpg", null),
+    SHIP4("Models/Ships/4/ship4.j3o",1.48f, new Vector3f(0f, 0f, 0f), "Models/Ships/4/ship4_color.jpg", "Models/Ships/4/ship4_bump.jpg");
 
     private final String modelPath;
     private final float modelScale;
     private final Vector3f translation;
+    private final String colorPath;
+    private final String bumpPath;
 
-    ShipModel(String modelPath, float modelScale, Vector3f translation){
+    ShipModel(String modelPath, float modelScale, Vector3f translation, String colorPath, String bumpPath){
         this.modelPath = modelPath;
         this.modelScale = modelScale;
         this.translation = translation;
+        this.colorPath = colorPath;
+        this.bumpPath = bumpPath;
+    }
+
+    public String getBumpPath() {
+        return bumpPath;
+    }
+
+    public String getColorPath() {
+        return colorPath;
     }
 
     public float getScale() {

Projekte/battleship/client/src/main/resources/Models/Ships/1/ship1.mtl

@@ -19,4 +19,4 @@ Ke 0.000000 0.000000 0.000000
 Ni 1.450000
 d 1.000000
 illum 2
-map_Kd ship1_color_2.png
+map_Kd ship1_color.png

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

@@ -41,7 +41,7 @@ public static void main(String[] args) {
      */
     @Override
     public void simpleInitApp() {
-        export("Models/test.obj", "test.j3o"); //NON-NLS
+        export("Models/4/ship4.obj", "ship4.j3o"); //NON-NLS
 
         stop();
     }

Projekte/battleship/converter/src/main/resources/Models/1/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

Projekte/battleship/converter/src/main/resources/Models/2/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/converter/src/main/resources/Models/3/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/4/ship4.mtl

@@ -1,18 +0,0 @@
-# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 16.03.2012 14:15:53
-
-newmtl _King_George_V
-	Ns 60.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.4500 0.4500 0.4500
-	Ke 0.0000 0.0000 0.0000
-	map_Ka King_George_V.jpg
-	map_Kd King_George_V.jpg
-	map_bump King_George_V_bump.jpg
-	bump King_George_V_bump.jpg

Projekte/battleship/converter/src/main/resources/Models/KingGeorgeV/King_George_V.mtl

@@ -1,18 +0,0 @@
-# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 16.03.2012 14:15:53
-
-newmtl _King_George_V
-	Ns 60.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.4500 0.4500 0.4500
-	Ke 0.0000 0.0000 0.0000
-	map_Ka King_George_V.jpg
-	map_Kd King_George_V.jpg
-	map_bump King_George_V_bump.jpg
-	bump King_George_V_bump.jpg

Projekte/battleship/converter/src/main/resources/Models/KingGeorgeV/README.txt

@@ -1,3 +0,0 @@
-based on:
-https://free3d.com/3d-model/wwii-ship-uk-king-george-v-class-battleship-v1--185381.html
-License: Free Personal Use Only

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

@@ -1,13 +0,0 @@
-# Blender 3.6.5 MTL File: 'test.blend'
-# www.blender.org
-
-newmtl _King_George_V
-Ns 60.000008
-Ka 1.000000 1.000000 1.000000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-map_Kd test_color.jpg
-map_Bump -bm 1.000000 test_bump.jpg