working camera controls and resetting

Author: madhephaestus

BowlerStudio

@@ -224,7 +224,10 @@ void onExport(ActionEvent event) {
 
 	@FXML
 	void onFitView(ActionEvent event) {
-
+		engine.focusOrentation(
+				new TransformNR(0,0,0,new RotationNR(0,45,-45)),
+				new TransformNR(),
+				engine.getFlyingCamera().getDefaultZoomDepth());
 	}
 
 	@FXML
@@ -259,7 +262,10 @@ void onHome(MouseEvent event) {
 
 	@FXML
 	void onHomeViewButton(ActionEvent event) {
-		navigationCube.focusOrentation(new TransformNR(0,0,0,new RotationNR(0,45,-45)));
+		engine.focusOrentation(
+				new TransformNR(0,0,0,new RotationNR(0,45,-45)),
+				new TransformNR(),
+				engine.getFlyingCamera().getDefaultZoomDepth());
 	}
 
 	@FXML
@@ -330,11 +336,15 @@ void onWOrkplane(ActionEvent event) {
 	@FXML
 	void onZoomIn(ActionEvent event) {
 
+		System.out.println("Zoom In");
+		engine.setZoom((int)engine.getFlyingCamera().getZoomDepth()+20);
 	}
 
 	@FXML
 	void onZoomOut(ActionEvent event) {
+		System.out.println("Zoom Out");
 
+		engine.setZoom((int)engine.getFlyingCamera().getZoomDepth()-20);
 	}
 
 	@FXML
@@ -352,18 +362,6 @@ void showAll(ActionEvent event) {
 
 	}
 
-	@FXML
-	void zoomInView(MouseEvent event) {
-		System.out.println("Zoom In");
-		engine.setZoom((int)engine.getFlyingCamera().getZoomDepth()-20);
-	}
-
-	@FXML
-	void zoomOutViewButton(MouseEvent event) {
-		System.out.println("Zoom Out");
-
-		engine.setZoom((int)engine.getFlyingCamera().getZoomDepth()+20);
-	}
 
 	@FXML // This method is called by the FXMLLoader when initialization is complete
 	void initialize() {
@@ -483,7 +481,7 @@ public boolean isRotate(MouseEvent me) {
 				boolean primaryButtonDown = me.isPrimaryButtonDown();
 				boolean secondaryButtonDown = me.isSecondaryButtonDown();
 				boolean ctrl = me.isControlDown();
-				if(ctrl && primaryButtonDown)
+				if(ctrl && primaryButtonDown && (!shiftDown))
 					return true;
 				if((!shiftDown)&& secondaryButtonDown)
 					return true;
@@ -493,9 +491,13 @@ public boolean isRotate(MouseEvent me) {
 			@Override
 			public boolean isMove(MouseEvent me) {
 				boolean shiftDown = me.isShiftDown();
+				boolean primaryButtonDown = me.isPrimaryButtonDown();
 				boolean secondaryButtonDown = me.isSecondaryButtonDown();
+				boolean ctrl = me.isControlDown();
 				if((shiftDown)&& secondaryButtonDown)
 					return true;
+				if(ctrl && shiftDown && primaryButtonDown)
+					return true;
 				return false ;
 			}
 		});
@@ -505,6 +507,7 @@ private void setUpNavigationCube() {
 		navigationCube = new BowlerStudio3dEngine();
 		navigationCube.rebuild(false);
 		navigationCube.setZoom(-400);
+		navigationCube.lockZoom();
 		navigationCube.setMouseScale(10);
 		BowlerStudio.runLater(() -> {
 			navigationCube.getSubScene().setFocusTraversable(false);
@@ -527,6 +530,7 @@ private void setUpNavigationCube() {
 		ViewCube viewcube= new ViewCube();
 		MeshView viewCubeMesh = viewcube.createTexturedCube(navigationCube);
 		navigationCube.addUserNode(viewCubeMesh);
+		
 	}
 
 

src/main/java/com/commonwealthrobotics/MainController.java

@@ -230,7 +230,7 @@
                                           </Button>
                                           <Button fx:id="zoomInButton" mnemonicParsing="false" onAction="#onZoomIn" styleClass="image-button" GridPane.rowIndex="3">
                                              <graphic>
-                                                <ImageView fitHeight="30.0" fitWidth="30.0" onDragDetected="#zoomOutViewButton" pickOnBounds="true" preserveRatio="true">
+                                                <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
                                                    <image>
                                                       <Image url="@zoomIn.png" />
                                                    </image>
@@ -239,7 +239,7 @@
                                           </Button>
                                           <Button fx:id="zoomOutButton" mnemonicParsing="false" onAction="#onZoomOut" styleClass="image-button" GridPane.rowIndex="4">
                                              <graphic>
-                                                <ImageView fitHeight="30.0" fitWidth="30.0" onDragDetected="#zoomInView" pickOnBounds="true" preserveRatio="true">
+                                                <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
                                                    <image>
                                                       <Image url="@zoomOut.png" />
                                                    </image>