diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
index 930c5b25..bb3e0fec 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
@@ -12,6 +12,7 @@ import javafx.scene.chart.LineChart;
import javafx.scene.control.*;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.StackPane;
import javafx.scene.shape.MeshView;
@@ -83,6 +84,7 @@ public class RaceController extends Controller {
@FXML private SplitPane racePane;
+
/**
* This is the pane we place the actual arrow control inside of.
*/
@@ -209,6 +211,7 @@ public class RaceController extends Controller {
view3D.setYaw(0);
view3D.setPitch(60);
view3D.enableTracking();
+ //newPane.getChildren().add(view3D);
canvasBase.add(view3D, 0, 0);
// Set up projection from GPS to view
@@ -255,21 +258,25 @@ public class RaceController extends Controller {
if(key != null) {
switch (key.toString()) {
case "Zoom In":
- if (currentState.equals(TutorialState.ZOOMIN)) {
- try {
- checkTutorialState();
- } catch (Exception e1) {
- e1.printStackTrace();
+ if (isTutorial) {
+ if (currentState.equals(TutorialState.ZOOMIN)) {
+ try {
+ checkTutorialState();
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
view3D.updateDistance(-10);
break;
case "Zoom Out":
- if (currentState.equals(TutorialState.ZOOMOUT)) {
- try {
- checkTutorialState();
- } catch (Exception e1) {
- e1.printStackTrace();
+ if(isTutorial) {
+ if (currentState.equals(TutorialState.ZOOMOUT)) {
+ try {
+ checkTutorialState();
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
view3D.updateDistance(10);
diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml b/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml
index ecc59e40..47519d00 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/race.fxml b/racevisionGame/src/main/resources/visualiser/scenes/race.fxml
index 76ee05af..215d12a3 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/race.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/race.fxml
@@ -30,81 +30,88 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+