Adding a zoom camera API to BowlerStudio static methods

CommonWealthRobotics · Apr 14, 2024 · 3ae0bb9 · 3ae0bb9
1 parent ad6a41c
commit 3ae0bb9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudio.java b/src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudio.java
@@ -890,4 +890,9 @@ public static void setCamera(TransformNR tf) {
 			CreatureLab3dController.getEngine().moveCamera(tfupde);
 		});
 	}
+	public static void zoomCamera(double increment) {
+		runLater(()->{
+			CreatureLab3dController.getEngine().zoomIncrement(increment);
+		});
+	}
 }
diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java b/src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java
@@ -1184,20 +1184,25 @@ public void handle(MouseEvent me) {
 		scene.addEventHandler(ScrollEvent.ANY, t -> {
 			if (ScrollEvent.SCROLL == t.getEventType()) {
 
-				double zoomFactor = -(t.getDeltaY()) * getVirtualcam().getZoomDepth() / 500;
-				//
-				// double z = camera.getTranslateY();
-				// double newZ = z + zoomFactor;
-				// camera.setTranslateY(newZ);
-				// System.out.println("Z = "+zoomFactor);
-
-				getVirtualcam().setZoomDepth(getVirtualcam().getZoomDepth() + zoomFactor);
+				double deltaY = t.getDeltaY();
+				zoomIncrement(deltaY);
 			}
 			t.consume();
 		});
 
 	}
 
+	public void zoomIncrement(double deltaY) {
+		double zoomFactor = -deltaY * getVirtualcam().getZoomDepth() / 500;
+		//
+		// double z = camera.getTranslateY();
+		// double newZ = z + zoomFactor;
+		// camera.setTranslateY(newZ);
+		// System.out.println("Z = "+zoomFactor);
+
+		getVirtualcam().setZoomDepth(getVirtualcam().getZoomDepth() + zoomFactor);
+	}
+
 	public void moveCamera(TransformNR newPose) {
 		getFlyingCamera().DriveArc(newPose);
 	}