From 0f5137c2b69fc215120144c0beda265d55c6ad17 Mon Sep 17 00:00:00 2001 From: Calum Date: Tue, 19 Sep 2017 14:52:02 +1200 Subject: [PATCH] Fixed the orientation of .stl files. #fix --- .../seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java | 2 +- .../seng302/visualiser/fxObjects/assets_3D/ModelFactory.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java index 9747b892..9b74aa69 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java @@ -2,7 +2,7 @@ package seng302.visualiser.fxObjects.assets_3D; /** * Enum for boat meshes. Enum values should be of the form : - * ENUM_VALUE (hull file, mast file, X offset of mast CoR from origin, sail file, X offset of sail CoR from origin) + * ENUM_VALUE (hull file, mast file, Y offset of mast CoR from origin, sail file, Y offset of sail CoR from origin) * Files must be valid .stl files. */ public enum BoatMeshType { diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java index f0c50abe..b49c36c1 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java @@ -78,7 +78,6 @@ public class ModelFactory { public static BoatModel boatGameView(BoatMeshType boatType, Color primaryColour) { Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour); boatAssets.getTransforms().setAll( - new Rotate(-90, new Point3D(0,0,1)), new Scale(0.3, 0.3, 0.3) ); return new BoatModel(boatAssets, null, boatType);