Started working on the boat selection screen.

Customised the boat customisation UI to contain it. Need to have another boat to test whether we can switch boats and also if the messages get sent correctly.

#story[1274]

src/main/java/seng302/gameServer/GameState.java

@@ -702,6 +702,9 @@ public class GameState implements Runnable {
             int blue = customizeData[2] & 0xFF;
             Color yachtColor = Color.rgb(red, green, blue);
             playerYacht.setBoatColor(yachtColor);
+        } else if (requestType.equals(CustomizeRequestType.SHAPE)) {
+            String type = new String(customizeData);
+            playerYacht.setBoatType(type);
         }
     }
 

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -125,7 +125,7 @@ public class ServerToClientThread implements Runnable {
         lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
 
         ServerYacht yacht = new ServerYacht(
-                "Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
+                "DINGHY", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
         );
 
         player = new Player(socket, yacht);

src/main/java/seng302/model/ServerYacht.java

@@ -421,4 +421,7 @@ public class ServerYacht {
         return boatColor;
     }
 
+    public void setBoatType(String boatType) {
+        this.boatType = boatType;
+    }
 }

src/main/java/seng302/visualiser/controllers/LobbyController.java

@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
 
 public class LobbyController implements Initializable {
 
@@ -129,6 +130,7 @@ public class LobbyController implements Initializable {
         controller.setPlayerName(this.playerBoats
             .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
             .getBoatName());
+        controller.setCurrentBoat(BoatMeshType.DINGHY);
 
         return customizationDialog;
     }

src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java

@@ -9,12 +9,21 @@ import java.util.ResourceBundle;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.geometry.Insets;
+import javafx.scene.Group;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.ClientToServerThread;
 import seng302.visualiser.controllers.LobbyController;
 import seng302.visualiser.controllers.ViewManager;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.visualiser.fxObjects.assets_3D.BoatModel;
+import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
 
@@ -28,13 +37,17 @@ public class BoatCustomizeController implements Initializable{
     @FXML
     private JFXTextField boatName;
     @FXML
+    private Pane boatPane;
+    @FXML
     void colorChanged(ActionEvent event) {
         Color color = colorPicker.getValue();
+        RefreshBoat();
     }
     //---------FXML END---------//
 
     private ClientToServerThread socketThread;
     private LobbyController lobbyController;
+    private BoatMeshType currentBoat;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
@@ -55,6 +68,7 @@ public class BoatCustomizeController implements Initializable{
         });
 
         submitBtn.setOnMouseEntered(e -> Sounds.playHoverSound());
+
     }
 
     /**
@@ -78,7 +92,10 @@ public class BoatCustomizeController implements Initializable{
             colorArray[2] = (byte) blue;
 
             socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR, colorArray);
+            socketThread.sendCustomizationRequest(CustomizeRequestType.SHAPE, currentBoat.toString().getBytes());
             lobbyController.closeCustomizationDialog();
+
+
         }
     }
 
@@ -93,4 +110,29 @@ public class BoatCustomizeController implements Initializable{
     public void setParentController(LobbyController lobbyController){
         this.lobbyController = lobbyController;
     }
+
+    public void setCurrentBoat(BoatMeshType boatType) {
+        Group group = new Group();
+        this.currentBoat = boatType;
+        System.out.println(boatType.toString());
+        boatPane.setBackground(new Background(new BackgroundFill(Color.SKYBLUE, CornerRadii.EMPTY, Insets.EMPTY)));
+        boatPane.getChildren().add(group);
+        BoatModel bo = ModelFactory.boatCustomiseView(boatType, colorPicker.getValue());
+        group.getChildren().add(bo.getAssets());
+    }
+
+    public void nextBoat(ActionEvent actionEvent) {
+        boatPane.getChildren().clear();
+    }
+
+    public void prevBoat(ActionEvent actionEvent) {
+    }
+
+    private void RefreshBoat() {
+        boatPane.getChildren().clear();
+        Group group = new Group();
+        boatPane.getChildren().add(group);
+        BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());
+        group.getChildren().add(bo.getAssets());
+    }
 }

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

@@ -51,6 +51,35 @@ public class ModelFactory {
         return bo;
     }
 
+    public static BoatModel boatCustomiseView(BoatMeshType boatType, Color primaryColour) {
+        Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
+        final Rotate animationRotate = new Rotate(0, new Point3D(0,0,1));
+        boatAssets.getTransforms().addAll(
+            new Scale(8.0, 8.0, 8.0),
+            new Rotate(-70, new Point3D(1,0,0)),
+            new Translate(16,50, 0),
+            animationRotate
+        );
+
+        boatAssets.getTransforms().add(animationRotate);
+        BoatModel bo = new BoatModel(boatAssets, null, boatType);
+        bo.rotateSail(45);
+
+        bo.setAnimation(new AnimationTimer() {
+            double boatAngle = 0;
+            Rotate rotate = animationRotate;
+            @Override
+            public void handle(long now) {
+                boatAngle += 0.5;
+                rotate.setAngle(boatAngle);
+            }
+        });
+        boatAssets.getChildren().addAll(
+            new AmbientLight()
+        );
+        return bo;
+    }
+
     public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().addAll(

src/main/resources/views/dialogs/BoatCustomizeDialog.fxml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.*?>
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.JFXButton?>
 <?import com.jfoenix.controls.JFXColorPicker?>
 <?import com.jfoenix.controls.JFXDialogLayout?>
@@ -10,54 +15,44 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+
-  minWidth="-Infinity" prefWidth="400.0" xmlns="http://javafx.com/javafx/8"
+<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="400.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.dialogs.BoatCustomizeController">
-  xmlns:fx="http://javafx.com/fxml/1"
-  fx:controller="seng302.visualiser.controllers.dialogs.BoatCustomizeController">
     <children>
         <GridPane>
             <columnConstraints>
                 <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints maxHeight="90.0" minHeight="90.0" prefHeight="90.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="90.0" minHeight="48.0" prefHeight="48.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="100.0" minHeight="100.0" prefHeight="100.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="207.0" minHeight="93.0" prefHeight="181.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="125.0" minHeight="61.0" prefHeight="99.0"
+                <RowConstraints maxHeight="145.0" minHeight="66.0" prefHeight="109.0" vgrow="SOMETIMES" />
-                  vgrow="SOMETIMES"/>
+                <RowConstraints maxHeight="125.0" minHeight="24.0" prefHeight="72.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="164.0" minHeight="100.0" prefHeight="126.0"
+                <RowConstraints maxHeight="164.0" minHeight="100.0" prefHeight="105.0" vgrow="SOMETIMES" />
-                  vgrow="SOMETIMES"/>
             </rowConstraints>
             <children>
-                <Label fx:id="hostDialogHeader" text="Customize Boat" GridPane.halignment="CENTER"
+                <Label fx:id="hostDialogHeader" text="Customize Boat" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
-                  GridPane.valignment="CENTER"/>
+                <JFXButton fx:id="submitBtn" prefHeight="45.0" prefWidth="220.0" text="Customize Boat" GridPane.halignment="CENTER" GridPane.rowIndex="4" GridPane.valignment="CENTER" />
-                <JFXButton fx:id="submitBtn" prefHeight="45.0" prefWidth="220.0" text="Customize Boat" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
+                <JFXTextField fx:id="boatName" focusColor="#6c6c6c" promptText="Boat Name" unFocusColor="#6b6b6b" GridPane.rowIndex="2">
-                <JFXTextField fx:id="boatName" focusColor="#6c6c6c" promptText="Boat Name"
-                  unFocusColor="#6b6b6b" GridPane.rowIndex="1">
                <GridPane.margin>
                   <Insets left="30.0" right="30.0" />
                </GridPane.margin></JFXTextField>
-                <GridPane GridPane.halignment="CENTER" GridPane.rowIndex="2"
+                <GridPane GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
-                  GridPane.valignment="CENTER">
               <columnConstraints>
-                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="139.0" minWidth="10.0"
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="139.0" minWidth="10.0" prefWidth="94.0" />
-                    prefWidth="94.0"/>
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="203.0" minWidth="10.0" prefWidth="198.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="203.0" minWidth="10.0"
-                    prefWidth="198.0"/>
               </columnConstraints>
               <rowConstraints>
-                  <RowConstraints percentHeight="100.0" valignment="CENTER" vgrow="SOMETIMES"/>
+                  <RowConstraints percentHeight="100.0" valignment="CENTER" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
-                   <Label fx:id="boatColorLabel" prefHeight="25.0" prefWidth="96.0"
+                   <Label fx:id="boatColorLabel" prefHeight="25.0" prefWidth="96.0" text="Boat Color" GridPane.valignment="CENTER">
-                     text="Boat Color" GridPane.valignment="CENTER">
                      <GridPane.margin>
                         <Insets top="-10.0" />
                      </GridPane.margin>
                   </Label>
-                   <JFXColorPicker fx:id="colorPicker" onAction="#colorChanged"
+                   <JFXColorPicker fx:id="colorPicker" onAction="#colorChanged" GridPane.columnIndex="1" GridPane.valignment="CENTER">
-                     GridPane.columnIndex="1" GridPane.valignment="CENTER">
                      <GridPane.margin>
-                         <Insets left="30.0" top="-10.0"/>
+                         <Insets left="30.0" top="-10.0" />
                      </GridPane.margin>
                   </JFXColorPicker>
                </children>
@@ -65,11 +60,26 @@
                   <Insets left="30.0" right="30.0" />
                </GridPane.margin>
             </GridPane>
+            <GridPane GridPane.rowIndex="1">
+              <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="-Infinity" prefWidth="50.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="256.0" minWidth="10.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="-Infinity" prefWidth="50.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <Pane fx:id="boatPane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" />
+                  <JFXButton buttonType="RAISED" onAction="#prevBoat" prefHeight="200.0" prefWidth="50.0" text="&lt;" />
+                  <JFXButton buttonType="RAISED" onAction="#nextBoat" prefHeight="200.0" prefWidth="50.0" text="&gt;" GridPane.columnIndex="2" />
+               </children>
+            </GridPane>
             </children>
         </GridPane>
     </children>
    <stylesheets>
-       <String fx:value="/css/dialogs/BoatCustomize.css"/>
+       <String fx:value="/css/dialogs/BoatCustomize.css" />
-       <String fx:value="/css/Master.css"/>
+       <String fx:value="/css/Master.css" />
    </stylesheets>
 </JFXDialogLayout>