Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory

# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -5,10 +5,10 @@ import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
 import javafx.animation.AnimationTimer;
 import javafx.geometry.Point3D;
 import javafx.scene.AmbientLight;
+import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.Circle;
 import javafx.scene.shape.MeshView;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
@@ -56,7 +56,7 @@ public class ModelFactory {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().setAll(
             new Rotate(-90, new Point3D(0,0,1)),
-            new Scale(0.05, 0.05, 0.05)
+            new Scale(0.06, 0.06, 0.06)
         );
         return new BoatModel(boatAssets, null, boatType);
     }
@@ -76,6 +76,9 @@ public class ModelFactory {
     private static MeshView importFile(String fileName) {
         StlMeshImporter importer = new StlMeshImporter();
         importer.read(ModelFactory.class.getResource("/meshes/" + fileName));
+        MeshView importedFile = new MeshView(importer.getImport());
+        importedFile.setCache(true);
+        importedFile.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         return new MeshView(importer.getImport());
     }
 
@@ -87,6 +90,8 @@ public class ModelFactory {
             ColModelImporter importer = new ColModelImporter();
             importer.read(ModelFactory.class.getResource("/meshes/" + tokenType.filename));
             assets = new Group(importer.getImport());
+            assets.setCache(true);
+            assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         }
         switch (tokenType) {
             case VELOCITY_PICKUP:
@@ -104,10 +109,14 @@ public class ModelFactory {
             case START_LINE:
             case GATE_LINE:
                 return makeGate(assets);
+            case WAKE:
+                return makeWake(assets);
+            case TRAIL_SEGMENT:
+                return makeTrail(assets);
             case PLAYER_IDENTIFIER:
                 return makeIdentifierIcon(assets);
             default:
-                return new Model(assets, null);
+                return new Model(new Group(assets), null);
         }
     }
 
@@ -120,7 +129,7 @@ public class ModelFactory {
             new Translate(0,-1,0),
             new Rotate(0 ,new Point3D(1,1,1))
         );
-        return new Model(assets, new AnimationTimer() {
+        return new Model(new Group(assets), new AnimationTimer() {
 
             private double rotation = 0;
             private Group group = assets;
@@ -139,17 +148,21 @@ public class ModelFactory {
         Group area = new Group(importer.getImport());
         area.getChildren().add(marker);
         area.getTransforms().add(new Rotate(90, new Point3D(1, 0, 0)));
-        return new Model(area, null);
+        return new Model(new Group(area), null);
     }
 
     private static Model makeOcean(Group group) {
 //        group.setScaleY(Double.MAX_VALUE);
 //        group.setScaleX(Double.MAX_VALUE);
-//        group.getTransforms().add(new Rotate(90, new Point3D(1, 0, 0)));
-        Circle ocean = new Circle(0,0,1000, Color.DEEPSKYBLUE);
-        ocean.setStroke(Color.TRANSPARENT);
-        group.getChildren().add(ocean);
-        return new Model(group, null);
+        group.getTransforms().addAll(
+            new Rotate(90, new Point3D(1, 0, 0)),
+            new Scale(10,4,10)
+        );
+//        group.getChildren().add(new AmbientLight());
+//        Circle ocean = new Circle(0,0,500, Color.SKYBLUE);
+//        ocean.setStroke(Color.TRANSPARENT);
+//        group.getChildren().add(ocean);
+        return new Model(new Group(group), null);
     }
 
     private static Model makeBarrier(Group assets) {
@@ -157,14 +170,30 @@ public class ModelFactory {
             new Rotate(90, new Point3D(1,0,0)),
             new Scale(1.5,1.5,1.5)
         );
-        return new Model(assets, null);
+        return new Model(new Group(assets), null);
     }
 
     private static Model makeGate(Group assets) {
         assets.getTransforms().addAll(
             new Rotate(90, new Point3D(1,0,0))
         );
-        return new Model(assets, null);
+        return new Model(new Group(assets), null);
+    }
+
+    private static Model makeWake(Group assets) {
+        assets.getTransforms().setAll(
+            new Rotate(-90, new Point3D(0,0,1)),
+            new Rotate(90, new Point3D(1,0,0)),
+            new Scale(0.5, 0.5, 0.5)
+        );
+        return new Model(new Group(assets), null);
+    }
+
+    private static Model makeTrail(Group trailPiece) {
+        trailPiece.getTransforms().addAll(
+            new Rotate(90, new Point3D(0,0,1))
+        );
+        return new Model(new Group(trailPiece), null);
     }
 
     private static Model makeIdentifierIcon(Group assets) {

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java

@@ -11,12 +11,14 @@ public enum ModelType {
     START_MARKER ("start_marker.dae"),
     PLAIN_MARKER ("plain_marker.dae"),
     MARK_AREA ("mark_area.dae"),
-    OCEAN (null),
+    OCEAN ("ocean.dae"),
     BORDER_PYLON ("barrier_pole.dae"),
     BORDER_BARRIER ("barrier_segment.dae"),
     FINISH_LINE ("finish_line.dae"),
     START_LINE ("start_line.dae"),
     GATE_LINE ("gate_line.dae"),
+    WAKE ("wake.dae"),
+    TRAIL_SEGMENT ("trail_segment.dae");
     PLAYER_IDENTIFIER ("player_identifier.dae");
 
     final String filename;