From a518193a79648eb3389d063d6c9c97aa3a5c0a00 Mon Sep 17 00:00:00 2001
From: vvashchenko <vitaliy.vashchenko@nic.cz>
Date: Mon, 22 Aug 2016 15:19:08 +0200
Subject: [PATCH] Moved some classes to own files. Code refactoring.
---
.../game/games/pursuit/PursuitGame.java | 3 +-
.../games/pursuit/helper/PositionHelper.java | 98 -------------------
.../helper/PursuitPositionDefinition.java | 68 +++++++++++++
.../helper/PursuitRotationDefinition.java | 30 ++++++
.../game/games/pursuit/model/Maps.java | 41 ++++----
5 files changed, 117 insertions(+), 123 deletions(-)
delete mode 100644 core/src/cz/nic/tablexia/game/games/pursuit/helper/PositionHelper.java
create mode 100644 core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitPositionDefinition.java
create mode 100644 core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitRotationDefinition.java
diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java b/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
index 72b79751a..5e73284be 100644
--- a/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
+++ b/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
@@ -35,6 +35,7 @@ import cz.nic.tablexia.game.games.pursuit.action.VehicleMoveAction;
import cz.nic.tablexia.game.games.pursuit.assets.PursuitAssets;
import cz.nic.tablexia.game.games.pursuit.helper.ArithmeticsHelper;
import cz.nic.tablexia.game.games.pursuit.helper.GameRulesHelper;
+import cz.nic.tablexia.game.games.pursuit.helper.PursuitPositionDefinition;
import cz.nic.tablexia.game.games.pursuit.helper.TextureHelper;
import cz.nic.tablexia.game.games.pursuit.model.Grid;
import cz.nic.tablexia.game.games.pursuit.model.Maps;
@@ -477,7 +478,7 @@ public class PursuitGame extends AbstractTablexiaGame<int[][]> {
finishFlag.setVisible(true);
final Music[] vehicleSounds = getVehicleSounds(TextureHelper.getVehicleTextureName(getRandom(), mapNumber));
- final CatmullRomSpline<Vector2> path = new CatmullRomSpline<Vector2>(Maps.values()[mapNumber].getPursuitPositionDefinition().getPointsWithRotation(grid.getRotation()),false);
+ final CatmullRomSpline<Vector2> path = new CatmullRomSpline<Vector2>(PursuitPositionDefinition.getPointsWithRotation(PursuitPositionDefinition.values()[mapNumber],grid.getRotation()),false);
VehicleMoveAction vehicleMoveAlongAction = new VehicleMoveAction(path, ANIMATION_MOVING_DURATION, grid.getWidth(), vehicleSounds[getRandom().nextInt(vehicleSounds.length)]);
vehicle.addAction(Actions.sequence(Actions.show(),Actions.delay(ANIMATION_DELAY_DURATION),vehicleMoveAlongAction,new RunnableAction() {
@Override
diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/helper/PositionHelper.java b/core/src/cz/nic/tablexia/game/games/pursuit/helper/PositionHelper.java
deleted file mode 100644
index 528e15bd7..000000000
--- a/core/src/cz/nic/tablexia/game/games/pursuit/helper/PositionHelper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package cz.nic.tablexia.game.games.pursuit.helper;
-
-import com.badlogic.gdx.math.Vector2;
-
-import cz.nic.tablexia.util.Point;
-
-/**
- * Created by Vitaliy Vashchenko on 20.6.16.
- */
-public class PositionHelper {
-
- public enum RotationDefinition {
-
- ZERO(0f),
- LEFT(90f),
- UP(270f),
- REVERSE(180f);
-
- float rotation;
-
- RotationDefinition(float rotation) {
- this.rotation = rotation;
- }
-
- public static RotationDefinition getRotationDefinition(float rotation) {
- rotation = Math.abs(rotation)%360;
- for (RotationDefinition rotationDefinition : RotationDefinition.values()) {
- if (rotationDefinition.getRotation() == rotation) return rotationDefinition;
- }
- return null;
- }
-
- public float getRotation() {
- return rotation;
- }
- }
-
- public enum PursuitPositionDefinition {
-
- // TODO: 21.6.16 correct some positions
- MAP_1(new Point(0.866f, 0.1f),new Point(0.866f, 0.1f), new Point(0.859f, 0.211f), new Point(0.824f, 0.276f), new Point(0.792f, 0.312f), new Point(0.719f, 0.268f), new Point(0.666f, 0.241f), new Point(0.608f, 0.221f), new Point(0.534f, 0.203f), new Point(0.448f, 0.194f), new Point(0.374f, 0.224f), new Point(0.328f, 0.286f), new Point(0.293f, 0.37f), new Point(0.265f, 0.469f), new Point(0.237f, 0.575f), new Point(0.215f, 0.671f), new Point(0.228f, 0.772f), new Point(0.258f, 0.846f), new Point(0.26f, 0.85f)),
- MAP_2(new Point(0.64f, 0.11f),new Point(0.64f, 0.11f), new Point(0.68f, 0.214f), new Point(0.738f, 0.308f), new Point(0.777f, 0.395f), new Point(0.683f, 0.449f), new Point(0.613f, 0.509f), new Point(0.54f, 0.573f), new Point(0.473f, 0.658f), new Point(0.4f, 0.728f), new Point(0.322f, 0.711f), new Point(0.26f, 0.666f), new Point(0.208f, 0.757f), new Point(0.22f, 0.75f)),
- MAP_3(new Point(0.08f, 0.41f),new Point(0.08f, 0.41f), new Point(0.182f, 0.461f), new Point(0.271f, 0.466f), new Point(0.368f, 0.475f), new Point(0.376f, 0.599f), new Point(0.387f, 0.698f), new Point(0.398f, 0.755f), new Point(0.361f, 0.824f), new Point(0.394f, 0.868f), new Point(0.461f, 0.877f), new Point(0.531f, 0.85f), new Point(0.627f, 0.897f), new Point(0.691f, 0.899f), new Point(0.77f, 0.903f), new Point(0.776f, 0.855f), new Point(0.758f, 0.811f), new Point(0.776f, 0.754f), new Point(0.79f, 0.71f)),
- MAP_4(new Point(0.95f, 0.33f),new Point(0.95f, 0.33f), new Point(0.866f, 0.307f), new Point(0.766f, 0.342f), new Point(0.709f, 0.391f), new Point(0.588f, 0.452f), new Point(0.512f, 0.497f), new Point(0.425f, 0.588f), new Point(0.355f, 0.667f), new Point(0.278f, 0.595f), new Point(0.19f, 0.574f), new Point(0.18f, 0.57f)),
- MAP_5(new Point(0.94f, 0.12f),new Point(0.94f, 0.12f), new Point(0.928f, 0.333f), new Point(0.784f, 0.373f), new Point(0.678f, 0.412f), new Point(0.645f, 0.525f), new Point(0.578f, 0.582f), new Point(0.549f, 0.649f), new Point(0.597f, 0.733f), new Point(0.68f, 0.77f), new Point(0.784f, 0.793f), new Point(0.863f, 0.843f), new Point(0.86f, 0.82f)),
- MAP_6(new Point(0.95f, 0.17f),new Point(0.95f, 0.17f), new Point(0.85f, 0.18f), new Point(0.763f, 0.171f), new Point(0.68f, 0.136f), new Point(0.602f, 0.092f), new Point(0.538f, 0.036f), new Point(0.509f, 0.081f), new Point(0.438f, 0.077f), new Point(0.392f, 0.142f), new Point(0.369f, 0.199f), new Point(0.377f, 0.251f), new Point(0.436f, 0.306f), new Point(0.45f, 0.32f)),
- MAP_7(new Point(0.56f, 0.07f),new Point(0.56f, 0.07f), new Point(0.43f, 0.16f), new Point(0.347f, 0.246f), new Point(0.373f, 0.36f), new Point(0.443f, 0.465f), new Point(0.499f, 0.58f), new Point(0.431f, 0.657f), new Point(0.379f, 0.738f), new Point(0.356f, 0.825f), new Point(0.36f, 0.83f)),
- MAP_8(new Point(0.16f, 0.19f),new Point(0.16f, 0.19f), new Point(0.237f, 0.255f), new Point(0.287f, 0.316f), new Point(0.351f, 0.354f), new Point(0.285f, 0.44f), new Point(0.212f, 0.521f), new Point(0.134f, 0.597f), new Point(0.071f, 0.679f), new Point(0.118f, 0.718f), new Point(0.204f, 0.754f), new Point(0.272f, 0.733f), new Point(0.343f, 0.798f), new Point(0.425f, 0.856f), new Point(0.496f, 0.919f), new Point(0.596f, 0.853f), new Point(0.672f, 0.823f), new Point(0.759f, 0.82f), new Point(0.818f, 0.828f), new Point(0.825f, 0.801f), new Point(0.83f, 0.79f)),
- MAP_9(new Point(0.15f, 0.11f),new Point(0.15f, 0.11f), new Point(0.193f, 0.179f), new Point(0.255f, 0.19f), new Point(0.164f, 0.426f), new Point(0.234f, 0.494f), new Point(0.307f, 0.661f), new Point(0.356f, 0.723f), new Point(0.435f, 0.776f), new Point(0.509f, 0.805f), new Point(0.622f, 0.831f), new Point(0.719f, 0.837f), new Point(0.808f, 0.834f), new Point(0.81f, 0.83f)),
- MAP_10(new Point(0.22f, 0.07f),new Point(0.22f, 0.07f), new Point(0.214f, 0.293f), new Point(0.204f, 0.421f), new Point(0.449f, 0.422f), new Point(0.574f, 0.561f), new Point(0.678f, 0.49f), new Point(0.806f, 0.75f), new Point(0.761f, 0.838f), new Point(0.76f, 0.84f)),
- MAP_11(new Point(0.61f, 0.11f),new Point(0.61f, 0.11f), new Point(0.582f, 0.258f), new Point(0.571f, 0.364f), new Point(0.599f, 0.442f), new Point(0.641f, 0.499f), new Point(0.646f, 0.584f), new Point(0.702f, 0.626f), new Point(0.81f, 0.644f), new Point(0.801f, 0.693f), new Point(0.678f, 0.683f), new Point(0.553f, 0.688f), new Point(0.366f, 0.697f), new Point(0.302f, 0.688f), new Point(0.214f, 0.697f), new Point(0.21f, 0.69f)),
- MAP_12(new Point(0.89f, 0.17f),new Point(0.89f, 0.17f), new Point(0.806f, 0.118f), new Point(0.565f, 0.111f), new Point(0.43f, 0.102f), new Point(0.385f, 0.164f), new Point(0.436f, 0.294f), new Point(0.473f, 0.442f), new Point(0.492f, 0.562f), new Point(0.444f, 0.676f), new Point(0.385f, 0.792f), new Point(0.278f, 0.803f), new Point(0.223f, 0.843f), new Point(0.208f, 0.868f), new Point(0.2f, 0.85f)),
- MAP_13(new Point(0.08f, 0.06f),new Point(0.08f, 0.06f), new Point(0.189f, 0.227f), new Point(0.414f, 0.316f), new Point(0.665f, 0.51f), new Point(0.797f, 0.632f), new Point(0.88f, 0.735f), new Point(0.88f, 0.73f)),
- MAP_14(new Point(0.18f, 0.08f),new Point(0.18f, 0.08f), new Point(0.212f, 0.239f), new Point(0.29f, 0.321f), new Point(0.399f, 0.382f), new Point(0.342f, 0.503f), new Point(0.311f, 0.659f), new Point(0.308f, 0.773f), new Point(0.324f, 0.843f), new Point(0.32f, 0.84f));
-
- private Point[] points;
-
- PursuitPositionDefinition(Point... points) {
- this.points = points;
- }
-
- public Point[] getPoints() {
- return points;
- }
-
- // FIXME: 18.8.16 freeze after finishing the puzzle
- public Vector2[] getPointsWithRotation(float rotation) {
- RotationDefinition rotationDefinition = RotationDefinition.getRotationDefinition(rotation);
- Vector2[] rotatedPositions = new Vector2[points.length];
-
- for (int i = 0; i < getPoints().length; i++) {
- rotatedPositions[i] = getRotatedPosition(rotationDefinition, getPoints()[i]);
- }
-
- return rotatedPositions;
- }
-
- private static Vector2 getRotatedPosition(RotationDefinition rotationDefinition, Point position) {
- switch (rotationDefinition) {
- case UP:
- //x = y, y = 1-x
- return new Vector2(position.y, 1 - position.x);
- case LEFT:
- //x=1-y, y=x
- return new Vector2(1 - position.y, position.x);
- case REVERSE:
- //x = 1-x,y=1-y
- return new Vector2(1 - position.x, 1 - position.y);
- default:
- return new Vector2(position.x, position.y);
- }
- }
-
-
-
- }
-
-}
diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitPositionDefinition.java b/core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitPositionDefinition.java
new file mode 100644
index 000000000..3ee1cc1f4
--- /dev/null
+++ b/core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitPositionDefinition.java
@@ -0,0 +1,68 @@
+package cz.nic.tablexia.game.games.pursuit.helper;
+
+import com.badlogic.gdx.math.Vector2;
+
+import cz.nic.tablexia.util.Point;
+
+/**
+ * Created by Vitaliy Vashchenko on 22.8.16.
+ */
+public enum PursuitPositionDefinition {
+
+ // TODO: 21.6.16 correct some positions
+ MAP_1(new Point(0.866f, 0.1f),new Point(0.866f, 0.1f), new Point(0.859f, 0.211f), new Point(0.824f, 0.276f), new Point(0.792f, 0.312f), new Point(0.719f, 0.268f), new Point(0.666f, 0.241f), new Point(0.608f, 0.221f), new Point(0.534f, 0.203f), new Point(0.448f, 0.194f), new Point(0.374f, 0.224f), new Point(0.328f, 0.286f), new Point(0.293f, 0.37f), new Point(0.265f, 0.469f), new Point(0.237f, 0.575f), new Point(0.215f, 0.671f), new Point(0.228f, 0.772f), new Point(0.258f, 0.846f), new Point(0.26f, 0.85f)),
+ MAP_2(new Point(0.64f, 0.11f),new Point(0.64f, 0.11f), new Point(0.68f, 0.214f), new Point(0.738f, 0.308f), new Point(0.777f, 0.395f), new Point(0.683f, 0.449f), new Point(0.613f, 0.509f), new Point(0.54f, 0.573f), new Point(0.473f, 0.658f), new Point(0.4f, 0.728f), new Point(0.322f, 0.711f), new Point(0.26f, 0.666f), new Point(0.208f, 0.757f), new Point(0.22f, 0.75f)),
+ MAP_3(new Point(0.08f, 0.41f),new Point(0.08f, 0.41f), new Point(0.182f, 0.461f), new Point(0.271f, 0.466f), new Point(0.368f, 0.475f), new Point(0.376f, 0.599f), new Point(0.387f, 0.698f), new Point(0.398f, 0.755f), new Point(0.361f, 0.824f), new Point(0.394f, 0.868f), new Point(0.461f, 0.877f), new Point(0.531f, 0.85f), new Point(0.627f, 0.897f), new Point(0.691f, 0.899f), new Point(0.77f, 0.903f), new Point(0.776f, 0.855f), new Point(0.758f, 0.811f), new Point(0.776f, 0.754f), new Point(0.79f, 0.71f)),
+ MAP_4(new Point(0.95f, 0.33f),new Point(0.95f, 0.33f), new Point(0.866f, 0.307f), new Point(0.766f, 0.342f), new Point(0.709f, 0.391f), new Point(0.588f, 0.452f), new Point(0.512f, 0.497f), new Point(0.425f, 0.588f), new Point(0.355f, 0.667f), new Point(0.278f, 0.595f), new Point(0.19f, 0.574f), new Point(0.18f, 0.57f)),
+ MAP_5(new Point(0.94f, 0.12f),new Point(0.94f, 0.12f), new Point(0.928f, 0.333f), new Point(0.784f, 0.373f), new Point(0.678f, 0.412f), new Point(0.645f, 0.525f), new Point(0.578f, 0.582f), new Point(0.549f, 0.649f), new Point(0.597f, 0.733f), new Point(0.68f, 0.77f), new Point(0.784f, 0.793f), new Point(0.863f, 0.843f), new Point(0.86f, 0.82f)),
+ MAP_6(new Point(0.95f, 0.17f),new Point(0.95f, 0.17f), new Point(0.85f, 0.18f), new Point(0.763f, 0.171f), new Point(0.68f, 0.136f), new Point(0.602f, 0.092f), new Point(0.538f, 0.036f), new Point(0.509f, 0.081f), new Point(0.438f, 0.077f), new Point(0.392f, 0.142f), new Point(0.369f, 0.199f), new Point(0.377f, 0.251f), new Point(0.436f, 0.306f), new Point(0.45f, 0.32f)),
+ MAP_7(new Point(0.56f, 0.07f),new Point(0.56f, 0.07f), new Point(0.43f, 0.16f), new Point(0.347f, 0.246f), new Point(0.373f, 0.36f), new Point(0.443f, 0.465f), new Point(0.499f, 0.58f), new Point(0.431f, 0.657f), new Point(0.379f, 0.738f), new Point(0.356f, 0.825f), new Point(0.36f, 0.83f)),
+ MAP_8(new Point(0.16f, 0.19f),new Point(0.16f, 0.19f), new Point(0.237f, 0.255f), new Point(0.287f, 0.316f), new Point(0.351f, 0.354f), new Point(0.285f, 0.44f), new Point(0.212f, 0.521f), new Point(0.134f, 0.597f), new Point(0.071f, 0.679f), new Point(0.118f, 0.718f), new Point(0.204f, 0.754f), new Point(0.272f, 0.733f), new Point(0.343f, 0.798f), new Point(0.425f, 0.856f), new Point(0.496f, 0.919f), new Point(0.596f, 0.853f), new Point(0.672f, 0.823f), new Point(0.759f, 0.82f), new Point(0.818f, 0.828f), new Point(0.825f, 0.801f), new Point(0.83f, 0.79f)),
+ MAP_9(new Point(0.15f, 0.11f),new Point(0.15f, 0.11f), new Point(0.193f, 0.179f), new Point(0.255f, 0.19f), new Point(0.164f, 0.426f), new Point(0.234f, 0.494f), new Point(0.307f, 0.661f), new Point(0.356f, 0.723f), new Point(0.435f, 0.776f), new Point(0.509f, 0.805f), new Point(0.622f, 0.831f), new Point(0.719f, 0.837f), new Point(0.808f, 0.834f), new Point(0.81f, 0.83f)),
+ MAP_10(new Point(0.22f, 0.07f),new Point(0.22f, 0.07f), new Point(0.214f, 0.293f), new Point(0.204f, 0.421f), new Point(0.449f, 0.422f), new Point(0.574f, 0.561f), new Point(0.678f, 0.49f), new Point(0.806f, 0.75f), new Point(0.761f, 0.838f), new Point(0.76f, 0.84f)),
+ MAP_11(new Point(0.61f, 0.11f),new Point(0.61f, 0.11f), new Point(0.582f, 0.258f), new Point(0.571f, 0.364f), new Point(0.599f, 0.442f), new Point(0.641f, 0.499f), new Point(0.646f, 0.584f), new Point(0.702f, 0.626f), new Point(0.81f, 0.644f), new Point(0.801f, 0.693f), new Point(0.678f, 0.683f), new Point(0.553f, 0.688f), new Point(0.366f, 0.697f), new Point(0.302f, 0.688f), new Point(0.214f, 0.697f), new Point(0.21f, 0.69f)),
+ MAP_12(new Point(0.89f, 0.17f),new Point(0.89f, 0.17f), new Point(0.806f, 0.118f), new Point(0.565f, 0.111f), new Point(0.43f, 0.102f), new Point(0.385f, 0.164f), new Point(0.436f, 0.294f), new Point(0.473f, 0.442f), new Point(0.492f, 0.562f), new Point(0.444f, 0.676f), new Point(0.385f, 0.792f), new Point(0.278f, 0.803f), new Point(0.223f, 0.843f), new Point(0.208f, 0.868f), new Point(0.2f, 0.85f)),
+ MAP_13(new Point(0.08f, 0.06f),new Point(0.08f, 0.06f), new Point(0.189f, 0.227f), new Point(0.414f, 0.316f), new Point(0.665f, 0.51f), new Point(0.797f, 0.632f), new Point(0.88f, 0.735f), new Point(0.88f, 0.73f)),
+ MAP_14(new Point(0.18f, 0.08f),new Point(0.18f, 0.08f), new Point(0.212f, 0.239f), new Point(0.29f, 0.321f), new Point(0.399f, 0.382f), new Point(0.342f, 0.503f), new Point(0.311f, 0.659f), new Point(0.308f, 0.773f), new Point(0.324f, 0.843f), new Point(0.32f, 0.84f));
+
+ private Point[] points;
+
+ PursuitPositionDefinition(Point... points) {
+ this.points = points;
+ }
+
+ public Point[] getPoints() {
+ return points;
+ }
+
+ // FIXME: 18.8.16 freeze after finishing the puzzle
+ public static Vector2[] getPointsWithRotation(PursuitPositionDefinition positionDefinition, float rotation) {
+ PursuitRotationDefinition rotationDefinition = PursuitRotationDefinition.getRotationDefinition(rotation);
+ Vector2[] rotatedPositions = new Vector2[positionDefinition.getPoints().length];
+
+ for (int i = 0; i < rotatedPositions.length; i++) {
+ rotatedPositions[i] = getRotatedPosition(rotationDefinition, positionDefinition.getPoints()[i]);
+ }
+
+ return rotatedPositions;
+ }
+
+ private static Vector2 getRotatedPosition(PursuitRotationDefinition pursuitRotationDefinition, Point position) {
+ switch (pursuitRotationDefinition) {
+ case UP:
+ //x = y, y = 1-x
+ return new Vector2(position.y, 1 - position.x);
+ case LEFT:
+ //x=1-y, y=x
+ return new Vector2(1 - position.y, position.x);
+ case REVERSE:
+ //x = 1-x,y=1-y
+ return new Vector2(1 - position.x, 1 - position.y);
+ default:
+ return new Vector2(position.x, position.y);
+ }
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitRotationDefinition.java b/core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitRotationDefinition.java
new file mode 100644
index 000000000..fc0db8532
--- /dev/null
+++ b/core/src/cz/nic/tablexia/game/games/pursuit/helper/PursuitRotationDefinition.java
@@ -0,0 +1,30 @@
+package cz.nic.tablexia.game.games.pursuit.helper;
+
+/**
+ * Created by Vitaliy Vashchenko on 22.8.16.
+ */
+public enum PursuitRotationDefinition {
+
+ ZERO(0f),
+ LEFT(90f),
+ UP(270f),
+ REVERSE(180f);
+
+ float rotation;
+
+ PursuitRotationDefinition(float rotation) {
+ this.rotation = rotation;
+ }
+
+ public static PursuitRotationDefinition getRotationDefinition(float rotation) {
+ rotation = Math.abs(rotation)%360;
+ for (PursuitRotationDefinition pursuitRotationDefinition : PursuitRotationDefinition.values()) {
+ if (pursuitRotationDefinition.getRotation() == rotation) return pursuitRotationDefinition;
+ }
+ return null;
+ }
+
+ public float getRotation() {
+ return rotation;
+ }
+}
\ No newline at end of file
diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/model/Maps.java b/core/src/cz/nic/tablexia/game/games/pursuit/model/Maps.java
index 6407a0a50..9abebd4ef 100644
--- a/core/src/cz/nic/tablexia/game/games/pursuit/model/Maps.java
+++ b/core/src/cz/nic/tablexia/game/games/pursuit/model/Maps.java
@@ -1,6 +1,5 @@
package cz.nic.tablexia.game.games.pursuit.model;
-import cz.nic.tablexia.game.games.pursuit.helper.PositionHelper;
import cz.nic.tablexia.util.Point;
/**
@@ -8,48 +7,42 @@ import cz.nic.tablexia.util.Point;
*/
public enum Maps {
// TODO add car initial rotation
- MAP1("map1", new Point(0.866f, 0.1f), new Point(0.26f, 0.85f), PositionHelper.PursuitPositionDefinition.MAP_1),
- MAP2("map2", new Point(0.64f, 0.11f), new Point(0.22f, 0.75f), PositionHelper.PursuitPositionDefinition.MAP_2),
- MAP3("map3", new Point(0.08f, 0.41f), new Point(0.79f, 0.71f), PositionHelper.PursuitPositionDefinition.MAP_3),
- MAP4("map4", new Point(0.95f, 0.33f), new Point(0.18f, 0.57f), PositionHelper.PursuitPositionDefinition.MAP_4),
- MAP5("map5", new Point(0.94f, 0.12f), new Point(0.86f, 0.82f), PositionHelper.PursuitPositionDefinition.MAP_5),
- MAP6("map6", new Point(0.95f, 0.17f), new Point(0.45f, 0.32f), PositionHelper.PursuitPositionDefinition.MAP_6),
- MAP7("map7", new Point(0.56f, 0.07f), new Point(0.36f, 0.83f), PositionHelper.PursuitPositionDefinition.MAP_7),
- MAP8("map8", new Point(0.16f, 0.19f), new Point(0.83f, 0.79f), PositionHelper.PursuitPositionDefinition.MAP_8),
- MAP9("map9", new Point(0.15f, 0.11f), new Point(0.81f, 0.83f), PositionHelper.PursuitPositionDefinition.MAP_9),
- MAP10("map10", new Point(0.22f, 0.07f), new Point(0.76f, 0.84f),PositionHelper.PursuitPositionDefinition.MAP_10),
- MAP11("map11", new Point(0.61f, 0.11f), new Point(0.21f, 0.69f),PositionHelper.PursuitPositionDefinition.MAP_11),
- MAP12("map12", new Point(0.89f, 0.17f), new Point(0.2f, 0.85f),PositionHelper.PursuitPositionDefinition.MAP_12),
- MAP13("map13", new Point(0.08f, 0.06f), new Point(0.88f, 0.73f),PositionHelper.PursuitPositionDefinition.MAP_13),
- MAP14("map14", new Point(0.18f, 0.08f), new Point(0.32f, 0.84f),PositionHelper.PursuitPositionDefinition.MAP_14);
+ MAP1("map1", new Point(0.866f, 0.1f), new Point(0.26f, 0.85f)),
+ MAP2("map2", new Point(0.64f, 0.11f), new Point(0.22f, 0.75f)),
+ MAP3("map3", new Point(0.08f, 0.41f), new Point(0.79f, 0.71f)),
+ MAP4("map4", new Point(0.95f, 0.33f), new Point(0.18f, 0.57f)),
+ MAP5("map5", new Point(0.94f, 0.12f), new Point(0.86f, 0.82f)),
+ MAP6("map6", new Point(0.95f, 0.17f), new Point(0.45f, 0.32f)),
+ MAP7("map7", new Point(0.56f, 0.07f), new Point(0.36f, 0.83f)),
+ MAP8("map8", new Point(0.16f, 0.19f), new Point(0.83f, 0.79f)),
+ MAP9("map9", new Point(0.15f, 0.11f), new Point(0.81f, 0.83f)),
+ MAP10("map10", new Point(0.22f, 0.07f), new Point(0.76f, 0.84f)),
+ MAP11("map11", new Point(0.61f, 0.11f), new Point(0.21f, 0.69f)),
+ MAP12("map12", new Point(0.89f, 0.17f), new Point(0.2f, 0.85f)),
+ MAP13("map13", new Point(0.08f, 0.06f), new Point(0.88f, 0.73f)),
+ MAP14("map14", new Point(0.18f, 0.08f), new Point(0.32f, 0.84f));
private String textureRegionName;
//relatives position of checkpoints on map
private Point startPointCoords;
private Point endPointCoords;
- private PositionHelper.PursuitPositionDefinition pursuitPositionDefinition;
-
- Maps(String textureRegionName, Point startPointCoords, Point endPointCoords, PositionHelper.PursuitPositionDefinition positionDefinition){
+ Maps(String textureRegionName, Point startPointCoords, Point endPointCoords){
this.textureRegionName = textureRegionName;
this.startPointCoords = startPointCoords;
this.endPointCoords = endPointCoords;
- this.pursuitPositionDefinition = positionDefinition;
}
public String getTextureRegionName(){
return textureRegionName;
}
- public cz.nic.tablexia.util.Point getStartPointCoords(){
+ public Point getStartPointCoords(){
return startPointCoords;
}
- public cz.nic.tablexia.util.Point getEndPointCoords(){
+ public Point getEndPointCoords(){
return endPointCoords;
}
- public PositionHelper.PursuitPositionDefinition getPursuitPositionDefinition() {
- return pursuitPositionDefinition;
- }
}
--
GitLab