Changed arrow colour.

#fix

src/main/java/seng302/App.java

@@ -80,12 +80,14 @@ public class App extends Application {
         ViewManager.getInstance().initialiseSplashScreen(primaryStage);
     }
 
-    private static void runDiscoveryServer(){
-        try{
-            new DiscoveryServer();
-        }
-        catch (Exception e){
-            runDiscoveryServer();
+    private static void runDiscoveryServer() throws Exception {
+        while (true){
+            try {
+                new DiscoveryServer();
+            }
+            catch (Exception ignored){
+                ;
+            }
         }
     }
 

src/main/java/seng302/discoveryServer/DiscoveryServer.java

@@ -11,11 +11,13 @@ import seng302.discoveryServer.util.ServerRepoStreamParser;
 import seng302.discoveryServer.util.ServerTable;
 import seng302.visualiser.ServerListener;
 
+import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
+import java.util.Timer;
 
 public class DiscoveryServer {
     public static final String ANSI_GREEN = "\u001B[32m";
@@ -27,6 +29,7 @@ public class DiscoveryServer {
 
     private ServerTable serverTable;
     public static final Integer PORT_NUMBER = 9969;
+    private ServerSocket serverSocket;
 
     private final Logger logger = LoggerFactory.getLogger(DiscoveryServer.class);
 
@@ -56,8 +59,6 @@ public class DiscoveryServer {
         displayHeader();
         serverTable = new ServerTable();
 
-        ServerSocket serverSocket;
-
         try{
             serverSocket = new ServerSocket(PORT_NUMBER);
         }
@@ -69,12 +70,17 @@ public class DiscoveryServer {
 
         logger.info("Started successfully - Now accepting connections");
 
-        while (true){
-            Socket clientSocket = serverSocket.accept();
+        try{
+            while (true){
+                Socket clientSocket = serverSocket.accept();
 
-            parseRequest(clientSocket);
+                parseRequest(clientSocket);
 
-            clientSocket.close();
+                clientSocket.close();
+            }
+        }
+        catch (Exception e){
+            close();
         }
     }
 
@@ -147,6 +153,18 @@ public class DiscoveryServer {
             tries++;
         }
 
+        if (serverToJoin != null && serverToJoin.isMaxPlayersReached()){
+            return null;
+        }
+
         return serverToJoin;
     }
+
+    public void close(){
+        try {
+            serverSocket.close();
+        } catch (IOException ignored) {
+            ;
+        }
+    }
 }

src/main/java/seng302/gameServer/MainServerThread.java

@@ -40,6 +40,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     private boolean terminated;
 
     private Thread thread;
+    private boolean hasStarted = false;
 
     private ServerSocket serverSocket = null;
     private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
@@ -98,6 +99,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         new HeartbeatThread(this);
         new ServerListenThread(serverSocket, this);
 
+        hasStarted = true;
+
         //You should handle interrupts in some way, so that the thread won't keep on forever if you exit the app.
         while (!terminated) {
             if (GameState.getPlayerHasLeftFlag()) {
@@ -146,8 +149,10 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             }
         }
         try {
-            for (ServerToClientThread serverToClientThread : serverToClientThreads) {
-                serverToClientThread.terminate();
+            synchronized (this){
+                for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+                    serverToClientThread.terminate();
+                }
             }
             serverSocket.close();
         } catch (IOException e) {
@@ -450,4 +455,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             );
         }
     }
+
+    public boolean hasStarted() {
+        return hasStarted;
+    }
 }

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -1,5 +1,14 @@
 package seng302.visualiser;
 
+import javafx.application.Platform;
+import javafx.util.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.*;
+import seng302.model.stream.packets.PacketType;
+import seng302.model.stream.packets.StreamPacket;
+import seng302.utilities.XMLParser;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,6 +51,8 @@ import seng302.visualiser.controllers.ViewManager;
  */
 public class ClientToServerThread implements Runnable {
 
+    private boolean isStarted = false;
+
     /**
      * Functional interface for receiving packets from client socket.
      */
@@ -117,6 +128,8 @@ public class ClientToServerThread implements Runnable {
      * variable is false.
      */
     public void run() {
+        isStarted = true;
+
         int sync1;
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
@@ -167,8 +180,10 @@ public class ClientToServerThread implements Runnable {
         notifyDisconnectListeners("Connection to server was terminated");
         closeSocket();
 
-        ViewManager.getInstance().goToStartView();
-        ViewManager.getInstance().showErrorSnackBar("Server rejected connection.");
+        Platform.runLater(() -> {
+            ViewManager.getInstance().showErrorSnackBar("Server rejected connection.");
+            ViewManager.getInstance().goToStartView();
+        });
     }
 
     public void sendCustomizationRequest(CustomizeRequestType reqType, byte[] payload) {
@@ -194,12 +209,6 @@ public class ClientToServerThread implements Runnable {
         if (connectionErrorListener != null){
             connectionErrorListener.notifyConnectionError(message);
         }
-
-        try {
-            this.socket.close();
-        } catch (IOException e) {
-            logger.error("Couldn't close socket");
-        }
     }
 
     /**
@@ -390,9 +399,9 @@ public class ClientToServerThread implements Runnable {
         }
         if (currentByte == -1) {
             notifyDisconnectListeners("Cannot read from server.");
-            closeSocket();
             logger.warn("InputStream reach end of stream", 1);
             handleConnectionError("Could not connect to server. Server is no longer available.");
+            closeSocket();
         }
         return currentByte;
     }
@@ -435,4 +444,8 @@ public class ClientToServerThread implements Runnable {
             ).getBuffer()
         );
     }
+
+    public boolean hasStarted() {
+        return isStarted;
+    }
 }

src/main/java/seng302/visualiser/GameClient.java

@@ -119,7 +119,7 @@ public class GameClient {
 
             getServerThread().setConnectionErrorListener((eMessage) -> {
                 ViewManager.getInstance().showErrorSnackBar(eMessage);
-                destroyClientToServerThread();
+                //destroyClientToServerThread();
             });
 
             this.lobbyController = ViewManager.getInstance().goToLobby(true);
@@ -147,18 +147,45 @@ public class GameClient {
 
         server = new MainServerThread();
 
+        while (!server.hasStarted()){
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
         try {
             startClientToServerThread(ipAddress, 4942);
         } catch (IOException e) {
             showConnectionError("Cannot connect to server as host");
         }
+
+        // Wait for C2S thread
+        while (!socketThread.hasStarted()){
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
         socketThread.sendXML(race, serverName, numLegs, maxPlayers, tokensEnabled);
-        while (regattaData == null){
+
+        int triesLeft = 15;
+
+        while (regattaData == null && triesLeft > 0){
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
+            triesLeft--;
+        }
+
+        if (triesLeft <= 0){
+            showConnectionError("Could not launch server");
+            return null;
         }
 
         this.lobbyController = ViewManager.getInstance().goToLobby(false);

src/main/java/seng302/visualiser/GameView3D.java

@@ -2,12 +2,12 @@ package seng302.visualiser;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
+import javafx.beans.value.ObservableValue;
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
 import javafx.scene.Camera;
@@ -24,7 +24,11 @@ import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 import org.fxyz3d.scene.Skybox;
 import seng302.gameServer.messages.RoundingSide;
-import seng302.model.*;
+import seng302.model.ClientYacht;
+import seng302.model.GameKeyBind;
+import seng302.model.KeyAction;
+import seng302.model.Limit;
+import seng302.model.ScaledPoint;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
@@ -66,6 +70,8 @@ public class GameView3D extends GameView{
     /* Note that if either of these is null then values for it have not been added and the other
        should be used as the limits of the map. */
     private Map<Mark, Marker3D> markerObjects;
+
+    private BoatObject playerBoat;
     private Map<ClientYacht, BoatObject> boatObjects = new HashMap<>();
     private Group wakesGroup = new Group();
     private Group boatObjectGroup = new Group();
@@ -331,9 +337,35 @@ public class GameView3D extends GameView{
                 ViewManager.getInstance().getGameClient().getServerThread().getClientId())) {
                 ((ChaseCamera) chaseCam).setPlayerBoat(newBoat);
                 ((TopDownCamera) topDownCam).setPlayerBoat(newBoat);
+
+                newBoat.setMarkIndicator(ModelFactory.importSTL("mark_pointer.stl"));
+                playerBoat = newBoat;
+
             }
         }
         Platform.runLater(() -> {
+            ClientYacht playerYacht = ViewManager.getInstance().getGameClient().getAllBoatsMap()
+                .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId());
+
+            for (ObservableValue o : Arrays
+                .asList(playerBoat.layoutXProperty(), playerBoat.layoutXProperty())) {
+                o.addListener((obs, oldVal, newVal) -> {
+
+                    List<Mark> marks = course.get(playerYacht.getLegNumber()).getMarks();
+                    Point2D midPoint = new Point2D(0, 0);
+                    if (marks.size() == 1) {
+                        midPoint = scaledPoint.findScaledXY(marks.get(0));
+                    } else if (marks.size() == 2) {
+                        midPoint = (scaledPoint.findScaledXY(marks.get(0)))
+                            .midpoint(scaledPoint.findScaledXY(marks.get(1)));
+                    }
+
+                    if (midPoint != null) {
+                        playerBoat.updateMarkIndicator(midPoint);
+                    }
+
+                });
+            }
             gameObjects.getChildren().addAll(wakes);
             gameObjects.getChildren().addAll(boatObjectGroup);
         });
@@ -529,4 +561,4 @@ public class GameView3D extends GameView{
             }
         }
     }
-}
+}

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

@@ -119,6 +119,12 @@ public class ServerCreationController implements Initializable {
             .runAsHost("localhost", 4941, serverName.getText(), (int) maxPlayersSlider
                 .getValue(), mapMaker.getCurrentRacePath(), (int) legsSlider.getValue(), pickupsCheckBox.isSelected());
 
+        if (serverDescription == null){
+            ViewManager.getInstance().getGameClient().getServerThread().closeSocket();
+            ViewManager.getInstance().getGameClient().stopGame();
+            return;
+        }
+
         ViewManager.getInstance().setProperty("serverName", serverDescription.getName());
         ViewManager.getInstance().setProperty("mapName", serverDescription.getMapName());
     }

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

@@ -4,10 +4,14 @@ import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
+import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.MeshView;
 import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
 
 /**
  * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2
@@ -30,9 +34,10 @@ public class BoatObject extends Group {
     private Color colour = Color.BLACK;
     private Boolean isSelected = false;
     private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
-//    private Rotate tilt = new Rotate(0, new Point3D(0, 1, 0));
-    private double previousRotation = 0;
 
+    // This stuff only matters to the players boat object.
+    private MeshView markIndicator;
+    private MeshView playerIndicator;
     private ReadOnlyDoubleWrapper rotationProperty;
 
     private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
@@ -81,6 +86,19 @@ public class BoatObject extends Group {
         });
     }
 
+    public void updateMarkIndicator(Point2D markPoint) {
+        Point2D boatLoc = new Point2D(this.getLayoutX(), this.getLayoutY());
+        Double angle = Math.toDegrees(
+            Math.atan2(boatLoc.getY() - markPoint.getY(), boatLoc.getX() - markPoint.getX())) - 90;
+
+        Double radius = 0.5;
+        markIndicator.getTransforms().clear();
+        markIndicator.getTransforms().addAll(
+            new Rotate(angle, new Point3D(0, 0, 1)),
+            new Translate(0, -radius, 0)
+        );
+    }
+
     private Double normalizeHeading(double heading, double windDirection) {
         Double normalizedHeading = heading - windDirection;
         normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
@@ -91,14 +109,6 @@ public class BoatObject extends Group {
     private void rotateTo(double heading, boolean sailsIn, double windDir) {
         rotationProperty.set(heading);
         rotation.setAngle(heading);
-//        if (heading == previousRotation) {
-//            tilt.setAngle(0);
-//        } else if (heading < previousRotation) {
-//            tilt.setAngle(-10);
-//        } else {
-//            tilt.setAngle(10);
-//        }
-//        previousRotation = heading;
         wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1)));
         if (sailsIn) {
             boatAssets.showSail();
@@ -128,6 +138,26 @@ public class BoatObject extends Group {
         }
     }
 
+    public void setMarkIndicator(MeshView indicator) {
+        this.markIndicator = indicator;
+        this.getChildren().add(markIndicator);
+        createPlayerIndicator();
+        setIndicatorColor();
+    }
+
+    private void createPlayerIndicator() {
+        MeshView torus = ModelFactory.importSTL("player_circle.stl");
+        playerIndicator = torus;
+        this.getChildren().add(torus);
+    }
+
+    public void setIndicatorColor() {
+        Platform.runLater(() -> {
+            markIndicator.setMaterial(new PhongMaterial(Color.DARKORANGE));
+            playerIndicator.setMaterial(new PhongMaterial(colour));
+        });
+    }
+
     public Group getWake () {
         return wake;
     }

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

@@ -115,9 +115,9 @@ public class ModelFactory {
     private static Group getUnmodifiedBoatModel(BoatMeshType boatType, Color primaryColour) {
 
         Group boatAssets = new Group();
-        MeshView hull = importSTL(boatType.hullFile);
+        MeshView hull = importBoatSTL(boatType.hullFile);
         hull.setMaterial(new PhongMaterial(primaryColour));
-        MeshView sail = importSTL(boatType.sailFile);
+        MeshView sail = importBoatSTL(boatType.sailFile);
         sail.setMaterial(
             new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
         );
@@ -125,13 +125,13 @@ public class ModelFactory {
         boatAssets.getChildren().addAll(hull, sail);
 
         if (boatType.mastFile != null) {
-            MeshView mast = importSTL(boatType.mastFile);
+            MeshView mast = importBoatSTL(boatType.mastFile);
             mast.setMaterial(new PhongMaterial(primaryColour));
             boatAssets.getChildren().add(mast);
         }
 
         if (boatType.jibFile != null) {
-            MeshView jib = importSTL(boatType.jibFile);
+            MeshView jib = importBoatSTL(boatType.jibFile);
             sail.setMaterial(
                 new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
             );
@@ -141,9 +141,13 @@ public class ModelFactory {
         return boatAssets;
     }
 
-    private static MeshView importSTL(String fileName) {
+    private static MeshView importBoatSTL(String fileName) {
+        return importSTL("boatSTLs/" + fileName);
+    }
+
+    public static MeshView importSTL(String fileName) {
         StlMeshImporter importer = new StlMeshImporter();
-        importer.read(ModelFactory.class.getResource("/meshes/boatSTLs/" + fileName));
+        importer.read(ModelFactory.class.getResource("/meshes/" + fileName));
         MeshView importedFile = new MeshView(importer.getImport());
         importedFile.setCache(true);
         importedFile.setCacheHint(CacheHint.SCALE_AND_ROTATE);
@@ -162,6 +166,10 @@ public class ModelFactory {
             assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         }
         switch (tokenType) {
+            case PLAYER_IDENTIFIER_TORUS:
+                return makeIdentifierTorus(assets);
+            case NEXT_MARK_INDICATOR:
+                return makeNextMarkIndicator(assets);
             case VELOCITY_PICKUP:
             case BUMPER_PICKUP:
             case RANDOM_PICKUP:
@@ -196,6 +204,16 @@ public class ModelFactory {
         }
     }
 
+    private static Model makeIdentifierTorus(Group assets) {
+//        assets.getChildren().add(new AmbientLight());
+        return new Model(new Group(assets), null);
+    }
+
+    private static Model makeNextMarkIndicator(Group assets) {
+//        assets.getChildren().add(new AmbientLight());
+        return new Model(new Group(assets), null);
+    }
+
     private static Model makeTokenPickup(Group assets) {
         Rotate animationRotate = new Rotate(0, new Point3D(0, 0, 1));
         assets.getTransforms().addAll(

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

@@ -28,7 +28,9 @@ public enum ModelType {
     START_ARROW ("start_arrow.dae"),
     FINISH_ARROW ("finish_arrow.dae"),
     LAND("land.dae"),
-    LAND_SMOOTH("land_smooth.dae");
+    LAND_SMOOTH("land_smooth.dae"),
+    NEXT_MARK_INDICATOR("indicator_arrow.dae"),
+    PLAYER_IDENTIFIER_TORUS("torus.dae");
 
     final String filename;
 

src/main/resources/meshes/indicator_arrow.dae

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.79.0 commit date:2017-09-11, commit time:10:43, hash:5bd8ac9</authoring_tool>
+    </contributor>
+    <created>2017-09-28T01:59:46</created>
+    <modified>2017-09-28T01:59:46</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0 0.3215737 0.002428917 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.1614584 0.1614584 0.1614584 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001-material" name="Material_001">
+      <instance_effect url="#Material_001-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Cone-mesh" name="Cone">
+      <mesh>
+        <source id="Cone-mesh-positions">
+          <float_array id="Cone-mesh-positions-array" count="99">0 1 -1 0 0 1 0.1950902 0.9807853 -1 0.3826835 0.9238795 -1 0.5555703 0.8314696 -1 0.7071068 0.7071068 -1 0.8314697 0.5555702 -1 0.9238795 0.3826834 -1 0.9807853 0.1950902 -1 1 0 -1 0.9807853 -0.1950902 -1 0.9238796 -0.3826833 -1 0.8314697 -0.5555702 -1 0.7071068 -0.7071068 -1 0.5555702 -0.8314697 -1 0.3826833 -0.9238796 -1 0.1950901 -0.9807853 -1 -3.25841e-7 -1 -1 -0.1950907 -0.9807852 -1 -0.3826839 -0.9238793 -1 -0.5555707 -0.8314693 -1 -0.7071073 -0.7071064 -1 -0.83147 -0.5555697 -1 -0.9238799 -0.3826827 -1 -0.9807854 -0.1950893 -1 -1 9.65599e-7 -1 -0.9807851 0.1950913 -1 -0.9238791 0.3826845 -1 -0.8314689 0.5555713 -1 -0.7071059 0.7071077 -1 -0.5555691 0.8314704 -1 -0.3826821 0.9238801 -1 -0.1950888 0.9807856 -1</float_array>
+          <technique_common>
+            <accessor source="#Cone-mesh-positions-array" count="33" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cone-mesh-normals">
+          <float_array id="Cone-mesh-normals-array" count="117">0.08775347 0.8909768 0.4454884 0.2598883 0.8567371 0.4454883 0.4220357 0.7895733 0.4454883 0.5679644 0.6920669 0.4454883 0.6920669 0.5679644 0.4454883 0.7895736 0.4220353 0.4454883 0.8567369 0.2598885 0.4454883 0.8909768 0.08775347 0.4454884 0.8909768 -0.08775347 0.4454884 0.8567371 -0.2598881 0.4454883 0.7895734 -0.4220355 0.4454884 0.6920669 -0.5679644 0.4454883 0.5679644 -0.6920669 0.4454883 0.4220356 -0.7895734 0.4454883 0.2598879 -0.8567371 0.4454885 0.08775335 -0.8909768 0.4454884 -0.08775389 -0.8909767 0.4454883 -0.2598887 -0.8567368 0.4454883 -0.4220361 -0.7895731 0.4454884 -0.5679646 -0.6920668 0.4454883 -0.6920675 -0.5679637 0.4454884 -0.7895734 -0.4220355 0.4454884 -0.8567374 -0.2598869 0.4454883 -0.8909769 -0.08775287 0.4454884 -0.8909766 0.08775418 0.4454883 -0.8567367 0.2598895 0.4454884 -0.7895728 0.4220367 0.4454883 -0.6920663 0.5679652 0.4454883 -0.5679636 0.6920676 0.4454884 -0.4220345 0.789574 0.4454885 -0.259887 0.8567373 0.4454883 -0.08775269 0.8909768 0.4454884 0 0 -1 -3.97508e-6 0 -1 3.97512e-6 0 -1 3.88859e-7 0 -1 -1.36853e-6 0 -1 1.36853e-6 0 -1 -3.88857e-7 0 -1</float_array>
+          <technique_common>
+            <accessor source="#Cone-mesh-normals-array" count="39" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Cone-mesh-vertices">
+          <input semantic="POSITION" source="#Cone-mesh-positions"/>
+        </vertices>
+        <triangles material="Material_001-material" count="62">
+          <input semantic="VERTEX" source="#Cone-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Cone-mesh-normals" offset="1"/>
+          <p>0 0 1 0 2 0 2 1 1 1 3 1 3 2 1 2 4 2 4 3 1 3 5 3 5 4 1 4 6 4 6 5 1 5 7 5 7 6 1 6 8 6 8 7 1 7 9 7 9 8 1 8 10 8 10 9 1 9 11 9 11 10 1 10 12 10 12 11 1 11 13 11 13 12 1 12 14 12 14 13 1 13 15 13 15 14 1 14 16 14 16 15 1 15 17 15 17 16 1 16 18 16 18 17 1 17 19 17 19 18 1 18 20 18 20 19 1 19 21 19 21 20 1 20 22 20 22 21 1 21 23 21 23 22 1 22 24 22 24 23 1 23 25 23 25 24 1 24 26 24 26 25 1 25 27 25 27 26 1 26 28 26 28 27 1 27 29 27 29 28 1 28 30 28 30 29 1 29 31 29 31 30 1 30 32 30 32 31 1 31 0 31 16 32 24 32 8 32 32 32 0 32 2 32 2 32 3 32 4 32 4 32 5 32 6 32 6 32 7 32 4 32 8 32 9 32 10 32 10 32 11 32 8 32 12 32 13 32 16 32 14 32 15 32 16 32 16 32 17 32 18 32 18 32 19 32 20 32 20 32 21 32 22 32 22 33 23 33 24 33 24 34 25 34 26 34 26 32 27 32 28 32 28 32 29 32 32 32 30 32 31 32 32 32 32 35 2 35 8 35 4 36 7 36 8 36 8 37 11 37 12 37 13 32 14 32 16 32 16 32 18 32 24 32 20 32 22 32 24 32 24 38 26 38 32 38 29 32 30 32 32 32 2 32 4 32 8 32 8 32 12 32 16 32 18 32 20 32 24 32 26 32 28 32 32 32 32 32 8 32 24 32</p>
+        </triangles>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Cone" name="Cone" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 1.015816 0 0 0 1</matrix>
+        <instance_geometry url="#Cone-mesh" name="Cone">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001-material" target="#Material_001-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>