diff --git a/src/main/java/seng302/utilities/GeoUtility.java b/src/main/java/seng302/utilities/GeoUtility.java index 1c8c2d21..bd183e87 100644 --- a/src/main/java/seng302/utilities/GeoUtility.java +++ b/src/main/java/seng302/utilities/GeoUtility.java @@ -6,6 +6,7 @@ import seng302.model.GeoPoint; public class GeoUtility { private static double EARTH_RADIUS = 6378.137; +// private static double EARTH_RADIUS = 6378.13712121212121212121212121212121212121; private static Double MS_TO_KNOTS = 1.943844492; /** diff --git a/src/main/java/seng302/visualiser/GameView3D.java b/src/main/java/seng302/visualiser/GameView3D.java index dfb9fb59..1b934b63 100644 --- a/src/main/java/seng302/visualiser/GameView3D.java +++ b/src/main/java/seng302/visualiser/GameView3D.java @@ -13,6 +13,8 @@ import javafx.scene.*; import javafx.scene.image.ImageView; import javafx.scene.input.KeyEvent; import javafx.scene.paint.Color; +import javafx.scene.paint.PhongMaterial; +import javafx.scene.shape.Sphere; import javafx.scene.text.Text; import javafx.scene.transform.Rotate; import javafx.scene.transform.Scale; @@ -126,9 +128,35 @@ public class GameView3D { camera.getTransforms().add(new Rotate(30, new Point3D(1,0,0))); // gameObjects.getChildren().addAll(raceBorder, markers, tokens); + Sphere red = new Sphere(1); + red.setMaterial(new PhongMaterial(Color.RED)); + red.setLayoutX(0); + red.setLayoutY(0); + + Sphere blue = new Sphere(1); + blue.setMaterial(new PhongMaterial(Color.BLUE)); + blue.setLayoutX(1); + blue.setLayoutY(0); + + Sphere green = new Sphere(1); + green.setMaterial(new PhongMaterial(Color.GREEN)); + green.setLayoutX(-.5); + green.setLayoutY(0); + + Sphere white = new Sphere(1); + white.setMaterial(new PhongMaterial(Color.WHITE)); + white.setLayoutX(-.25); + white.setLayoutY(0); + + Sphere black = new Sphere(1); + black.setMaterial(new PhongMaterial(Color.BLACK)); + black.setLayoutX(-.125); + black.setLayoutY(0); + gameObjects.getChildren().addAll( ModelFactory.importModel(ModelType.OCEAN).getAssets(), - raceBorder, markers, tokens + raceBorder, markers, tokens, + white, blue, green, black, red ); // Sphere s = new Sphere(1); @@ -281,9 +309,9 @@ public class GameView3D { Math.toDegrees( Math.atan2(m2Location.getY() - m1Location.getY(), m2Location.getX() - m1Location.getX()) ) + 90, - new Point3D(0,1,0) + new Point3D(0,0,1) ), - new Scale(1, 1, m1Location.distance(m2Location) / 10) + new Scale(1, m1Location.distance(m2Location) / 10, 1) ); Point2D midPoint = m2Location.midpoint(m1Location); @@ -411,28 +439,20 @@ public class GameView3D { minLatPoint, new GeoPoint(unscaledLat, unscaledLon) ); if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) { - xAxisLocation += Math - .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); - yAxisLocation -= Math - .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); + xAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference; + yAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference; } else if (angleFromReference >= 0) { angleFromReference = angleFromReference - Math.PI / 2; - xAxisLocation += Math - .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); - yAxisLocation += Math - .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); + xAxisLocation += distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference; + yAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference; } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) { angleFromReference = Math.abs(angleFromReference); - xAxisLocation -= Math - .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); - yAxisLocation -= Math - .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); + xAxisLocation -= distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference; + yAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference; } else { angleFromReference = Math.abs(angleFromReference) - Math.PI / 2; - xAxisLocation -= Math - .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); - yAxisLocation += Math - .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); + xAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference; + yAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference; } if (horizontalInversion) { xAxisLocation = canvasWidth - bufferSize - (xAxisLocation - bufferSize); @@ -502,8 +522,8 @@ public class GameView3D { newBoat.setFill(colour); boatObjects.put(clientYacht, newBoat); // createAndBindAnnotationBox(clientYacht, colour); -// wakesGroup.getChildren().add(newBoat.getWake()); -// wakes.add(newBoat.getWake()); + wakesGroup.getChildren().add(newBoat.getWake()); + wakes.add(newBoat.getWake()); boatObjectGroup.getChildren().add(newBoat); // trails.getChildren().add(newBoat.getTrail()); @@ -521,9 +541,10 @@ public class GameView3D { } // annotationsGroup.getChildren().addAll(annotations.values()); Platform.runLater(() -> { - gameObjects.getChildren().addAll(boatObjectGroup); + // gameObjects.addAll(trails); -// gameObjects.addAll(wakes); + gameObjects.getChildren().addAll(wakes); + gameObjects.getChildren().addAll(boatObjectGroup); // gameObjects.addAll(annotationsGroup); // gameObjects.addAll(boatObjectGroup); }); @@ -564,7 +585,7 @@ public class GameView3D { Math.toDegrees( Math.atan2(location.getY() - lastLocation.getY(), location.getX() - lastLocation.getX()) ), - new Point3D(0,1,0) + new Point3D(0,0,1) ), new Scale((lastLocation.distance(location) / 15)-0.2, 1, 1) ); @@ -586,7 +607,7 @@ public class GameView3D { Math.toDegrees( Math.atan2(lastLocation.getY() - firstLocation.getY(), lastLocation.getX() - firstLocation.getX()) ), - new Point3D(0,1,0) + new Point3D(0,0,1) ), new Scale((firstLocation.distance(lastLocation) / 15)-0.2, 1, 1) ); diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_2D/BoatObject.java b/src/main/java/seng302/visualiser/fxObjects/assets_2D/BoatObject.java index d4e450bf..d98b3f81 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_2D/BoatObject.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_2D/BoatObject.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import javafx.application.Platform; import javafx.geometry.Point2D; +import javafx.geometry.Point3D; import javafx.scene.AmbientLight; import javafx.scene.Group; import javafx.scene.Node; @@ -20,6 +21,7 @@ import javafx.scene.transform.Translate; import seng302.visualiser.fxObjects.assets_3D.BoatMeshType; import seng302.visualiser.fxObjects.assets_3D.BoatModel; import seng302.visualiser.fxObjects.assets_3D.ModelFactory; +import seng302.visualiser.fxObjects.assets_3D.ModelType; /** * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2 @@ -61,7 +63,7 @@ public class BoatObject extends Group { // private Polygon boatPoly; private BoatModel boatPoly; private Polygon sail; - private Wake wake; + private Group wake; private Line leftLayLine; private Line rightLayline; private double distanceTravelled, lastRotation; @@ -133,8 +135,8 @@ public class BoatObject extends Group { rightLayline = new Line(); trail.getStrokeDashArray().setAll(5d, 10d); trail.setCache(true); - wake = new Wake(0, -BOAT_HEIGHT); - wake.setVisible(true); + + wake = ModelFactory.importModel(ModelType.WAKE).getAssets(); sail = new Polygon(0.0,BOAT_HEIGHT / 4, 0.0, BOAT_HEIGHT); @@ -162,7 +164,7 @@ public class BoatObject extends Group { // super.getChildren().add(pointLight); AmbientLight light = new AmbientLight(new Color(0.5,0.5,0.5,1)); super.getChildren().add(light); - super.getChildren().addAll(boatPoly.getAssets());//, sail); + super.getChildren().addAll(boatPoly.getAssets()); } public void setFill (Color value) { @@ -229,8 +231,8 @@ public class BoatObject extends Group { // sail.setLayoutX(x); // sail.setLayoutY(y); // } -// wake.setLayoutX(x); -// wake.setLayoutY(y); + wake.setLayoutX(x); + wake.setLayoutY(y); }); // wake.setRotation(rotation, velocity); // rotateTo(rotation); @@ -262,6 +264,7 @@ public class BoatObject extends Group { private void rotateTo(double heading, boolean sailsIn, double windDir) { rotation.setAngle(heading); + wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1))); if (!sailsIn) { boatPoly.showSail(); Double sailWindOffset = 30.0; @@ -270,19 +273,19 @@ public class BoatObject extends Group { Double normalizedHeading = normalizeHeading(heading, windDir); if (normalizedHeading < 180) { if (normalizedHeading < sailWindOffset + upwindAngleLimit){ - boatPoly.rotateSail(heading + 90 - upwindAngleLimit); + boatPoly.rotateSail(90 - upwindAngleLimit); } else if (normalizedHeading > 90 + sailWindOffset){ - boatPoly.rotateSail(heading + downwindAngleLimit); + boatPoly.rotateSail(downwindAngleLimit); } else { - boatPoly.rotateSail(windDir + 90 + sailWindOffset); + boatPoly.rotateSail(90 + sailWindOffset); } } else { if (normalizedHeading > 360 - (sailWindOffset + upwindAngleLimit)){ - boatPoly.rotateSail(heading + 90 + upwindAngleLimit); + boatPoly.rotateSail(90 + upwindAngleLimit); } else if (normalizedHeading < 270 - sailWindOffset){ - boatPoly.rotateSail(heading + 180 - downwindAngleLimit); + boatPoly.rotateSail(180 - downwindAngleLimit); } else { - boatPoly.rotateSail(windDir + 90 - sailWindOffset); + boatPoly.rotateSail(90 - sailWindOffset); } } } else { @@ -447,7 +450,7 @@ public class BoatObject extends Group { } public void setTrajectory(double heading, double velocity, double windDir) { - wake.setRotation(lastHeading - heading, velocity); +// wake.r(lastHeading - heading, velocity); // rotateTo(heading, false, windDir); xVelocity = Math.cos(Math.toRadians(heading)) * velocity; yVelocity = Math.sin(Math.toRadians(heading)) * velocity; 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 cadb5bbf..a5510d10 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java @@ -104,8 +104,10 @@ public class ModelFactory { case START_LINE: case GATE_LINE: return makeGate(assets); + case WAKE: + return makeWake(assets); default: - return new Model(assets, null); + return new Model(new Group(assets), null); } } @@ -118,7 +120,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; @@ -137,14 +139,14 @@ 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); + Circle ocean = new Circle(0,0,1000, Color.DARKSEAGREEN); ocean.setStroke(Color.TRANSPARENT); group.getChildren().add(ocean); return new Model(group, null); @@ -155,13 +157,22 @@ 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); } } diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java index 963a78fa..f8a4f75c 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java @@ -16,7 +16,8 @@ public enum ModelType { BORDER_BARRIER ("barrier_segment.dae"), FINISH_LINE ("finish_line.dae"), START_LINE ("start_line.dae"), - GATE_LINE ("gate_line.dae"); + GATE_LINE ("gate_line.dae"), + WAKE ("wake.dae"); final String filename; diff --git a/src/main/resources/meshes/finish_line.dae b/src/main/resources/meshes/finish_line.dae index 9dfbb0d6..29383c6a 100644 --- a/src/main/resources/meshes/finish_line.dae +++ b/src/main/resources/meshes/finish_line.dae @@ -3,10 +3,10 @@ Blender User - Blender 2.78.0 commit date:2017-02-24, commit time:14:33, hash:e92f235283 + Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22 - 2017-09-11T02:11:56 - 2017-09-11T02:11:56 + 2017-09-11T10:59:51 + 2017-09-11T10:59:51 Z_UP @@ -26,7 +26,7 @@ 0.64 0 0.01304383 1 - 0.5 0.5 0.5 1 + 0 0 0 1 50 @@ -48,7 +48,7 @@ - -1 1 0 1 1 0 -1 0 0 1 0 0 -1 -0.5 0 1 0.5 0 -1 0.5 0 1 -0.5 0 -1 -0.75 0 1 0.75 0 -1 0.25 0 1 -0.25 0 -1 -0.25 0 1 0.25 0 -1 0.75 0 1 -0.75 0 -1 -0.875 0 1 0.875 0 -1 0.125 0 1 -0.125 0 -1 -0.375 0 1 0.375 0 -1 0.625 0 1 -0.625 0 -1 -0.625 0 1 0.625 0 -1 0.375 0 1 -0.375 0 -1 -0.125 0 1 0.125 0 -1 0.875 0 1 -0.875 0 1 0.875 0.04037594 1 1 0.04037594 -1 1 0.04037594 1 -0.125 0.04037594 1 0 0.04037594 -1 0 0.04037594 1 0.375 0.04037594 1 0.5 0.04037594 1 -0.625 0.04037594 1 -0.5 0.04037594 -1 -0.5 0.04037594 -1 0.5 0.04037594 1 0.625 0.04037594 1 0.75 0.04037594 1 -0.375 0.04037594 1 -0.25 0.04037594 1 0.125 0.04037594 1 0.25 0.04037594 1 -0.875 0.04037594 1 -0.75 0.04037594 -1 0.25 0.04037594 -1 -0.75 0.04037594 -1 -0.25 0.04037594 -1 0.75 0.04037594 -1 -0.875 0.04037594 -1 0.125 0.04037594 -1 -0.375 0.04037594 -1 0.625 0.04037594 -1 -0.625 0.04037594 -1 0.375 0.04037594 -1 -0.125 0.04037594 -1 0.875 0.04037594 + -1 1 0 1 1 0 -1 0 0 1 0 0 -1 -0.5 0 1 0.5 0 -1 0.5 0 1 -0.5 0 -1 -0.75 0 1 0.75 0 -1 0.25 0 1 -0.25 0 -1 -0.25 0 1 0.25 0 -1 0.75 0 1 -0.75 0 -1 -0.875 0 1 0.875 0 -1 0.125 0 1 -0.125 0 -1 -0.375 0 1 0.375 0 -1 0.625 0 1 -0.625 0 -1 -0.625 0 1 0.625 0 -1 0.375 0 1 -0.375 0 -1 -0.125 0 1 0.125 0 -1 0.875 0 1 -0.875 0 1 0.875 0.04037588 1 1 0.04037588 -1 1 0.04037588 1 -0.125 0.04037588 1 0 0.04037588 -1 0 0.04037588 1 0.375 0.04037588 1 0.5 0.04037588 1 -0.625 0.04037588 1 -0.5 0.04037588 -1 -0.5 0.04037588 -1 0.5 0.04037588 1 0.625 0.04037588 1 0.75 0.04037588 1 -0.375 0.04037588 1 -0.25 0.04037588 1 0.125 0.04037588 1 0.25 0.04037588 1 -0.875 0.04037588 1 -0.75 0.04037588 -1 0.25 0.04037588 -1 -0.75 0.04037588 -1 -0.25 0.04037588 -1 0.75 0.04037588 -1 -0.875 0.04037588 -1 0.125 0.04037588 -1 -0.375 0.04037588 -1 0.625 0.04037588 -1 -0.625 0.04037588 -1 0.375 0.04037588 -1 -0.125 0.04037588 -1 0.875 0.04037588 diff --git a/src/main/resources/meshes/gate_line.dae b/src/main/resources/meshes/gate_line.dae index f004a1bf..8f5337ff 100644 --- a/src/main/resources/meshes/gate_line.dae +++ b/src/main/resources/meshes/gate_line.dae @@ -3,16 +3,16 @@ Blender User - Blender 2.78.0 commit date:2017-02-24, commit time:14:33, hash:e92f235283 + Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22 - 2017-09-11T02:18:04 - 2017-09-11T02:18:04 + 2017-09-11T11:00:38 + 2017-09-11T11:00:38 Z_UP - + @@ -26,7 +26,7 @@ 0.09194811 0.08404596 0.08642986 1 - 0.5 0.5 0.5 1 + 0 0 0 1 50 @@ -40,39 +40,39 @@ - - + + - + - - -1 1 0 1 1 0 -1 0 0 1 0 0 -1 -0.5 0 1 0.5 0 -1 0.5 0 1 -0.5 0 -1 -0.75 0 1 0.75 0 -1 0.25 0 1 -0.25 0 -1 -0.25 0 1 0.25 0 -1 0.75 0 1 -0.75 0 -1 -0.875 0 1 0.875 0 -1 0.125 0 1 -0.125 0 -1 -0.375 0 1 0.375 0 -1 0.625 0 1 -0.625 0 -1 -0.625 0 1 0.625 0 -1 0.375 0 1 -0.375 0 -1 -0.125 0 1 0.125 0 -1 0.875 0 1 -0.875 0 1 0.875 0.04037594 1 1 0.04037594 -1 1 0.04037594 1 -0.125 0.04037594 1 0 0.04037594 -1 0 0.04037594 1 0.375 0.04037594 1 0.5 0.04037594 1 -0.625 0.04037594 1 -0.5 0.04037594 -1 -0.5 0.04037594 -1 0.5 0.04037594 1 0.625 0.04037594 1 0.75 0.04037594 1 -0.375 0.04037594 1 -0.25 0.04037594 1 0.125 0.04037594 1 0.25 0.04037594 1 -0.875 0.04037594 1 -0.75 0.04037594 -1 0.25 0.04037594 -1 -0.75 0.04037594 -1 -0.25 0.04037594 -1 0.75 0.04037594 -1 -0.875 0.04037594 -1 0.125 0.04037594 -1 -0.375 0.04037594 -1 0.625 0.04037594 -1 -0.625 0.04037594 -1 0.375 0.04037594 -1 -0.125 0.04037594 -1 0.875 0.04037594 + + -1 1 0 1 1 0 -1 0 0 1 0 0 -1 -0.5 0 1 0.5 0 -1 0.5 0 1 -0.5 0 -1 -0.75 0 1 0.75 0 -1 0.25 0 1 -0.25 0 -1 -0.25 0 1 0.25 0 -1 0.75 0 1 -0.75 0 -1 -0.875 0 1 0.875 0 -1 0.125 0 1 -0.125 0 -1 -0.375 0 1 0.375 0 -1 0.625 0 1 -0.625 0 -1 -0.625 0 1 0.625 0 -1 0.375 0 1 -0.375 0 -1 -0.125 0 1 0.125 0 -1 0.875 0 1 -0.875 0 1 0.875 0.04037588 1 1 0.04037588 -1 1 0.04037588 1 -0.125 0.04037588 1 0 0.04037588 -1 0 0.04037588 1 0.375 0.04037588 1 0.5 0.04037588 1 -0.625 0.04037588 1 -0.5 0.04037588 -1 -0.5 0.04037588 -1 0.5 0.04037588 1 0.625 0.04037588 1 0.75 0.04037588 1 -0.375 0.04037588 1 -0.25 0.04037588 1 0.125 0.04037588 1 0.25 0.04037588 1 -0.875 0.04037588 1 -0.75 0.04037588 -1 0.25 0.04037588 -1 -0.75 0.04037588 -1 -0.25 0.04037588 -1 0.75 0.04037588 -1 -0.875 0.04037588 -1 0.125 0.04037588 -1 -0.375 0.04037588 -1 0.625 0.04037588 -1 -0.625 0.04037588 -1 0.375 0.04037588 -1 -0.125 0.04037588 -1 0.875 0.04037588 - + - - 0 0 -1 0 0 1 0 -1 0 0 1 0 1 0 0 -1 0 0 + + 0 0 -1 0 0 1 0 -1 0 0 1 0 1 0 0 -1 0 0 - + - - + + - - - + + + 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3

0 0 17 0 30 0 2 0 19 0 28 0 4 0 23 0 24 0 6 0 21 0 26 0 10 0 29 0 18 0 8 0 31 0 16 0 12 0 27 0 20 0 14 0 25 0 22 0 32 1 34 1 63 1 35 1 37 1 62 1 40 1 42 1 60 1 38 1 43 1 61 1 48 1 52 1 57 1 50 1 53 1 56 1 46 1 54 1 58 1 44 1 55 1 59 1 27 2 58 2 20 2 10 3 49 3 13 3 31 2 56 2 16 2 8 3 51 3 15 3 1 4 32 4 17 4 29 2 57 2 18 2 12 3 47 3 11 3 0 3 33 3 1 3 21 2 61 2 26 2 14 3 45 3 9 3 3 4 35 4 19 4 23 2 60 2 24 2 16 5 53 5 8 5 2 3 36 3 3 3 19 2 62 2 28 2 18 5 52 5 10 5 5 4 38 4 21 4 17 2 63 2 30 2 20 5 54 5 12 5 7 4 40 4 23 4 22 5 55 5 14 5 4 3 41 3 7 3 24 5 42 5 4 5 6 3 39 3 5 3 26 5 43 5 6 5 9 4 44 4 25 4 28 5 37 5 2 5 11 4 46 4 27 4 30 5 34 5 0 5 13 4 48 4 29 4 25 2 59 2 22 2 15 4 50 4 31 4 0 0 1 0 17 0 2 0 3 0 19 0 4 0 7 0 23 0 6 0 5 0 21 0 10 0 13 0 29 0 8 0 15 0 31 0 12 0 11 0 27 0 14 0 9 0 25 0 32 1 33 1 34 1 35 1 36 1 37 1 40 1 41 1 42 1 38 1 39 1 43 1 48 1 49 1 52 1 50 1 51 1 53 1 46 1 47 1 54 1 44 1 45 1 55 1 27 2 46 2 58 2 10 3 52 3 49 3 31 2 50 2 56 2 8 3 53 3 51 3 1 4 33 4 32 4 29 2 48 2 57 2 12 3 54 3 47 3 0 3 34 3 33 3 21 2 38 2 61 2 14 3 55 3 45 3 3 4 36 4 35 4 23 2 40 2 60 2 16 5 56 5 53 5 2 3 37 3 36 3 19 2 35 2 62 2 18 5 57 5 52 5 5 4 39 4 38 4 17 2 32 2 63 2 20 5 58 5 54 5 7 4 41 4 40 4 22 5 59 5 55 5 4 3 42 3 41 3 24 5 60 5 42 5 6 3 43 3 39 3 26 5 61 5 43 5 9 4 45 4 44 4 28 5 62 5 37 5 11 4 47 4 46 4 30 5 63 5 34 5 13 4 49 4 48 4 25 2 44 2 59 2 15 4 51 4 50 4

 @@ -84,10 +84,10 @@ 0.125 0 0 0 0 5.333333 0 -0.3333333 0 0 1 0.01986987 0 0 0 1 - + - + diff --git a/src/main/resources/meshes/start_line.dae b/src/main/resources/meshes/start_line.dae index fad375c3..83a4282a 100644 --- a/src/main/resources/meshes/start_line.dae +++ b/src/main/resources/meshes/start_line.dae @@ -3,16 +3,16 @@ Blender User - Blender 2.78.0 commit date:2017-02-24, commit time:14:33, hash:e92f235283 + Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22 - 2017-09-11T02:12:19 - 2017-09-11T02:12:19 + 2017-09-11T11:00:07 + 2017-09-11T11:00:07 Z_UP - + @@ -26,7 +26,7 @@ 0 0.2611 7.78272e-5 1 - 0.5 0.5 0.5 1 + 0 0 0 1 50 @@ -40,39 +40,39 @@ - - + + - + - - -1 1 0 1 1 0 -1 0 0 1 0 0 -1 -0.5 0 1 0.5 0 -1 0.5 0 1 -0.5 0 -1 -0.75 0 1 0.75 0 -1 0.25 0 1 -0.25 0 -1 -0.25 0 1 0.25 0 -1 0.75 0 1 -0.75 0 -1 -0.875 0 1 0.875 0 -1 0.125 0 1 -0.125 0 -1 -0.375 0 1 0.375 0 -1 0.625 0 1 -0.625 0 -1 -0.625 0 1 0.625 0 -1 0.375 0 1 -0.375 0 -1 -0.125 0 1 0.125 0 -1 0.875 0 1 -0.875 0 1 0.875 0.04037594 1 1 0.04037594 -1 1 0.04037594 1 -0.125 0.04037594 1 0 0.04037594 -1 0 0.04037594 1 0.375 0.04037594 1 0.5 0.04037594 1 -0.625 0.04037594 1 -0.5 0.04037594 -1 -0.5 0.04037594 -1 0.5 0.04037594 1 0.625 0.04037594 1 0.75 0.04037594 1 -0.375 0.04037594 1 -0.25 0.04037594 1 0.125 0.04037594 1 0.25 0.04037594 1 -0.875 0.04037594 1 -0.75 0.04037594 -1 0.25 0.04037594 -1 -0.75 0.04037594 -1 -0.25 0.04037594 -1 0.75 0.04037594 -1 -0.875 0.04037594 -1 0.125 0.04037594 -1 -0.375 0.04037594 -1 0.625 0.04037594 -1 -0.625 0.04037594 -1 0.375 0.04037594 -1 -0.125 0.04037594 -1 0.875 0.04037594 + + -1 1 0 1 1 0 -1 0 0 1 0 0 -1 -0.5 0 1 0.5 0 -1 0.5 0 1 -0.5 0 -1 -0.75 0 1 0.75 0 -1 0.25 0 1 -0.25 0 -1 -0.25 0 1 0.25 0 -1 0.75 0 1 -0.75 0 -1 -0.875 0 1 0.875 0 -1 0.125 0 1 -0.125 0 -1 -0.375 0 1 0.375 0 -1 0.625 0 1 -0.625 0 -1 -0.625 0 1 0.625 0 -1 0.375 0 1 -0.375 0 -1 -0.125 0 1 0.125 0 -1 0.875 0 1 -0.875 0 1 0.875 0.04037588 1 1 0.04037588 -1 1 0.04037588 1 -0.125 0.04037588 1 0 0.04037588 -1 0 0.04037588 1 0.375 0.04037588 1 0.5 0.04037588 1 -0.625 0.04037588 1 -0.5 0.04037588 -1 -0.5 0.04037588 -1 0.5 0.04037588 1 0.625 0.04037588 1 0.75 0.04037588 1 -0.375 0.04037588 1 -0.25 0.04037588 1 0.125 0.04037588 1 0.25 0.04037588 1 -0.875 0.04037588 1 -0.75 0.04037588 -1 0.25 0.04037588 -1 -0.75 0.04037588 -1 -0.25 0.04037588 -1 0.75 0.04037588 -1 -0.875 0.04037588 -1 0.125 0.04037588 -1 -0.375 0.04037588 -1 0.625 0.04037588 -1 -0.625 0.04037588 -1 0.375 0.04037588 -1 -0.125 0.04037588 -1 0.875 0.04037588 - + - - 0 0 -1 0 0 1 0 -1 0 0 1 0 1 0 0 -1 0 0 + + 0 0 -1 0 0 1 0 -1 0 0 1 0 1 0 0 -1 0 0 - + - - + + - - - + + + 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3

0 0 17 0 30 0 2 0 19 0 28 0 4 0 23 0 24 0 6 0 21 0 26 0 10 0 29 0 18 0 8 0 31 0 16 0 12 0 27 0 20 0 14 0 25 0 22 0 32 1 34 1 63 1 35 1 37 1 62 1 40 1 42 1 60 1 38 1 43 1 61 1 48 1 52 1 57 1 50 1 53 1 56 1 46 1 54 1 58 1 44 1 55 1 59 1 27 2 58 2 20 2 10 3 49 3 13 3 31 2 56 2 16 2 8 3 51 3 15 3 1 4 32 4 17 4 29 2 57 2 18 2 12 3 47 3 11 3 0 3 33 3 1 3 21 2 61 2 26 2 14 3 45 3 9 3 3 4 35 4 19 4 23 2 60 2 24 2 16 5 53 5 8 5 2 3 36 3 3 3 19 2 62 2 28 2 18 5 52 5 10 5 5 4 38 4 21 4 17 2 63 2 30 2 20 5 54 5 12 5 7 4 40 4 23 4 22 5 55 5 14 5 4 3 41 3 7 3 24 5 42 5 4 5 6 3 39 3 5 3 26 5 43 5 6 5 9 4 44 4 25 4 28 5 37 5 2 5 11 4 46 4 27 4 30 5 34 5 0 5 13 4 48 4 29 4 25 2 59 2 22 2 15 4 50 4 31 4 0 0 1 0 17 0 2 0 3 0 19 0 4 0 7 0 23 0 6 0 5 0 21 0 10 0 13 0 29 0 8 0 15 0 31 0 12 0 11 0 27 0 14 0 9 0 25 0 32 1 33 1 34 1 35 1 36 1 37 1 40 1 41 1 42 1 38 1 39 1 43 1 48 1 49 1 52 1 50 1 51 1 53 1 46 1 47 1 54 1 44 1 45 1 55 1 27 2 46 2 58 2 10 3 52 3 49 3 31 2 50 2 56 2 8 3 53 3 51 3 1 4 33 4 32 4 29 2 48 2 57 2 12 3 54 3 47 3 0 3 34 3 33 3 21 2 38 2 61 2 14 3 55 3 45 3 3 4 36 4 35 4 23 2 40 2 60 2 16 5 56 5 53 5 2 3 37 3 36 3 19 2 35 2 62 2 18 5 57 5 52 5 5 4 39 4 38 4 17 2 32 2 63 2 20 5 58 5 54 5 7 4 41 4 40 4 22 5 59 5 55 5 4 3 42 3 41 3 24 5 60 5 42 5 6 3 43 3 39 3 26 5 61 5 43 5 9 4 45 4 44 4 28 5 62 5 37 5 11 4 47 4 46 4 30 5 63 5 34 5 13 4 49 4 48 4 25 2 44 2 59 2 15 4 51 4 50 4

 @@ -84,10 +84,10 @@ 0.125 0 0 0 0 5.333333 0 -0.3333333 0 0 1 0.01986987 0 0 0 1 - + - + diff --git a/src/main/resources/meshes/wake.dae b/src/main/resources/meshes/wake.dae new file mode 100644 index 00000000..1c2887d3 --- /dev/null +++ b/src/main/resources/meshes/wake.dae @@ -0,0 +1,100 @@ + + + + + Blender User + Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22 + + 2017-09-11T10:29:05 + 2017-09-11T10:29:05 + + Z_UP + + + + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + 0 0.2734401 0.64 1 + + + 0 0 0 1 + + + 50 + + + 1 + + + + + + + + + + + + + + + + -0.9299059 0.3851796 0.01435434 -0.9807853 0.1950903 0.01435434 -1.14594 0.4746637 0.01435434 -1.202881 0.2392678 0.01435434 -1.357336 0.5622269 0.01435434 -1.425138 0.2834774 0.01435434 -1.591181 0.6590883 0.01435434 -1.673005 0.332781 0.01435434 -1.824923 0.7559077 0.01435434 -1.922022 0.3823134 0.01435434 -2.114428 0.8758246 0.01435434 -2.224825 0.4425448 0.01435434 -0.9557062 0.3958665 0.01435434 -1.030598 0.2049987 0.01435434 -1.17776 0.4878441 0.01435434 -1.263974 0.2514199 0.01435434 -1.397558 0.5788871 0.01435434 -1.497519 0.2978748 0.01435434 -1.641525 0.6799417 0.01435434 -1.757974 0.3496825 0.01435434 -1.915933 0.7435997 0.01435434 -1.664585 0.6575445 0.01435434 -1.878865 0.7782509 0.01435434 -2.019638 0.4017306 0.01435434 -1.42022 0.5526982 0.01435434 -1.198496 0.4672714 0.01435434 -2.176398 0.9014933 0.01435434 -2.337821 0.465021 0.01435434 -0.9763802 0.3837302 0.01435434 -1.823094 0.708433 0.01435434 -2.212987 0.8765437 0.01435434 -2.1103 0.8200829 0.01435434 -1.583877 0.6265971 0.01435434 -1.352277 0.5236698 0.01435434 -1.139107 0.4495032 0.01435434 -0.9300732 0.3622656 0.01435434 -0.9299059 -0.3851796 0.01435434 -0.9807853 -0.1950903 0.01435434 -1 0 0.01435434 -1.14594 -0.4746637 0.01435434 -1.202881 -0.2392678 0.01435434 -1.226447 0 0.01435434 -1.357336 -0.5622269 0.01435434 -1.425138 -0.2834774 0.01435434 -1.453059 0 0.01435434 -1.591181 -0.6590883 0.01435434 -1.673005 -0.332781 0.01435434 -1.705781 0 0.01435434 -1.824923 -0.7559077 0.01435434 -1.922022 -0.3823134 0.01435434 -1.959676 0 0.01435434 -2.114428 -0.8758246 0.01435434 -2.224825 -0.4425448 0.01435434 -2.268412 0 0.01435434 -0.9557062 -0.3958665 0.01435434 -1.030598 -0.2049987 0.01435434 -1.050788 0 0.01435434 -1.17776 -0.4878441 0.01435434 -1.263974 -0.2514199 0.01435434 -1.288737 0 0.01435434 -1.397558 -0.5788871 0.01435434 -1.497519 -0.2978748 0.01435434 -1.526857 0 0.01435434 -1.641525 -0.6799417 0.01435434 -1.757974 -0.3496825 0.01435434 -1.792415 0 0.01435434 -1.915933 -0.7435997 0.01435434 -1.664585 -0.6575445 0.01435434 -1.878865 -0.7782509 0.01435434 -2.019638 -0.4017306 0.01435434 -2.059206 0 0.01435434 -1.42022 -0.5526982 0.01435434 -1.198496 -0.4672714 0.01435434 -2.176398 -0.9014933 0.01435434 -2.337821 -0.465021 0.01435434 -2.383621 0 0.01435434 -0.9763802 -0.3837302 0.01435434 -1.823094 -0.708433 0.01435434 -2.212987 -0.8765437 0.01435434 -2.1103 -0.8200829 0.01435434 -1.583877 -0.6265971 0.01435434 -1.352277 -0.5236698 0.01435434 -1.139107 -0.4495032 0.01435434 -0.9300732 -0.3622656 0.01435434 -0.9300732 0.3622656 0.03589242 -0.9299059 0.3851796 0.03589242 -1 0 0.03589242 -0.9807853 0.1950903 0.03589242 -1.139107 0.4495032 0.03589242 -1.14594 0.4746637 0.03589242 -1.226447 0 0.03589242 -1.202881 0.2392678 0.03589242 -1.352277 0.5236698 0.03589242 -1.357336 0.5622269 0.03589242 -1.453059 0 0.03589242 -1.425138 0.2834774 0.03589242 -1.583877 0.6265971 0.03589242 -1.591181 0.6590883 0.03589242 -1.705781 0 0.03589242 -1.673005 0.332781 0.03589242 -1.823094 0.708433 0.03589242 -1.824923 0.7559077 0.03589242 -1.959676 0 0.03589242 -1.922022 0.3823134 0.03589242 -2.1103 0.8200829 0.03589242 -2.114428 0.8758246 0.03589242 -2.268412 0 0.03589242 -2.224825 0.4425448 0.03589242 -0.9763802 0.3837302 0.03589242 -0.9557062 0.3958665 0.03589242 -1.050788 0 0.03589242 -1.030598 0.2049987 0.03589242 -1.198496 0.4672714 0.03589242 -1.17776 0.4878441 0.03589242 -1.288737 0 0.03589242 -1.263974 0.2514199 0.03589242 -1.42022 0.5526982 0.03589242 -1.397558 0.5788871 0.03589242 -1.526857 0 0.03589242 -1.497519 0.2978748 0.03589242 -2.019638 0.4017306 0.03589242 -1.915933 0.7435997 0.03589242 -1.664585 0.6575445 0.03589242 -1.641525 0.6799417 0.03589242 -1.792415 0 0.03589242 -1.757974 0.3496825 0.03589242 -1.878865 0.7782509 0.03589242 -2.059206 0 0.03589242 -2.212987 0.8765437 0.03589242 -2.176398 0.9014933 0.03589242 -2.383621 0 0.03589242 -2.337821 0.465021 0.03589242 -0.9300732 -0.3622656 0.03589242 -0.9299059 -0.3851796 0.03589242 -0.9807853 -0.1950903 0.03589242 -1.139107 -0.4495032 0.03589242 -1.14594 -0.4746637 0.03589242 -1.202881 -0.2392678 0.03589242 -1.352277 -0.5236698 0.03589242 -1.357336 -0.5622269 0.03589242 -1.425138 -0.2834774 0.03589242 -1.583877 -0.6265971 0.03589242 -1.591181 -0.6590883 0.03589242 -1.673005 -0.332781 0.03589242 -1.823094 -0.708433 0.03589242 -1.824923 -0.7559077 0.03589242 -1.922022 -0.3823134 0.03589242 -2.1103 -0.8200829 0.03589242 -2.114428 -0.8758246 0.03589242 -2.224825 -0.4425448 0.03589242 -0.9763802 -0.3837302 0.03589242 -0.9557062 -0.3958665 0.03589242 -1.030598 -0.2049987 0.03589242 -1.198496 -0.4672714 0.03589242 -1.17776 -0.4878441 0.03589242 -1.263974 -0.2514199 0.03589242 -1.42022 -0.5526982 0.03589242 -1.397558 -0.5788871 0.03589242 -1.497519 -0.2978748 0.03589242 -2.019638 -0.4017306 0.03589242 -1.915933 -0.7435997 0.03589242 -1.664585 -0.6575445 0.03589242 -1.641525 -0.6799417 0.03589242 -1.757974 -0.3496825 0.03589242 -1.878865 -0.7782509 0.03589242 -2.212987 -0.8765437 0.03589242 -2.176398 -0.9014933 0.03589242 -2.337821 -0.465021 0.03589242 + + + + + + + + + + 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 -0.5633836 -0.8261956 0 0.9951848 0.09801661 0 0.9951848 -0.09801745 0 -0.9951847 -0.09801715 0 0.9650462 -0.2620801 0 0.9972683 0.07386469 0 0.9569404 0.2902845 0 0.9951847 0.09801799 0 0.9951848 -0.09801745 0 0.9569403 0.2902847 0 0.9915001 -0.130106 0 -0.50625 0.8623868 0 0.9951847 0.0980181 0 -0.9951847 0.09801733 0 0.9756547 -0.2193124 0 -0.7043111 0.7098914 0 0.9951848 0.09801733 0 -0.9951847 0.09801805 0 0.9992589 -0.0384953 0 -0.7561931 0.6543487 0 0.9951847 0.09801834 0 -0.9569405 0.2902844 0 -0.9951847 0.09801781 0 0.9972687 -0.07385855 0 0.9569401 -0.2902856 0 -0.9569405 0.2902845 0 -0.9569403 -0.2902851 0 0.9951848 0.09801745 0 0.3826839 0.9238794 0 -0.6967149 0.7173482 0 0.9569404 0.2902848 0 -0.5062469 -0.8623887 0 0.3826832 0.9238798 0 -0.9951847 0.0980181 0 0.3826839 -0.9238794 0 -0.9951848 -0.0980165 0 0.382682 0.9238802 0 -0.9569404 0.2902847 0 0.3826832 -0.9238798 0 -0.7043082 -0.7098944 0 0.3826818 0.9238803 0 -0.9569405 0.2902843 0 0.3826848 -0.923879 0 -0.9951847 -0.09801805 0 0.3826804 0.9238809 0 -0.6828882 0.730523 0 0.3826841 -0.9238793 0 -0.7561905 -0.6543515 0 0.3826825 0.92388 0 -0.9951847 0.09801799 0 0.3826846 -0.9238791 0 -0.9951847 -0.09801781 0 0.9569404 -0.2902846 0 -0.9569406 0.2902841 0 0.3826825 -0.92388 0 -0.9569401 -0.2902854 0 0.9569401 -0.2902855 0 -0.9569405 0.290284 0 0.9999734 -0.007299005 0 0.9569406 0.2902839 0 -0.6967149 -0.7173482 0 0.9569407 -0.2902838 0 -0.5633799 0.826198 0 0.9951848 -0.09801751 0 0.9569404 0.2902846 0 -0.9951847 -0.0980181 0 -0.9951847 0.09801715 0 0.9650478 0.2620739 0 -0.9569407 -0.2902837 0 0.9569404 -0.2902845 0 0.9951847 -0.09801799 0 -0.9569407 -0.2902837 0 0.9569403 -0.2902847 0 0.9915013 0.1300973 0 -0.6828882 -0.730523 0 0.9951847 -0.0980187 0 -0.9951848 -0.09801709 0 0.9756525 0.2193223 0 -0.9569403 -0.2902848 0 0.9951848 -0.09801733 0 -0.95694 -0.2902857 0 0.9999734 0.007299005 0 0.9992586 0.03850257 0 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 1 0 0 1 0 0 1 0 0 1 -0.5633799 -0.826198 0 0.9951847 0.09801751 0 0.9951847 -0.09801834 0 -0.9951848 -0.09801715 0 0.9650479 -0.2620739 0 0.9972687 0.07385855 0 0.9569404 0.2902844 0 0.9951847 0.09801793 0 0.9569404 0.2902847 0 0.9915013 -0.1300973 0 -0.5062469 0.8623886 0 0.9951846 0.0980187 0 -0.9951848 0.0980165 0 0.9756525 -0.2193223 0 -0.7043082 0.7098945 0 0.9951848 0.09801727 0 -0.9951847 0.09801805 0 0.9992586 -0.03850257 0 -0.7561906 0.6543515 0 0.9951848 0.09801745 0 -0.9569403 0.2902851 0 -0.9951847 0.09801781 0 0.9972683 -0.07386469 0 0.9569404 -0.2902848 0 -0.9569401 0.2902854 0 -0.9569405 -0.2902844 0 -0.6967148 0.7173482 0 0.9569401 0.2902856 0 -0.50625 -0.8623868 0 -0.9951847 -0.09801733 0 0.3826848 0.923879 0 -0.9569407 0.2902837 0 -0.7043111 -0.7098915 0 0.3826841 0.9238793 0 -0.9569407 0.2902837 0 0.382682 -0.9238802 0 -0.9951847 -0.09801805 0 0.3826846 0.9238791 0 0.3826819 -0.9238803 0 -0.7561931 -0.6543486 0 0.3826826 0.92388 0 -0.9951847 0.09801709 0 0.3826804 -0.9238808 0 -0.9951847 -0.09801781 0 0.9569406 -0.2902839 0 -0.9569404 0.2902848 0 0.3826826 -0.92388 0 -0.9569405 -0.2902845 0 0.9569404 -0.2902846 0 -0.95694 0.2902857 0 -0.6967148 -0.7173482 0 0.9569404 -0.2902844 0 -0.5633836 0.8261956 0 0.9951848 -0.09801661 0 0.9569402 0.2902855 0 -0.9951848 0.09801715 0 0.9650462 0.2620801 0 0.9569407 0.2902838 0 -0.9569404 -0.2902847 0 0.9951847 -0.09801793 0 -0.9569405 -0.2902843 0 0.9569404 -0.2902847 0 0.9915001 0.130106 0 0.9951847 -0.0980181 0 -0.9951847 -0.09801793 0 0.9756547 0.2193124 0 -0.9569406 -0.290284 0 0.9951848 -0.09801727 0 -0.9569405 -0.290284 0 0.9992589 0.0384953 0 + + + + + + + + + + + + + + + 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +

50 0 23 0 9 0 41 1 15 1 3 1 47 2 19 2 7 2 38 3 13 3 1 3 53 4 27 4 11 4 44 5 17 5 5 5 27 6 31 6 11 6 30 7 10 7 31 7 20 8 9 8 23 8 29 9 22 9 8 9 21 10 7 10 19 10 21 11 6 11 32 11 33 11 17 11 24 11 24 12 4 12 33 12 25 13 3 13 15 13 25 14 2 14 34 14 35 11 13 11 28 11 35 11 12 11 0 11 50 11 69 11 70 11 41 11 58 11 59 11 47 11 64 11 65 11 38 11 55 11 56 11 53 11 74 11 75 11 44 11 61 11 62 11 79 15 74 15 52 15 51 16 78 16 79 16 66 11 49 11 77 11 77 17 68 17 66 17 67 18 46 18 80 18 45 11 67 11 80 11 61 19 81 19 71 19 42 20 71 20 81 20 72 11 40 11 82 11 39 21 72 21 82 21 55 22 83 22 76 22 83 23 54 23 76 23 102 24 120 24 127 24 90 24 115 24 114 24 98 24 125 24 124 24 86 24 111 24 110 24 106 24 131 24 130 24 94 24 119 24 118 24 104 24 131 24 107 24 105 24 128 24 104 24 121 25 103 25 100 25 100 26 126 26 121 26 122 24 99 24 96 24 97 24 122 24 96 24 119 27 92 27 116 27 93 24 116 24 92 24 112 28 91 28 88 28 89 24 112 24 88 24 111 29 84 29 108 29 84 24 109 24 108 24 102 30 159 30 146 30 90 31 155 31 137 31 98 32 163 32 143 32 86 33 152 33 134 33 106 34 167 34 149 34 94 35 158 35 140 35 167 24 147 24 149 24 165 24 148 24 147 24 160 36 146 36 159 36 144 37 164 37 145 37 161 38 143 38 163 38 161 24 142 24 141 24 138 39 158 39 156 39 156 24 139 24 138 24 153 40 137 40 155 40 153 24 136 24 135 24 132 24 152 24 150 24 132 24 151 24 133 24 73 41 165 41 78 41 38 42 134 42 37 42 9 43 102 43 50 43 74 44 130 44 75 44 82 45 136 45 39 45 10 46 104 46 31 46 49 47 144 47 77 47 41 48 137 48 40 48 11 49 106 49 53 49 46 50 141 50 80 50 81 51 139 51 42 51 28 52 109 52 12 52 44 53 140 53 43 53 56 54 111 54 13 54 80 55 142 55 45 55 25 56 113 56 14 56 47 57 143 57 46 57 59 58 115 58 15 58 77 59 145 59 48 59 24 60 117 60 16 60 50 61 146 61 49 61 27 62 128 62 30 62 62 63 119 63 17 63 79 64 148 64 51 64 31 65 107 65 11 65 23 66 121 66 20 66 78 67 167 67 74 67 53 68 149 68 52 68 12 69 85 69 0 69 21 70 123 70 18 70 52 71 147 71 79 71 54 72 150 72 76 72 14 73 89 73 2 73 65 74 125 74 19 74 36 75 151 75 54 75 55 76 110 76 56 76 16 77 93 77 4 77 19 78 122 78 21 78 39 79 154 79 57 79 57 80 153 80 72 80 18 81 97 81 6 81 17 82 116 82 24 82 42 83 157 83 60 83 58 84 114 84 59 84 22 85 101 85 8 85 20 86 126 86 22 86 45 87 162 87 63 87 60 88 156 88 71 88 26 89 105 89 10 89 70 90 120 90 23 90 48 91 164 91 68 91 61 92 118 92 62 92 34 93 91 93 3 93 15 94 112 94 25 94 51 95 166 95 73 95 66 96 159 96 69 96 35 97 87 97 1 97 13 98 108 98 28 98 0 99 84 99 35 99 40 100 135 100 82 100 63 101 161 101 67 101 33 102 95 102 5 102 30 103 129 103 26 103 1 104 86 104 38 104 37 105 132 105 83 105 64 106 124 106 65 106 75 107 131 107 27 107 2 108 88 108 34 108 43 47 138 47 81 47 67 109 163 109 64 109 29 110 103 110 9 110 3 111 90 111 41 111 71 112 158 112 61 112 32 113 99 113 7 113 4 114 92 114 33 114 68 115 160 115 66 115 5 116 94 116 44 116 69 117 127 117 70 117 6 118 96 118 32 118 72 119 155 119 58 119 7 120 98 120 47 120 76 121 152 121 55 121 83 122 133 122 36 122 8 123 100 123 29 123 50 11 70 11 23 11 41 11 59 11 15 11 47 11 65 11 19 11 38 11 56 11 13 11 53 11 75 11 27 11 44 11 62 11 17 11 27 11 30 11 31 11 30 11 26 11 10 11 20 11 29 11 9 11 29 17 20 17 22 17 21 18 32 18 7 18 21 11 18 11 6 11 33 124 5 124 17 124 24 11 16 11 4 11 25 11 34 11 3 11 25 125 14 125 2 125 35 126 1 126 13 126 35 23 28 23 12 23 50 0 49 0 69 0 41 1 40 1 58 1 47 2 46 2 64 2 38 3 37 3 55 3 53 4 52 4 74 4 44 5 43 5 61 5 79 11 78 11 74 11 51 11 73 11 78 11 66 8 69 8 49 8 77 9 48 9 68 9 67 10 64 10 46 10 45 11 63 11 67 11 61 11 43 11 81 11 42 11 60 11 71 11 72 13 58 13 40 13 39 127 57 127 72 127 55 128 37 128 83 128 83 11 36 11 54 11 102 30 103 30 120 30 90 31 91 31 115 31 98 32 99 32 125 32 86 33 87 33 111 33 106 34 107 34 131 34 94 35 95 35 119 35 104 24 128 24 131 24 105 24 129 24 128 24 121 36 120 36 103 36 100 37 101 37 126 37 122 38 125 38 99 38 97 24 123 24 122 24 119 24 95 24 92 24 93 24 117 24 116 24 112 40 115 40 91 40 89 24 113 24 112 24 111 24 87 24 84 24 84 24 85 24 109 24 102 24 127 24 159 24 90 24 114 24 155 24 98 24 124 24 163 24 86 24 110 24 152 24 106 24 130 24 167 24 94 24 118 24 158 24 167 129 165 129 147 129 165 24 166 24 148 24 160 25 144 25 146 25 144 26 160 26 164 26 161 24 141 24 143 24 161 24 162 24 142 24 138 130 140 130 158 130 156 24 157 24 139 24 153 28 135 28 137 28 153 131 154 131 136 131 132 132 134 132 152 132 132 24 150 24 151 24 73 133 166 133 165 133 38 134 86 134 134 134 9 135 103 135 102 135 74 136 167 136 130 136 82 137 135 137 136 137 10 138 105 138 104 138 49 139 146 139 144 139 41 140 90 140 137 140 11 49 107 49 106 49 46 141 143 141 141 141 81 142 138 142 139 142 28 143 108 143 109 143 44 144 94 144 140 144 56 145 110 145 111 145 80 146 141 146 142 146 25 147 112 147 113 147 47 148 98 148 143 148 59 149 114 149 115 149 77 150 144 150 145 150 24 151 116 151 117 151 50 152 102 152 146 152 27 153 131 153 128 153 62 154 118 154 119 154 79 155 147 155 148 155 31 156 104 156 107 156 23 157 120 157 121 157 78 158 165 158 167 158 53 68 106 68 149 68 12 69 109 69 85 69 21 159 122 159 123 159 52 160 149 160 147 160 54 161 151 161 150 161 14 73 113 73 89 73 65 74 124 74 125 74 36 75 133 75 151 75 55 162 152 162 110 162 16 163 117 163 93 163 19 164 125 164 122 164 39 79 136 79 154 79 57 165 154 165 153 165 18 166 123 166 97 166 17 167 119 167 116 167 42 168 139 168 157 168 58 169 155 169 114 169 22 170 126 170 101 170 20 86 121 86 126 86 45 171 142 171 162 171 60 172 157 172 156 172 26 173 129 173 105 173 70 174 127 174 120 174 48 175 145 175 164 175 61 176 158 176 118 176 34 177 88 177 91 177 15 178 115 178 112 178 51 179 148 179 166 179 66 180 160 180 159 180 35 181 84 181 87 181 13 182 111 182 108 182 0 99 85 99 84 99 40 105 137 105 135 105 63 183 162 183 161 183 33 184 92 184 95 184 30 185 128 185 129 185 1 186 87 186 86 186 37 187 134 187 132 187 64 106 163 106 124 106 75 188 130 188 131 188 2 189 89 189 88 189 43 190 140 190 138 190 67 191 161 191 163 191 29 184 100 184 103 184 3 192 91 192 90 192 71 193 156 193 158 193 32 194 96 194 99 194 4 195 93 195 92 195 68 115 164 115 160 115 5 196 95 196 94 196 69 197 159 197 127 197 6 198 97 198 96 198 72 199 153 199 155 199 7 200 99 200 98 200 76 201 150 201 152 201 83 122 132 122 133 122 8 202 101 202 100 202

+ + + + + + + + + 10.42875 0 0 2.44332 0 6.610386 0 0 0 0 6.610386 0 0 0 0 1 + + + + + + + + + + + + + + \ No newline at end of file