chore: rearrange library dirs, gesture handler improvements

2024-09-26 15:52:23 +08:00
parent 26a8d9c6b5
commit 87c96d06a4
63 changed files with 4418 additions and 1669 deletions
--- a/thermion_dart/lib/thermion_dart.dart
+++ b/thermion_dart/lib/thermion_dart.dart
@@ -1,4 +1,5 @@
 library filament_dart;

+export 'thermion_dart/input/input.dart';
 export 'thermion_dart/thermion_viewer.dart';
 export 'thermion_dart/utils/geometry.dart';
--- a/thermion_dart/lib/thermion_dart/input/input.dart
+++ b/thermion_dart/lib/thermion_dart/input/input.dart
@@ -0,0 +1,5 @@
+library;
+
+export 'src/input_handler.dart';
+export 'src/delegates.dart';
+export 'src/delegate_gesture_handler.dart';
--- a/thermion_dart/lib/thermion_dart/input/src/delegate_gesture_handler.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/delegate_gesture_handler.dart
@@ -0,0 +1,237 @@
+import 'dart:async';
+import 'package:logging/logging.dart';
+import 'package:thermion_dart/thermion_dart/input/src/delegates.dart';
+import 'package:vector_math/vector_math_64.dart';
+
+import '../../viewer/thermion_viewer_base.dart';
+import 'implementations/fixed_orbit_camera_rotation_delegate.dart';
+import 'implementations/free_flight_camera_delegate.dart';
+import 'input_handler.dart';
+
+class DelegateInputHandler implements InputHandler {
+  final ThermionViewer viewer;
+
+  final _logger = Logger("DelegateInputHandler");
+
+  InputHandlerDelegate? transformDelegate;
+  PickDelegate? pickDelegate;
+
+  final Set<PhysicalKey> _pressedKeys = {};
+
+  final _inputDeltas = <InputType, Vector3>{};
+
+  Map<InputType, InputAction> _actions = {
+    InputType.LMB_HOLD_AND_MOVE: InputAction.TRANSLATE,
+    InputType.MMB_HOLD_AND_MOVE: InputAction.ROTATE,
+    InputType.SCROLLWHEEL: InputAction.TRANSLATE,
+    InputType.POINTER_MOVE: InputAction.NONE,
+    InputType.KEYDOWN_W: InputAction.TRANSLATE,
+    InputType.KEYDOWN_S: InputAction.TRANSLATE,
+    InputType.KEYDOWN_A: InputAction.TRANSLATE,
+    InputType.KEYDOWN_D: InputAction.TRANSLATE,
+  };
+
+  final _axes = <InputType, Matrix3>{};
+
+  void setTransformForAction(InputType inputType, Matrix3 transform) {
+    _axes[inputType] = transform;
+  }
+
+  DelegateInputHandler({
+    required this.viewer,
+    required this.transformDelegate,
+    this.pickDelegate,
+    Map<InputType, InputAction>? actions,
+  }) {
+    if (actions != null) {
+      _actions = actions;
+    }
+
+    for (var gestureType in InputType.values) {
+      _inputDeltas[gestureType] = Vector3.zero();
+    }
+
+    viewer.registerRequestFrameHook(process);
+  }
+
+  factory DelegateInputHandler.fixedOrbit(ThermionViewer viewer,
+          {double minimumDistance = 10.0,
+          double? Function(Vector3)? getDistanceToTarget,
+          ThermionEntity? entity,
+          PickDelegate? pickDelegate}) =>
+      DelegateInputHandler(
+          viewer: viewer,
+          pickDelegate: pickDelegate,
+          transformDelegate: FixedOrbitRotateInputHandlerDelegate(viewer,
+              getDistanceToTarget: getDistanceToTarget,
+              minimumDistance: minimumDistance),
+          actions: {
+            InputType.MMB_HOLD_AND_MOVE: InputAction.ROTATE,
+            InputType.SCROLLWHEEL: InputAction.TRANSLATE
+          });
+
+  factory DelegateInputHandler.flight(ThermionViewer viewer,
+          {PickDelegate? pickDelegate, bool freeLook=false}) =>
+      DelegateInputHandler(
+          viewer: viewer,
+          pickDelegate: pickDelegate,
+          transformDelegate: FreeFlightInputHandlerDelegate(viewer),
+          actions: {
+            InputType.MMB_HOLD_AND_MOVE: InputAction.ROTATE,
+            InputType.SCROLLWHEEL: InputAction.TRANSLATE,
+            InputType.LMB_HOLD_AND_MOVE: InputAction.TRANSLATE,
+            InputType.KEYDOWN_A: InputAction.TRANSLATE,
+            InputType.KEYDOWN_W: InputAction.TRANSLATE,
+            InputType.KEYDOWN_S: InputAction.TRANSLATE,
+            InputType.KEYDOWN_D: InputAction.TRANSLATE,
+            if(freeLook)
+            InputType.POINTER_MOVE: InputAction.ROTATE,
+          });
+
+  bool _processing = false;
+  Future<void> process() async {
+    _processing = true;
+    for (var gestureType in _inputDeltas.keys) {
+      var vector = _inputDeltas[gestureType]!;
+      var action = _actions[gestureType];
+      if (action == null) {
+        continue;
+      }
+      final transform = _axes[gestureType];
+      if (transform != null) {
+        vector = transform * vector;
+      }
+
+      await transformDelegate?.queue(action, vector);
+    }
+
+    for (final key in _pressedKeys) {
+      InputAction? keyAction;
+      Vector3? vector;
+
+      switch (key) {
+        case PhysicalKey.W:
+          keyAction = _actions[InputType.KEYDOWN_W];
+          vector = Vector3(0, 0, -1);
+          break;
+        case PhysicalKey.A:
+          keyAction = _actions[InputType.KEYDOWN_A];
+          vector = Vector3(-1, 0, 0);
+          break;
+        case PhysicalKey.S:
+          keyAction = _actions[InputType.KEYDOWN_S];
+          vector = Vector3(0, 0, 1);
+          break;
+        case PhysicalKey.D:
+          keyAction = _actions[InputType.KEYDOWN_D];
+          vector = Vector3(1, 0, 0);
+          break;
+      }
+      if (keyAction != null) {
+        var transform = _axes[keyAction];
+        if (transform != null) {
+          vector = transform * vector;
+        }
+        transformDelegate?.queue(keyAction, vector!);
+      }
+    }
+
+    await transformDelegate?.execute();
+    _inputDeltas.clear();
+    _processing = false;
+  }
+
+  @override
+  Future<void> onPointerDown(Vector2 localPosition, bool isMiddle) async {
+    if (!isMiddle) {
+      final action = _actions[InputType.LMB_DOWN];
+      switch (action) {
+        case InputAction.PICK:
+          pickDelegate?.pick(localPosition);
+        default:
+        // noop
+      }
+    }
+  }
+
+  @override
+  Future<void> onPointerMove(
+      Vector2 localPosition, Vector2 delta, bool isMiddle) async {
+    if (_processing) {
+      return;
+    }
+    if (isMiddle) {
+      _inputDeltas[InputType.MMB_HOLD_AND_MOVE] =
+          (_inputDeltas[InputType.MMB_HOLD_AND_MOVE] ?? Vector3.zero()) + Vector3(delta.x, delta.y, 0.0);
+    } else {
+      _inputDeltas[InputType.LMB_HOLD_AND_MOVE] =
+          (_inputDeltas[InputType.LMB_HOLD_AND_MOVE] ?? Vector3.zero()) + Vector3(delta.x, delta.y, 0.0);
+    }
+    // else {
+    //   _inputDeltas[InputType.POINTER_MOVE] =
+    //       (_inputDeltas[InputType.POINTER_MOVE] ?? Vector3.zero()) + delta;
+    // }
+  }
+
+  @override
+  Future<void> onPointerUp(bool isMiddle) async {}
+
+  @override
+  Future<void> onPointerHover(Vector2 localPosition, Vector2 delta) async {
+    if (_processing) {
+      return;
+    }
+    _inputDeltas[InputType.POINTER_MOVE] =
+        (_inputDeltas[InputType.POINTER_MOVE] ?? Vector3.zero()) + Vector3(delta.x, delta.y, 0.0);
+  }
+
+  @override
+  Future<void> onPointerScroll(
+      Vector2 localPosition, double scrollDelta) async {
+    if (_processing) {
+      return;
+    }
+    try {
+      _inputDeltas[InputType.SCROLLWHEEL] =
+          (_inputDeltas[InputType.SCROLLWHEEL] ?? Vector3.zero())
+              + Vector3(0,0, scrollDelta > 0 ? 1 : -1);
+    } catch (e) {
+      _logger.warning("Error during scroll accumulation: $e");
+    }
+  }
+
+  @override
+  Future dispose() async {
+    viewer.unregisterRequestFrameHook(process);
+  }
+
+  @override
+  Future<bool> get initialized => viewer.initialized;
+
+  @override
+  Future<void> onScaleEnd() async {}
+
+  @override
+  Future<void> onScaleStart() async {}
+
+  @override
+  Future<void> onScaleUpdate() async {}
+
+  @override
+  void setActionForType(InputType gestureType, InputAction gestureAction) {
+    _actions[gestureType] = gestureAction;
+  }
+
+  @override
+  InputAction? getActionForType(InputType gestureType) {
+    return _actions[gestureType];
+  }
+
+  void keyDown(PhysicalKey key) {
+    _pressedKeys.add(key);
+  }
+
+  void keyUp(PhysicalKey key) {
+    _pressedKeys.remove(key);
+  }
+}
--- a/thermion_dart/lib/thermion_dart/input/src/delegates.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/delegates.dart
@@ -0,0 +1,27 @@
+import 'package:vector_math/vector_math_64.dart';
+
+import 'input_handler.dart';
+
+abstract class InputHandlerDelegate {
+  Future queue(InputAction action, Vector3? delta);
+  Future execute();
+}
+
+abstract class VelocityDelegate {
+  Vector2? get velocity;
+
+  void updateVelocity(Vector2 delta);
+
+  void startDeceleration();
+
+  void stopDeceleration();
+
+  void dispose() {
+    stopDeceleration();
+  }
+}
+
+abstract class PickDelegate {
+  const PickDelegate();
+  void pick(Vector2 location);
+}
--- a/thermion_dart/lib/thermion_dart/input/src/implementations/default_keyboard_camera_flight_delegate.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/implementations/default_keyboard_camera_flight_delegate.dart
@@ -0,0 +1,87 @@
+// import 'dart:async';
+// import 'dart:ui';
+
+// import 'package:flutter/services.dart';
+// import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
+// import 'package:thermion_dart/thermion_dart/input/delegates.dart';
+// import 'package:vector_math/vector_math_64.dart';
+
+// class DefaultKeyboardCameraFlightDelegate
+//      {
+//   final ThermionViewer viewer;
+
+//   static const double _panSensitivity = 0.005;
+//   static const double _keyMoveSensitivity = 0.1;
+
+//   final Map<PhysicalKeyboardKey, bool> _pressedKeys = {};
+//   Timer? _moveTimer;
+
+//   DefaultKeyboardCameraFlightDelegate(this.viewer) {
+//     _startMoveLoop();
+//   }
+
+//   @override
+//   Future<void> panCamera(Offset delta, Vector2? velocity) async {
+//     double deltaX = delta.dx;
+//     double deltaY = delta.dy;
+//     deltaX *= _panSensitivity * viewer.pixelRatio;
+//     deltaY *= _panSensitivity * viewer.pixelRatio;
+
+//     await _moveCamera(deltaX, deltaY, 0);
+//   }
+
+//   @override
+//   Future<void> onKeypress(PhysicalKeyboardKey key) async {
+//     _pressedKeys[key] = true;
+//   }
+
+//   // New method to handle key release
+//   Future<void> onKeyRelease(PhysicalKeyboardKey key) async {
+//     _pressedKeys.remove(key);
+//   }
+
+//   void _startMoveLoop() {
+//     _moveTimer = Timer.periodic(
+//         Duration(milliseconds: 16), (_) => _processKeyboardInput());
+//   }
+
+//   Future<void> _processKeyboardInput() async {
+//     double dx = 0, dy = 0, dz = 0;
+
+//     if (_pressedKeys[PhysicalKeyboardKey.keyW] == true)
+//       dz += _keyMoveSensitivity;
+//     if (_pressedKeys[PhysicalKeyboardKey.keyS] == true)
+//       dz -= _keyMoveSensitivity;
+//     if (_pressedKeys[PhysicalKeyboardKey.keyA] == true)
+//       dx -= _keyMoveSensitivity;
+//     if (_pressedKeys[PhysicalKeyboardKey.keyD] == true)
+//       dx += _keyMoveSensitivity;
+
+//     if (dx != 0 || dy != 0 || dz != 0) {
+//       await _moveCamera(dx, dy, dz);
+//     }
+//     // Removed _pressedKeys.clear(); from here
+//   }
+
+//   Future<void> _moveCamera(double dx, double dy, double dz) async {
+//     Matrix4 currentModelMatrix = await viewer.getCameraModelMatrix();
+//     Vector3 currentPosition = currentModelMatrix.getTranslation();
+//     Quaternion currentRotation =
+//         Quaternion.fromRotation(currentModelMatrix.getRotation());
+
+//     Vector3 forward = Vector3(0, 0, -1)..applyQuaternion(currentRotation);
+//     Vector3 right = Vector3(1, 0, 0)..applyQuaternion(currentRotation);
+//     Vector3 up = Vector3(0, 1, 0)..applyQuaternion(currentRotation);
+
+//     Vector3 moveOffset = right * dx + up * dy + forward * dz;
+//     Vector3 newPosition = currentPosition + moveOffset;
+
+//     Matrix4 newModelMatrix =
+//         Matrix4.compose(newPosition, currentRotation, Vector3(1, 1, 1));
+//     await viewer.setCameraModelMatrix4(newModelMatrix);
+//   }
+
+//   void dispose() {
+//     _moveTimer?.cancel();
+//   }
+// }
--- a/thermion_dart/lib/thermion_dart/input/src/implementations/default_pan_camera_delegate.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/implementations/default_pan_camera_delegate.dart
@@ -4,12 +4,12 @@
 // import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart';
 // import 'package:vector_math/vector_math_64.dart';

-// class DefaultPanCameraDelegate implements PanCameraDelegate {
+// class DefaultPanInputHandlerDelegate implements PanInputHandlerDelegate {
 //   final ThermionViewer viewer;

 //   static const double _panSensitivity = 0.005;

-//   DefaultPanCameraDelegate(this.viewer);
+//   DefaultPanInputHandlerDelegate(this.viewer);
 //   static const double _panSensitivity = 0.005;

 //   @override
--- a/thermion_dart/lib/thermion_dart/input/src/implementations/fixed_orbit_camera_rotation_delegate.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/implementations/fixed_orbit_camera_rotation_delegate.dart
@@ -0,0 +1,131 @@
+import 'dart:async';
+import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
+import 'package:thermion_dart/thermion_dart/input/src/delegates.dart';
+import 'package:vector_math/vector_math_64.dart';
+import '../../../viewer/shared_types/camera.dart';
+import '../input_handler.dart';
+
+class FixedOrbitRotateInputHandlerDelegate implements InputHandlerDelegate {
+  final ThermionViewer viewer;
+  late Future<Camera> _camera;
+  final double minimumDistance;
+  double? Function(Vector3)? getDistanceToTarget;
+
+  Vector2 _queuedRotationDelta = Vector2.zero();
+  double _queuedZoomDelta = 0.0;
+
+  static final _up = Vector3(0, 1, 0);
+  Timer? _updateTimer;
+
+  FixedOrbitRotateInputHandlerDelegate(
+    this.viewer, {
+    this.getDistanceToTarget,
+    this.minimumDistance = 10.0,
+  }) {
+    _camera = viewer.getMainCamera();
+  }
+
+  void dispose() {
+    _updateTimer?.cancel();
+  }
+
+  @override
+  Future<void> queue(InputAction action, Vector3? delta) async {
+    if (delta == null) return;
+
+    switch (action) {
+      case InputAction.ROTATE:
+        _queuedRotationDelta += Vector2(delta.x, delta.y);
+        break;
+      case InputAction.TRANSLATE:
+        _queuedZoomDelta += delta!.z;
+        break;
+      case InputAction.PICK:
+        // Assuming PICK is used for zoom in this context
+        _queuedZoomDelta += delta.z;
+        break;
+      case InputAction.NONE:
+        // Do nothing
+        break;
+    }
+  }
+
+  @override
+  Future<void> execute() async {
+    if (_queuedRotationDelta.length2 == 0.0 && _queuedZoomDelta == 0.0) {
+      return;
+    }
+
+    var viewMatrix = await viewer.getCameraViewMatrix();
+    var modelMatrix = await viewer.getCameraModelMatrix();
+    var projectionMatrix = await viewer.getCameraProjectionMatrix();
+    var inverseProjectionMatrix = projectionMatrix.clone()..invert();
+    Vector3 currentPosition = modelMatrix.getTranslation();
+
+    Vector3 forward = -currentPosition.normalized();
+    Vector3 right = _up.cross(forward).normalized();
+    Vector3 up = forward.cross(right);
+
+    // Calculate intersection point and depth
+    double radius = getDistanceToTarget?.call(currentPosition) ?? 1.0;
+    if (radius != 1.0) {
+      radius = currentPosition.length - radius;
+    }
+    Vector3 intersection = (-forward).scaled(radius);
+
+    final intersectionInViewSpace = viewMatrix *
+        Vector4(intersection.x, intersection.y, intersection.z, 1.0);
+    final intersectionInClipSpace = projectionMatrix * intersectionInViewSpace;
+    final intersectionInNdcSpace =
+        intersectionInClipSpace / intersectionInClipSpace.w;
+
+    // Calculate new camera position based on rotation
+    final ndcX = 2 *
+        ((-_queuedRotationDelta.x * viewer.pixelRatio) /
+            viewer.viewportDimensions.$1);
+    final ndcY = 2 *
+        ((_queuedRotationDelta.y * viewer.pixelRatio) /
+            viewer.viewportDimensions.$2);
+    final ndc = Vector4(ndcX, ndcY, intersectionInNdcSpace.z, 1.0);
+
+    var clipSpace = Vector4(
+        ndc.x * intersectionInClipSpace.w,
+        ndcY * intersectionInClipSpace.w,
+        ndc.z * intersectionInClipSpace.w,
+        intersectionInClipSpace.w);
+    Vector4 cameraSpace = inverseProjectionMatrix * clipSpace;
+    Vector4 worldSpace = modelMatrix * cameraSpace;
+
+    var worldSpace3 = worldSpace.xyz.normalized() * currentPosition.length;
+    currentPosition = worldSpace3;
+
+    // Apply zoom
+    if (_queuedZoomDelta != 0.0) {
+      Vector3 toSurface = currentPosition - intersection;
+      currentPosition =
+          currentPosition + toSurface.scaled(_queuedZoomDelta * 0.1);
+    }
+
+    // Ensure minimum distance
+    if (currentPosition.length < radius + minimumDistance) {
+      currentPosition =
+          (currentPosition.normalized() * (radius + minimumDistance));
+    }
+
+    // Calculate view matrix
+    forward = -currentPosition.normalized();
+    right = _up.cross(forward).normalized();
+    up = forward.cross(right);
+
+    Matrix4 newViewMatrix = makeViewMatrix(currentPosition, Vector3.zero(), up);
+    newViewMatrix.invert();
+
+    // Set the camera model matrix
+    var camera = await _camera;
+    await camera.setModelMatrix(newViewMatrix);
+
+    // Reset queued deltas
+    _queuedRotationDelta = Vector2.zero();
+    _queuedZoomDelta = 0.0;
+  }
+}
--- a/thermion_dart/lib/thermion_dart/input/src/implementations/free_flight_camera_delegate.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/implementations/free_flight_camera_delegate.dart
@@ -0,0 +1,156 @@
+import 'dart:async';
+import 'package:thermion_dart/thermion_dart/input/src/input_handler.dart';
+import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
+import 'package:vector_math/vector_math_64.dart';
+import '../delegates.dart';
+
+class FreeFlightInputHandlerDelegate implements InputHandlerDelegate {
+  
+  final ThermionViewer viewer;
+  final Vector3? minBounds;
+  final Vector3? maxBounds;
+  final double rotationSensitivity;
+  final double movementSensitivity;
+  final double zoomSensitivity;
+  final double panSensitivity;
+
+  static final _up = Vector3(0, 1, 0);
+  static final _forward = Vector3(0, 0, -1);
+  static final Vector3 _right = Vector3(1, 0, 0);
+
+  Vector2 _queuedRotationDelta = Vector2.zero();
+  Vector2 _queuedPanDelta = Vector2.zero();
+  double _queuedZoomDelta = 0.0;
+  Vector3 _queuedMoveDelta = Vector3.zero();
+
+  FreeFlightInputHandlerDelegate(
+    this.viewer, {
+    this.minBounds,
+    this.maxBounds,
+    this.rotationSensitivity = 0.001,
+    this.movementSensitivity = 0.1,
+    this.zoomSensitivity = 0.1,
+    this.panSensitivity = 0.1,
+  });
+
+  @override
+  Future<void> queue(InputAction action, Vector3? delta) async {
+    if (delta == null) return;
+
+    switch (action) {
+      case InputAction.ROTATE:
+        _queuedRotationDelta += Vector2(delta.x, delta.y);
+        break;
+      case InputAction.TRANSLATE:
+        _queuedPanDelta += Vector2(delta.x, delta.y);
+        _queuedZoomDelta += delta.z;
+        break;
+      case InputAction.PICK:
+        // Assuming PICK is used for zoom in this context
+        _queuedZoomDelta += delta.z;
+        break;
+      case InputAction.NONE:
+        // Do nothing
+        break;
+    }
+  }
+
+  bool _executing = false;
+
+  @override
+  Future<void> execute() async {
+    if (_executing) {
+      return;
+    }
+
+    _executing = true;
+
+    if (_queuedRotationDelta.length2 == 0.0 &&
+        _queuedPanDelta.length2 == 0.0 &&
+        _queuedZoomDelta == 0.0 &&
+        _queuedMoveDelta.length2 == 0.0) {
+      _executing = false;
+      return;
+    }
+
+    Matrix4 currentModelMatrix = await viewer.getCameraModelMatrix();
+    Vector3 currentPosition = currentModelMatrix.getTranslation();
+    Quaternion currentRotation =
+        Quaternion.fromRotation(currentModelMatrix.getRotation());
+
+    // Apply rotation
+    if (_queuedRotationDelta.length2 > 0.0) {
+      double deltaX =
+          _queuedRotationDelta.x * rotationSensitivity * viewer.pixelRatio;
+      double deltaY =
+          _queuedRotationDelta.y * rotationSensitivity * viewer.pixelRatio;
+
+      Quaternion yawRotation = Quaternion.axisAngle(_up, -deltaX);
+      Quaternion pitchRotation = Quaternion.axisAngle(_right, -deltaY);
+
+      currentRotation = currentRotation * pitchRotation * yawRotation;
+      currentRotation.normalize();
+
+      _queuedRotationDelta = Vector2.zero();
+    }
+
+    // Apply pan
+    if (_queuedPanDelta.length2 > 0.0) {
+      Vector3 right = _right.clone()..applyQuaternion(currentRotation);
+      Vector3 up = _up.clone()..applyQuaternion(currentRotation);
+
+      double deltaX = _queuedPanDelta.x * panSensitivity * viewer.pixelRatio;
+      double deltaY = _queuedPanDelta.y * panSensitivity * viewer.pixelRatio;
+
+      Vector3 panOffset = right * deltaX + up * deltaY;
+      currentPosition += panOffset;
+
+      _queuedPanDelta = Vector2.zero();
+    }
+
+    // Apply zoom
+    if (_queuedZoomDelta != 0.0) {
+      Vector3 forward = _forward.clone()..applyQuaternion(currentRotation);
+      currentPosition += forward * -_queuedZoomDelta * zoomSensitivity;
+      _queuedZoomDelta = 0.0;
+    }
+
+    // Apply queued movement
+    if (_queuedMoveDelta.length2 > 0.0) {
+      Vector3 forward = _forward.clone()..applyQuaternion(currentRotation);
+      Vector3 right = _right.clone()..applyQuaternion(currentRotation);
+      Vector3 up = _up.clone()..applyQuaternion(currentRotation);
+
+      Vector3 moveOffset = right * _queuedMoveDelta.x +
+          up * _queuedMoveDelta.y +
+          forward * _queuedMoveDelta.z;
+      currentPosition += moveOffset;
+
+      _queuedMoveDelta = Vector3.zero();
+    }
+
+    // Constrain position
+    currentPosition = _constrainPosition(currentPosition);
+
+    // Update camera
+    Matrix4 newModelMatrix =
+        Matrix4.compose(currentPosition, currentRotation, Vector3(1, 1, 1));
+    await viewer.setCameraModelMatrix4(newModelMatrix);
+
+    _executing = false;
+  }
+
+  Vector3 _constrainPosition(Vector3 position) {
+    if (minBounds != null) {
+      position.x = position.x.clamp(minBounds!.x, double.infinity);
+      position.y = position.y.clamp(minBounds!.y, double.infinity);
+      position.z = position.z.clamp(minBounds!.z, double.infinity);
+    }
+    if (maxBounds != null) {
+      position.x = position.x.clamp(double.negativeInfinity, maxBounds!.x);
+      position.y = position.y.clamp(double.negativeInfinity, maxBounds!.y);
+      position.z = position.z.clamp(double.negativeInfinity, maxBounds!.z);
+    }
+    return position;
+  }
+}
--- a/thermion_dart/lib/thermion_dart/input/src/implementations/picking_camera_gesture_handler.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/implementations/picking_camera_gesture_handler.dart
@@ -0,0 +1,230 @@
+// import 'dart:async';
+
+// import 'package:flutter/gestures.dart';
+// import 'package:flutter/services.dart';
+// import 'package:logging/logging.dart';
+// import 'package:thermion_dart/thermion_dart/entities/abstract_gizmo.dart';
+// import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
+// import 'dart:ui';
+// import 'package:thermion_dart/thermion_dart/input/input_handler.dart';
+
+// // Renamed implementation
+// class PickingCameraGestureHandler implements InputHandler {
+//   final ThermionViewer viewer;
+//   final bool enableCamera;
+//   final bool enablePicking;
+//   final Logger _logger = Logger("PickingCameraGestureHandler");
+
+//   AbstractGizmo? _gizmo;
+//   Timer? _scrollTimer;
+//   ThermionEntity? _highlightedEntity;
+//   StreamSubscription<FilamentPickResult>? _pickResultSubscription;
+
+//   bool _gizmoAttached = false;
+
+//   PickingCameraGestureHandler({
+//     required this.viewer,
+//     this.enableCamera = true,
+//     this.enablePicking = true,
+//   }) {
+//     try {
+//       _gizmo = viewer.gizmo;
+//     } catch (err) {
+//       _logger.warning(
+//           "Failed to get gizmo. If you are running on WASM, this is expected");
+//     }
+
+//     _pickResultSubscription = viewer.pickResult.listen(_onPickResult);
+
+//     // Add keyboard listener
+//     RawKeyboard.instance.addListener(_handleKeyEvent);
+//   }
+
+//   @override
+//   ThermionGestureState get currentState => _currentState;
+
+//   void _handleKeyEvent(RawKeyEvent event) {
+//     if (event is RawKeyDownEvent &&
+//         event.logicalKey == LogicalKeyboardKey.escape) {
+//       _resetToNullState();
+//     }
+//   }
+
+//   void _resetToNullState() async {
+//     _currentState = ThermionGestureState.NULL;
+//     if (_highlightedEntity != null) {
+//       await viewer.removeStencilHighlight(_highlightedEntity!);
+//       _highlightedEntity = null;
+//     }
+//   }
+
+//   void _onPickResult(FilamentPickResult result) async {
+//     var targetEntity = await viewer.getAncestor(result.entity) ?? result.entity;
+
+//     if (_highlightedEntity != targetEntity) {
+//       if (_highlightedEntity != null) {
+//         await viewer.removeStencilHighlight(_highlightedEntity!);
+//       }
+
+//       _highlightedEntity = targetEntity;
+//       if (_highlightedEntity != null) {
+//         await viewer.setStencilHighlight(_highlightedEntity!);
+//         _gizmo?.attach(_highlightedEntity!);
+//       }
+//     }
+//   }
+
+//   @override
+//   Future<void> onPointerHover(Offset localPosition, Offset delta) async {
+//     if (_gizmoAttached) {
+//       _gizmo?.checkHover(localPosition.dx, localPosition.dy);
+//     }
+
+//     if (_highlightedEntity != null) {
+//       await viewer.queuePositionUpdateFromViewportCoords(
+//         _highlightedEntity!,
+//         localPosition.dx,
+//         localPosition.dy,
+//       );
+//     }
+//   }
+
+//   @override
+//   Future<void> onPointerScroll(Offset localPosition, double scrollDelta) async {
+//     if (!enableCamera) {
+//       return;
+//     }
+//     if (_currentState == ThermionGestureState.NULL ||
+//         _currentState == ThermionGestureState.ZOOMING) {
+//       await _zoom(localPosition, scrollDelta);
+//     }
+//   }
+
+//   @override
+//   Future<void> onPointerDown(Offset localPosition, int buttons) async {
+//     if (_highlightedEntity != null) {
+//       _resetToNullState();
+//       return;
+//     }
+
+//     if (enablePicking && buttons != kMiddleMouseButton) {
+//       viewer.pick(localPosition.dx.toInt(), localPosition.dy.toInt());
+//     }
+
+//     if (buttons == kMiddleMouseButton && enableCamera) {
+//       await viewer.rotateStart(localPosition.dx, localPosition.dy);
+//       _currentState = ThermionGestureState.ROTATING;
+//     } else if (buttons == kPrimaryMouseButton && enableCamera) {
+//       await viewer.panStart(localPosition.dx, localPosition.dy);
+//       _currentState = ThermionGestureState.PANNING;
+//     }
+//   }
+
+//   @override
+//   Future<void> onPointerMove(
+//       Offset localPosition, Offset delta, int buttons) async {
+//     if (_highlightedEntity != null) {
+//       await _handleEntityHighlightedMove(localPosition);
+//       return;
+//     }
+
+//     switch (_currentState) {
+//       case ThermionGestureState.NULL:
+//         break;
+
+//       case ThermionGestureState.ROTATING:
+//         if (enableCamera) {
+//           await viewer.rotateUpdate(localPosition.dx, localPosition.dy);
+//         }
+//         break;
+//       case ThermionGestureState.PANNING:
+//         if (enableCamera) {
+//           await viewer.panUpdate(localPosition.dx, localPosition.dy);
+//         }
+//         break;
+//       case ThermionGestureState.ZOOMING:
+//         // ignore
+//         break;
+//     }
+//   }
+
+//   @override
+//   Future<void> onPointerUp(int buttons) async {
+//     switch (_currentState) {
+//       case ThermionGestureState.ROTATING:
+//         await viewer.rotateEnd();
+//         _currentState = ThermionGestureState.NULL;
+//         break;
+//       case ThermionGestureState.PANNING:
+//         await viewer.panEnd();
+//         _currentState = ThermionGestureState.NULL;
+//         break;
+//       default:
+//         break;
+//     }
+//   }
+
+//   Future<void> _handleEntityHighlightedMove(Offset localPosition) async {
+//     if (_highlightedEntity != null) {
+//       await viewer.queuePositionUpdateFromViewportCoords(
+//         _highlightedEntity!,
+//         localPosition.dx,
+//         localPosition.dy,
+//       );
+//     }
+//   }
+
+//   Future<void> _zoom(Offset localPosition, double scrollDelta) async {
+//     _scrollTimer?.cancel();
+//     _currentState = ThermionGestureState.ZOOMING;
+//     await viewer.zoomBegin();
+//     await viewer.zoomUpdate(
+//         localPosition.dx, localPosition.dy, scrollDelta > 0 ? 1 : -1);
+
+//     _scrollTimer = Timer(const Duration(milliseconds: 100), () async {
+//       await viewer.zoomEnd();
+//       _currentState = ThermionGestureState.NULL;
+//     });
+//   }
+
+//   @override
+//   void dispose() {
+//     _pickResultSubscription?.cancel();
+//     if (_highlightedEntity != null) {
+//       viewer.removeStencilHighlight(_highlightedEntity!);
+//     }
+//     RawKeyboard.instance.removeListener(_handleKeyEvent);
+//   }
+
+//   @override
+//   Future<bool> get initialized => viewer.initialized;
+
+//   @override
+//   InputAction getActionForType(InputType type) {
+//     // TODO: implement getActionForType
+//     throw UnimplementedError();
+//   }
+
+//   @override
+//   Future<void> onScaleEnd() {
+//     // TODO: implement onScaleEnd
+//     throw UnimplementedError();
+//   }
+
+//   @override
+//   Future<void> onScaleStart() {
+//     // TODO: implement onScaleStart
+//     throw UnimplementedError();
+//   }
+
+//   @override
+//   Future<void> onScaleUpdate() {
+//     // TODO: implement onScaleUpdate
+//     throw UnimplementedError();
+//   }
+
+//   @override
+//   void setActionForType(InputType type, InputAction action) {
+//     // TODO: implement setActionForType
+//   }
+// }
--- a/thermion_dart/lib/thermion_dart/input/src/input_handler.dart
+++ b/thermion_dart/lib/thermion_dart/input/src/input_handler.dart
@@ -0,0 +1,47 @@
+import 'dart:async';
+
+import 'package:vector_math/vector_math_64.dart';
+
+enum InputType {
+  LMB_DOWN,
+  LMB_HOLD_AND_MOVE,
+  LMB_UP,
+  LMB_HOVER,
+  MMB_DOWN,
+  MMB_HOLD_AND_MOVE,
+
+  MMB_UP,
+  MMB_HOVER,
+  SCALE1,
+  SCALE2,
+  SCROLLWHEEL,
+  POINTER_MOVE,
+  KEYDOWN_W,
+  KEYDOWN_A,
+  KEYDOWN_S,
+  KEYDOWN_D,
+}
+
+enum PhysicalKey { W, A, S, D }
+
+enum InputAction { TRANSLATE, ROTATE, PICK, NONE }
+
+abstract class InputHandler {
+  
+  Future<void> onPointerHover(Vector2 localPosition, Vector2 delta);
+  Future<void> onPointerScroll(Vector2 localPosition, double scrollDelta);
+  Future<void> onPointerDown(Vector2 localPosition, bool isMiddle);
+  Future<void> onPointerMove(Vector2 localPosition, Vector2 delta, bool isMiddle);
+  Future<void> onPointerUp(bool isMiddle);
+  Future<void> onScaleStart();
+  Future<void> onScaleUpdate();
+  Future<void> onScaleEnd();
+  Future<bool> get initialized;
+  Future dispose();
+
+  void setActionForType(InputType gestureType, InputAction gestureAction);
+  InputAction? getActionForType(InputType gestureType);
+
+  void keyDown(PhysicalKey key);
+  void keyUp(PhysicalKey key);
+}
--- a/thermion_dart/lib/thermion_dart/viewer/ffi/src/camera_ffi.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/ffi/src/camera_ffi.dart
@@ -29,9 +29,24 @@ class ThermionFFICamera extends Camera {
    var entity = Camera_getEntity(camera);
    Engine_setTransform(engine, entity, matrix4ToDouble4x4(transform));
  }
-  
+
  @override
-  Future setLensProjection({double near = kNear, double far = kFar, double aspect = 1.0, double focalLength = kFocalLength}) async {
+  Future setLensProjection(
+      {double near = kNear,
+      double far = kFar,
+      double aspect = 1.0,
+      double focalLength = kFocalLength}) async {
    Camera_setLensProjection(camera, near, far, aspect, focalLength);
  }
+
+  @override
+  ThermionEntity getEntity() {
+    // TODO: implement getEntity
+    throw UnimplementedError();
+  }
+
+  @override
+  Future setModelMatrix(Matrix4 matrix) async {
+    Camera_setModelMatrix(camera, matrix4ToDouble4x4(matrix));
+  }
 }
--- a/thermion_dart/lib/thermion_dart/viewer/ffi/src/thermion_dart.g.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/ffi/src/thermion_dart.g.dart
@@ -915,6 +915,12 @@ external void Camera_setCustomProjectionWithCulling(
  double far,
 );

+@ffi.Native<ffi.Void Function(ffi.Pointer<TCamera>, double4x4)>(isLeaf: true)
+external void Camera_setModelMatrix(
+  ffi.Pointer<TCamera> camera,
+  double4x4 modelMatrix,
+);
+
@ffi.Native<
    ffi.Void Function(ffi.Pointer<TCamera>, ffi.Double, ffi.Double, ffi.Double,
        ffi.Double)>(isLeaf: true)
--- a/thermion_dart/lib/thermion_dart/viewer/ffi/src/thermion_viewer_ffi.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/ffi/src/thermion_viewer_ffi.dart
@@ -119,8 +119,7 @@ class ThermionViewerFFI extends ThermionViewer {
    if (focalLength.abs() < 0.1) {
      focalLength = kFocalLength;
    }
-    Camera_setLensProjection(
-        mainCamera.camera, near, far, aspect, focalLength);
+    Camera_setLensProjection(mainCamera.camera, near, far, aspect, focalLength);
  }

  Future createSwapChain(double width, double height,
@@ -1333,8 +1332,7 @@ class ThermionViewerFFI extends ThermionViewer {
  Future setCameraExposure(
      double aperture, double shutterSpeed, double sensitivity) async {
    var mainCamera = await getMainCamera() as ThermionFFICamera;
-    set_camera_exposure(
-        mainCamera.camera, aperture, shutterSpeed, sensitivity);
+    set_camera_exposure(mainCamera.camera, aperture, shutterSpeed, sensitivity);
  }

  ///
@@ -2167,7 +2165,10 @@ class ThermionViewerFFI extends ThermionViewer {
  }

  @override
-  void requestFrame() {
+  Future requestFrame() async {
+    for (final hook in _hooks) {
+      await hook.call();
+    }
    request_frame_render_thread(_viewer!);
  }

@@ -2187,6 +2188,22 @@ class ThermionViewerFFI extends ThermionViewer {
  Future setActiveCamera(ThermionFFICamera camera) async {
    SceneManager_setCamera(_sceneManager!, camera.camera);
  }
+
+  final _hooks = <Future Function()>[];
+
+  @override
+  Future registerRequestFrameHook(Future Function() hook) async {
+    if (!_hooks.contains(hook)) {
+      _hooks.add(hook);
+    }
+  }
+
+  @override
+  Future unregisterRequestFrameHook(Future Function() hook) async {
+    if (_hooks.contains(hook)) {
+      _hooks.remove(hook);
+    }
+  }
 }

 class ThermionFFITexture extends ThermionTexture {
--- a/thermion_dart/lib/thermion_dart/viewer/shared_types/camera.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/shared_types/camera.dart
@@ -9,10 +9,13 @@ abstract class Camera {
  Future setLensProjection(
      {double near = kNear,
      double far = kFar,
-      double aspect=1.0,
+      double aspect = 1.0,
      double focalLength = kFocalLength});

  Future<Matrix4> getModelMatrix();
+  Future setModelMatrix(Matrix4 matrix);
+
+  ThermionEntity getEntity();

  Future setTransform(Matrix4 transform);
 }
--- a/thermion_dart/lib/thermion_dart/viewer/shared_types/manipulator.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/shared_types/manipulator.dart
@@ -1,4 +1,4 @@
 // see filament Manipulator.h for more details
@Deprecated(
-    "This is used  the native pointer manipulator Prefer ThermionGestureHandler instead")
+    "This is used  the native pointer manipulator Prefer InputHandler instead")
 enum ManipulatorMode { ORBIT, MAP, FREE_FLIGHT }
--- a/thermion_dart/lib/thermion_dart/viewer/thermion_viewer_base.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/thermion_viewer_base.dart
@@ -66,7 +66,7 @@ abstract class ThermionViewer {
  ///
  /// Requests a single frame to be rendered. This is only intended to be used internally.
  ///
-  void requestFrame();
+  Future requestFrame();

  ///
  /// Render a single frame and copy the pixel buffer to [out].
@@ -748,7 +748,7 @@ abstract class ThermionViewer {
  /// Sets the options for manipulating the camera via the viewport.
  /// ManipulatorMode.FREE_FLIGHT and ManipulatorMode.MAP are currently unsupported and will throw an exception.
  ///
-  @Deprecated("Use ThermionGestureHandler instead")
+  @Deprecated("Use InputHandler instead")
  Future setCameraManipulatorOptions(
      {ManipulatorMode mode = ManipulatorMode.ORBIT,
      double orbitSpeedX = 0.01,
@@ -970,4 +970,14 @@ abstract class ThermionViewer {
  ///
  ///
  Future setActiveCamera(covariant Camera camera);
+
+  ///
+  ///
+  ///
+  Future registerRequestFrameHook(Future Function() hook);
+
+  ///
+  ///
+  ///
+  Future unregisterRequestFrameHook(Future Function() hook);
 }
--- a/thermion_dart/lib/thermion_dart/viewer/thermion_viewer_stub.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/thermion_viewer_stub.dart
@@ -944,8 +944,8 @@ class ThermionViewerStub extends ThermionViewer {
  }
  
  @override
-  void requestFrame() {
-    // TODO: implement requestFrame
+  Future requestFrame() {
+    throw UnimplementedError();
  }
  
  @override
@@ -965,6 +965,36 @@ class ThermionViewerStub extends ThermionViewer {
    // TODO: implement getMainCamera
    throw UnimplementedError();
  }
+  
+  @override
+  Future<Camera> createCamera() {
+    // TODO: implement createCamera
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future registerRenderHook(Future Function() hook) {
+    // TODO: implement registerRenderHook
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future setActiveCamera(covariant Camera camera) {
+    // TODO: implement setActiveCamera
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future registerRequestFrameHook(Future Function() hook) {
+    // TODO: implement registerRequestFrameHook
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future unregisterRequestFrameHook(Future Function() hook) {
+    // TODO: implement unregisterRequestFrameHook
+    throw UnimplementedError();
+  }

  
 }
--- a/thermion_dart/lib/thermion_dart/viewer/web_js/src/thermion_viewer_js.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/web_js/src/thermion_viewer_js.dart
@@ -1048,10 +1048,6 @@ class ThermionViewerJS implements ThermionViewer {
    throw UnimplementedError();
  }

-  @override
-  void requestFrame() {
-    // TODO: implement requestFrame
-  }

  @override
  // TODO: implement sceneUpdated
@@ -1080,4 +1076,34 @@ class ThermionViewerJS implements ThermionViewer {
    // TODO: implement setCameraLensProjection
    throw UnimplementedError();
  }
+  
+  @override
+  Future<Camera> createCamera() {
+    // TODO: implement createCamera
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future registerRequestFrameHook(Future Function() hook) {
+    // TODO: implement registerRequestFrameHook
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future requestFrame() {
+    // TODO: implement requestFrame
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future setActiveCamera(covariant Camera camera) {
+    // TODO: implement setActiveCamera
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future unregisterRequestFrameHook(Future Function() hook) {
+    // TODO: implement unregisterRequestFrameHook
+    throw UnimplementedError();
+  }
 }
--- a/thermion_dart/lib/thermion_dart/viewer/web_wasm/src/camera.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/web_wasm/src/camera.dart
@@ -1,6 +1,8 @@
 import 'package:thermion_dart/thermion_dart/viewer/shared_types/camera.dart';
 import 'package:vector_math/vector_math_64.dart';

+import '../../thermion_viewer_base.dart';
+
 class ThermionWasmCamera extends Camera {
  
  final int pointer;
@@ -13,4 +15,22 @@ class ThermionWasmCamera extends Camera {
    // TODO: implement setProjectionMatrixWithCulling
    throw UnimplementedError();
  }
+  
+  @override
+  Future<Matrix4> getModelMatrix() {
+    // TODO: implement getModelMatrix
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future setLensProjection({double near = kNear, double far = kFar, double aspect = 1.0, double focalLength = kFocalLength}) {
+    // TODO: implement setLensProjection
+    throw UnimplementedError();
+  }
+  
+  @override
+  Future setTransform(Matrix4 transform) {
+    // TODO: implement setTransform
+    throw UnimplementedError();
+  }
 }
--- a/thermion_dart/lib/thermion_dart/viewer/web_wasm/src/thermion_viewer_wasm.dart
+++ b/thermion_dart/lib/thermion_dart/viewer/web_wasm/src/thermion_viewer_wasm.dart
@@ -2446,7 +2446,7 @@ class ThermionViewerWasm implements ThermionViewer {
  }

  @override
-  void requestFrame() {
+  Future requestFrame() async {
    // TODO: implement requestFrame
  }

@@ -2478,4 +2478,32 @@ class ThermionViewerWasm implements ThermionViewer {
    // TODO: implement setCameraLensProjection
    throw UnimplementedError();
  }
+  
+  @override
+  Future<Camera> createCamera() {
+    // TODO: implement createCamera
+    throw UnimplementedError();
+  }
+    
+  @override
+  Future setActiveCamera(covariant Camera camera) {
+    // TODO: implement setActiveCamera
+    throw UnimplementedError();
+  }
+  
+  final _hooks = <Future Function()>[];
+
+  @override
+  Future registerRequestFrameHook(Future Function() hook) async {
+    if (!_hooks.contains(hook)) {
+      _hooks.add(hook);
+    }
+  }
+
+  @override
+  Future unregisterRequestFrameHook(Future Function() hook) async {
+    if (_hooks.contains(hook)) {
+      _hooks.remove(hook);
+    }
+  }
 }
--- a/thermion_dart/pubspec.yaml
+++ b/thermion_dart/pubspec.yaml
@@ -22,4 +22,6 @@ dev_dependencies:
  ffigen: ^12.0.0
  test:
  image:
-  path:
+  path:
+  mockito: ^5.0.0
+  build_runner: ^2.0.0
--- a/thermion_dart/test/assets/cube.glb
+++ b/thermion_dart/test/assets/cube.glb
--- a/thermion_dart/test/assets/cube_texture.svg
+++ b/thermion_dart/test/assets/cube_texture.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="600"
+   height="600"
+   viewBox="0 0 600 600"
+   version="1.1"
+   id="svg3369"
+   sodipodi:docname="cube_texture.svg"
+   inkscape:export-filename="cube_texture_512x512.png"
+   inkscape:export-xdpi="81.919998"
+   inkscape:export-ydpi="81.919998"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3373" />
+  <sodipodi:namedview
+     id="namedview3371"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.52625"
+     inkscape:cx="374.34679"
+     inkscape:cy="290.73634"
+     inkscape:window-width="1390"
+     inkscape:window-height="940"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3369" />
+  <rect
+     width="600"
+     height="600"
+     fill="white"
+     id="rect3333" />
+  <!-- Grid -->
+  <g
+     stroke="gray"
+     stroke-width="0.5"
+     id="g3343">
+    <line
+       x1="0"
+       y1="200"
+       x2="600"
+       y2="200"
+       id="line3335" />
+    <line
+       x1="0"
+       y1="400"
+       x2="600"
+       y2="400"
+       id="line3337" />
+    <line
+       x1="200"
+       y1="0"
+       x2="200"
+       y2="600"
+       id="line3339" />
+    <line
+       x1="400"
+       y1="0"
+       x2="400"
+       y2="600"
+       id="line3341" />
+  </g>
+  <!-- Top face -->
+  <rect
+     x="200"
+     y="0"
+     width="200"
+     height="200"
+     fill="blue"
+     fill-opacity="0.5"
+     stroke="black"
+     id="rect3345" />
+  <text
+     x="300"
+     y="100"
+     text-anchor="middle"
+     dominant-baseline="middle"
+     fill="black"
+     font-size="24"
+     id="text3347">Top</text>
+  <!-- Left face -->
+  <rect
+     x="0"
+     y="200"
+     width="200"
+     height="200"
+     fill="cyan"
+     fill-opacity="0.5"
+     stroke="black"
+     id="rect3349" />
+  <text
+     x="100"
+     y="300"
+     text-anchor="middle"
+     dominant-baseline="middle"
+     fill="black"
+     font-size="24"
+     id="text3351">Left</text>
+  <!-- Front face -->
+  <rect
+     x="200"
+     y="200"
+     width="200"
+     height="200"
+     fill="red"
+     fill-opacity="0.5"
+     stroke="black"
+     id="rect3353" />
+  <text
+     x="300"
+     y="300"
+     text-anchor="middle"
+     dominant-baseline="middle"
+     fill="black"
+     font-size="24"
+     id="text3355">Front</text>
+  <!-- Right face -->
+  <rect
+     x="400"
+     y="200"
+     width="200"
+     height="200"
+     fill="purple"
+     fill-opacity="0.5"
+     stroke="black"
+     id="rect3357" />
+  <text
+     x="500"
+     y="300"
+     text-anchor="middle"
+     dominant-baseline="middle"
+     fill="black"
+     font-size="24"
+     id="text3359">Right</text>
+  <!-- Bottom face -->
+  <rect
+     x="200"
+     y="400"
+     width="200"
+     height="200"
+     fill="yellow"
+     fill-opacity="0.5"
+     stroke="black"
+     id="rect3361" />
+  <text
+     x="300"
+     y="500"
+     text-anchor="middle"
+     dominant-baseline="middle"
+     fill="black"
+     font-size="24"
+     id="text3363">Bottom</text>
+  <!-- Back face -->
+  <rect
+     x="400"
+     y="400"
+     width="200"
+     height="200"
+     fill="green"
+     fill-opacity="0.5"
+     stroke="black"
+     id="rect3365" />
+  <text
+     x="500"
+     y="500"
+     text-anchor="middle"
+     dominant-baseline="middle"
+     fill="black"
+     font-size="24"
+     id="text3367">Back</text>
+</svg>
--- a/thermion_dart/test/assets/cube_texture_256x256.png
+++ b/thermion_dart/test/assets/cube_texture_256x256.png
--- a/thermion_dart/test/assets/cube_texture_512x512.png
+++ b/thermion_dart/test/assets/cube_texture_512x512.png
--- a/thermion_dart/test/camera_tests.dart
+++ b/thermion_dart/test/camera_tests.dart
@@ -0,0 +1,130 @@
+
+import 'package:thermion_dart/thermion_dart.dart';
+import 'package:test/test.dart';
+import 'package:thermion_dart/thermion_dart/utils/geometry.dart';
+import 'package:vector_math/vector_math_64.dart';
+import 'helpers.dart';
+
+void main() async {
+  final testHelper = TestHelper("integration");
+
+  group('camera', () {
+    test('getCameraModelMatrix, getCameraPosition, rotation', () async {
+      var viewer = await createViewer();
+      var matrix = await viewer.getCameraModelMatrix();
+      expect(matrix.trace(), 4);
+      await viewer.setCameraPosition(2.0, 2.0, 2.0);
+      matrix = await viewer.getCameraModelMatrix();
+      var position = matrix.getColumn(3).xyz;
+      expect(position.x, 2.0);
+      expect(position.y, 2.0);
+      expect(position.z, 2.0);
+
+      position = await viewer.getCameraPosition();
+      expect(position.x, 2.0);
+      expect(position.y, 2.0);
+      expect(position.z, 2.0);
+    });
+
+    test('getCameraViewMatrix', () async {
+      var viewer = await createViewer();
+
+      var modelMatrix = await viewer.getCameraModelMatrix();
+      var viewMatrix = await viewer.getCameraViewMatrix();
+
+      // The view matrix should be the inverse of the model matrix
+      var identity = modelMatrix * viewMatrix;
+      expect(identity.isIdentity(), isTrue);
+
+      // Check that moving the camera affects the view matrix
+      await viewer.setCameraPosition(3.0, 4.0, 5.0);
+      viewMatrix = await viewer.getCameraViewMatrix();
+      var invertedView = viewMatrix.clone()..invert();
+      var position = invertedView.getColumn(3).xyz;
+      expect(position.x, closeTo(3.0, 1e-6));
+      expect(position.y, closeTo(4.0, 1e-6));
+      expect(position.z, closeTo(5.0, 1e-6));
+    });
+
+    test('getCameraProjectionMatrix', () async {
+      var viewer = await createViewer();
+      var projectionMatrix = await viewer.getCameraProjectionMatrix();
+      print(projectionMatrix);
+    });
+
+    test('getCameraCullingProjectionMatrix', () async {
+      var viewer = await createViewer();
+      var matrix = await viewer.getCameraCullingProjectionMatrix();
+      print(matrix);
+      throw Exception("TODO");
+    });
+
+    test('getCameraFrustum', () async {
+      var viewer = await createViewer();
+      var frustum = await viewer.getCameraFrustum();
+      print(frustum.plane5.normal);
+      print(frustum.plane5.constant);
+
+      await viewer.setCameraLensProjection(
+          near: 10.0, far: 1000.0, aspect: 1.0, focalLength: 28.0);
+      frustum = await viewer.getCameraFrustum();
+      print(frustum.plane5.normal);
+      print(frustum.plane5.constant);
+    });
+
+    test('set custom projection/culling matrix', () async {
+      var viewer =
+          await createViewer(bg: kRed, cameraPosition: Vector3(0, 0, 4));
+      var camera = await viewer.getMainCamera();
+      final cube = await viewer.createGeometry(GeometryHelper.cube());
+
+      // cube is visible when inside the frustum, cube is visible
+      var projectionMatrix =
+          makeOrthographicMatrix(-10.0, 10.0, -10.0, 10.0, 0.05, 10000);
+      await camera.setProjectionMatrixWithCulling(
+          projectionMatrix, 0.05, 10000);
+      await testHelper.capture(
+          viewer, "camera_projection_culling_matrix_object_in_frustum");
+
+      // cube no longer visible when the far plane is moved closer to camera so cube is outside
+      projectionMatrix =
+          makeOrthographicMatrix(-10.0, 10.0, -10.0, 10.0, 0.05, 1);
+      await camera.setProjectionMatrixWithCulling(projectionMatrix, 0.05, 1);
+      await testHelper.capture(
+          viewer, "camera_projection_culling_matrix_object_outside_frustum");
+    });
+
+    test('setting camera transform updates model matrix', () async {
+      var viewer = await createViewer();
+
+      var cameraEntity = await viewer.getMainCameraEntity();
+      var camera = await viewer.getMainCamera();
+
+      await viewer.setPosition(cameraEntity, 1, 0, 0);
+
+      var modelMatrix = await viewer.getCameraModelMatrix();
+      expect(modelMatrix.getColumn(3).x, 1.0);
+      expect(modelMatrix.getColumn(3).y, 0.0);
+      expect(modelMatrix.getColumn(3).z, 0.0);
+      expect(modelMatrix.getColumn(3).w, 1.0);
+    });
+
+    test('create camera', () async {
+      var viewer = await createViewer();
+
+      await viewer.setCameraPosition(0, 0, 5);
+      await viewer.setBackgroundColor(1.0, 0.0, 1.0, 1.0);
+      await viewer.createGeometry(GeometryHelper.cube());
+      await testHelper.capture(viewer, "create_camera_main_camera");
+      var newCamera = await viewer.createCamera();
+      await newCamera.setTransform(Matrix4.translation(Vector3(0, 0, 4)));
+      newCamera.setLensProjection();
+      await viewer.setActiveCamera(newCamera);
+      await testHelper.capture(viewer, "create_camera_new_camera");
+      final mainCamera = await viewer.getMainCamera();
+      await viewer.setActiveCamera(mainCamera);
+      await testHelper.capture(viewer, "create_camera_back_to_main");
+    });
+  });
+
+}
--- a/thermion_dart/test/helpers.dart
+++ b/thermion_dart/test/helpers.dart
@@ -4,6 +4,7 @@ import 'dart:math';
 import 'package:image/image.dart' as img;
 import 'dart:typed_data';
 import 'package:ffi/ffi.dart';
+import 'package:image/image.dart';
 import 'package:thermion_dart/thermion_dart.dart';
 import 'package:thermion_dart/thermion_dart/swift/swift_bindings.g.dart';
 import 'package:thermion_dart/thermion_dart/utils/dart_resources.dart';
@@ -11,6 +12,10 @@ import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
 import 'package:thermion_dart/thermion_dart/viewer/ffi/src/thermion_dart.g.dart';
 import 'package:thermion_dart/thermion_dart/viewer/ffi/src/thermion_viewer_ffi.dart';
 import 'package:vector_math/vector_math_64.dart';
+import 'package:path/path.dart' as p;
+
+Color kWhite = ColorFloat32(4)..setRgba(1.0, 1.0, 1.0, 1.0);
+Color kRed = ColorFloat32(4)..setRgba(1.0, 0.0, 0.0, 1.0);

 /// Test files are run in a variety of ways, find this package root in all.
 ///
@@ -61,6 +66,31 @@ Future<Uint8List> savePixelBufferToBmp(
  return data;
 }

+class TestHelper {
+  late Directory outDir;
+
+  TestHelper(String dir) {
+    final packageUri = findPackageRoot('thermion_dart');
+    testDir = Directory("${packageUri.toFilePath()}/test").path;
+
+    var outDir = Directory("$testDir/output/${dir}");
+    // outDir.deleteSync(recursive: true);
+    outDir.createSync();
+  }
+
+  Future capture(ThermionViewer viewer, String outputFilename) async {
+    await Future.delayed(Duration(milliseconds: 10));
+    var outPath = p.join(outDir.path, "$outputFilename.bmp");
+    var pixelBuffer = await viewer.capture();
+    await savePixelBufferToBmp(
+        pixelBuffer,
+        viewer.viewportDimensions.$1.toInt(),
+        viewer.viewportDimensions.$2.toInt(),
+        outPath);
+    return pixelBuffer;
+  }
+}
+
 Future<Uint8List> pixelBufferToBmp(
    Uint8List pixelBuffer, int width, int height) async {
  final rowSize = (width * 3 + 3) & ~3;
--- a/thermion_dart/test/input_handlers.dart
+++ b/thermion_dart/test/input_handlers.dart
@@ -0,0 +1,119 @@
+import 'package:mockito/mockito.dart';
+import 'package:mockito/annotations.dart';
+import 'package:test/test.dart';
+import 'package:thermion_dart/thermion_dart/input/src/input_handler.dart';
+import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
+import 'package:thermion_dart/thermion_dart/input/src/implementations/fixed_orbit_camera_rotation_delegate.dart';
+import 'package:vector_math/vector_math_64.dart';
+
+// Generate mocks
+@GenerateMocks([ThermionViewer])
+import 'input_handlers.mocks.dart';
+
+void main() {
+  group('FixedOrbitRotateInputHandlerDelegate Tests', () {
+    late MockThermionViewer mockViewer;
+    late FixedOrbitRotateInputHandlerDelegate delegate;
+    late ThermionEntity mockEntity;
+
+    setUp(() {
+      mockViewer = MockThermionViewer();
+      mockEntity = 0;
+
+      // Setup mock methods
+      when(mockViewer.getMainCameraEntity()).thenAnswer((_) async => mockEntity);
+      when(mockViewer.getCameraViewMatrix()).thenAnswer((_) async => Matrix4.identity());
+      when(mockViewer.getCameraModelMatrix()).thenAnswer((_) async => Matrix4.translationValues(0, 0, 5));
+      when(mockViewer.getCameraProjectionMatrix()).thenAnswer((_) async => Matrix4.identity());
+      mockViewer.viewportDimensions = (800, 600);
+      mockViewer.pixelRatio = 1.0;
+
+      delegate = FixedOrbitRotateInputHandlerDelegate(
+        mockViewer,
+        entity: mockEntity,
+        minimumDistance: 1.0,
+      );
+    });
+
+    test('queue and execute rotation', () async {
+      await delegate.queue(InputAction.ROTATE, Vector3(0.1, 0.1, 0));
+      await delegate.execute();
+
+      verify(mockViewer.setTransform(any, captureThat(
+        predicate<Matrix4>((matrix) {
+          var translation = matrix.getTranslation();
+          var rotation = matrix.getRotation();
+
+          // Check if the camera has rotated
+          expect(rotation, isNot(equals(Matrix3.identity())));
+
+          // Check if the distance from origin is maintained
+          expect(translation.length, closeTo(5.0, 0.01));
+
+          return true;
+        })
+      ))).called(1);
+    });
+
+    test('queue and execute zoom', () async {
+      await delegate.queue(InputAction.PICK, Vector3(0, 0, 0.1));
+      await delegate.execute();
+
+      verify(mockViewer.setTransform(any, captureThat(
+        predicate<Matrix4>((matrix) {
+          var translation = matrix.getTranslation();
+
+          // Check if the camera has moved closer
+          expect(translation.length, lessThan(5.0));
+
+          return true;
+        })
+      ))).called(1);
+    });
+
+    test('respects minimum distance', () async {
+      when(mockViewer.getCameraModelMatrix()).thenAnswer((_) async => Matrix4.translationValues(0, 0, 1.5));
+      await delegate.queue(InputAction.PICK, Vector3(0, 0, -1));
+      await delegate.execute();
+
+      verify(mockViewer.setTransform(any, captureThat(
+        predicate<Matrix4>((matrix) {
+          var translation = matrix.getTranslation();
+
+          // Check if the camera distance is not less than the minimum distance
+          expect(translation.length, greaterThanOrEqualTo(1.0));
+
+          return true;
+        })
+      ))).called(1);
+    });
+
+    test('ignores translation in fixed orbit mode', () async {
+      await delegate.queue(InputAction.TRANSLATE, Vector3(1, 1, 1));
+      await delegate.execute();
+
+      verifyNever(mockViewer.setTransform(any, any));
+    });
+
+    test('combined rotation and zoom', () async {
+      await delegate.queue(InputAction.ROTATE, Vector3(0.1, 0.1, 0));
+      await delegate.queue(InputAction.PICK, Vector3(0, 0, 0.1));
+      await delegate.execute();
+
+      verify(mockViewer.setTransform(any, captureThat(
+        predicate<Matrix4>((matrix) {
+          var translation = matrix.getTranslation();
+          var rotation = matrix.getRotation();
+
+          // Check if the camera has rotated
+          expect(rotation, isNot(equals(Matrix3.identity())));
+
+          // Check if the camera has moved closer
+          expect(translation.length, lessThan(5.0));
+
+          return true;
+        })
+      ))).called(1);
+    });
+  });
+}
--- a/thermion_dart/test/input_handlers.mocks.dart
+++ b/thermion_dart/test/input_handlers.mocks.dart
--- a/thermion_dart/test/integration_test.dart
+++ b/thermion_dart/test/integration_test.dart
@@ -7,169 +7,27 @@ import 'package:image/image.dart';
 import 'package:thermion_dart/thermion_dart.dart';
 import 'package:test/test.dart';
 import 'package:animation_tools_dart/animation_tools_dart.dart';
-import 'package:path/path.dart' as p;
-import 'package:thermion_dart/thermion_dart/utils/geometry.dart';
 import 'package:thermion_dart/thermion_dart/viewer/events.dart';
 import 'package:thermion_dart/thermion_dart/viewer/ffi/src/thermion_viewer_ffi.dart';
 import 'package:vector_math/vector_math_64.dart';

 import 'helpers.dart';

-Color kWhite = ColorFloat32(4)..setRgba(1.0, 1.0, 1.0, 1.0);
-Color kRed = ColorFloat32(4)..setRgba(1.0, 0.0, 0.0, 1.0);
-
 void main() async {
-  final packageUri = findPackageRoot('thermion_dart');
-  testDir = Directory("${packageUri.toFilePath()}/test").path;
-
-  var outDir = Directory("$testDir/output");
-
-  // outDir.deleteSync(recursive: true);
-  outDir.createSync();
-
-  Future _capture(ThermionViewer viewer, String outputFilename) async {
-    await Future.delayed(Duration(milliseconds: 10));
-    var outPath = p.join(outDir.path, "$outputFilename.bmp");
-    var pixelBuffer = await viewer.capture();
-    await savePixelBufferToBmp(
-        pixelBuffer,
-        viewer.viewportDimensions.$1.toInt(),
-        viewer.viewportDimensions.$2.toInt(),
-        outPath);
-    return pixelBuffer;
-  }
-
-  group('camera', () {
-    test('getCameraModelMatrix, getCameraPosition, rotation', () async {
-      var viewer = await createViewer();
-      var matrix = await viewer.getCameraModelMatrix();
-      expect(matrix.trace(), 4);
-      await viewer.setCameraPosition(2.0, 2.0, 2.0);
-      matrix = await viewer.getCameraModelMatrix();
-      var position = matrix.getColumn(3).xyz;
-      expect(position.x, 2.0);
-      expect(position.y, 2.0);
-      expect(position.z, 2.0);
-
-      position = await viewer.getCameraPosition();
-      expect(position.x, 2.0);
-      expect(position.y, 2.0);
-      expect(position.z, 2.0);
-    });
-
-    test('getCameraViewMatrix', () async {
-      var viewer = await createViewer();
-
-      var modelMatrix = await viewer.getCameraModelMatrix();
-      var viewMatrix = await viewer.getCameraViewMatrix();
-
-      // The view matrix should be the inverse of the model matrix
-      var identity = modelMatrix * viewMatrix;
-      expect(identity.isIdentity(), isTrue);
-
-      // Check that moving the camera affects the view matrix
-      await viewer.setCameraPosition(3.0, 4.0, 5.0);
-      viewMatrix = await viewer.getCameraViewMatrix();
-      var invertedView = viewMatrix.clone()..invert();
-      var position = invertedView.getColumn(3).xyz;
-      expect(position.x, closeTo(3.0, 1e-6));
-      expect(position.y, closeTo(4.0, 1e-6));
-      expect(position.z, closeTo(5.0, 1e-6));
-    });
-
-    test('getCameraProjectionMatrix', () async {
-      var viewer = await createViewer();
-      var projectionMatrix = await viewer.getCameraProjectionMatrix();
-      print(projectionMatrix);
-    });
-
-    test('getCameraCullingProjectionMatrix', () async {
-      var viewer = await createViewer();
-      var matrix = await viewer.getCameraCullingProjectionMatrix();
-      print(matrix);
-      throw Exception("TODO");
-    });
-
-    test('getCameraFrustum', () async {
-      var viewer = await createViewer();
-      var frustum = await viewer.getCameraFrustum();
-      print(frustum.plane5.normal);
-      print(frustum.plane5.constant);
-
-      await viewer.setCameraLensProjection(
-          near: 10.0, far: 1000.0, aspect: 1.0, focalLength: 28.0);
-      frustum = await viewer.getCameraFrustum();
-      print(frustum.plane5.normal);
-      print(frustum.plane5.constant);
-    });
-
-    test('set custom projection/culling matrix', () async {
-      var viewer =
-          await createViewer(bg: kRed, cameraPosition: Vector3(0, 0, 4));
-      var camera = await viewer.getMainCamera();
-      final cube = await viewer.createGeometry(GeometryHelper.cube());
-
-      // cube is visible when inside the frustum, cube is visible
-      var projectionMatrix =
-          makeOrthographicMatrix(-10.0, 10.0, -10.0, 10.0, 0.05, 10000);
-      await camera.setProjectionMatrixWithCulling(
-          projectionMatrix, 0.05, 10000);
-      await _capture(
-          viewer, "camera_projection_culling_matrix_object_in_frustum");
-
-      // cube no longer visible when the far plane is moved closer to camera so cube is outside
-      projectionMatrix =
-          makeOrthographicMatrix(-10.0, 10.0, -10.0, 10.0, 0.05, 1);
-      await camera.setProjectionMatrixWithCulling(projectionMatrix, 0.05, 1);
-      await _capture(
-          viewer, "camera_projection_culling_matrix_object_outside_frustum");
-    });
-
-    test('setting camera transform updates model matrix', () async {
-      var viewer = await createViewer();
-
-      var cameraEntity = await viewer.getMainCameraEntity();
-      var camera = await viewer.getMainCamera();
-
-      await viewer.setPosition(cameraEntity, 1, 0, 0);
-
-      var modelMatrix = await viewer.getCameraModelMatrix();
-      expect(modelMatrix.getColumn(3).x, 1.0);
-      expect(modelMatrix.getColumn(3).y, 0.0);
-      expect(modelMatrix.getColumn(3).z, 0.0);
-      expect(modelMatrix.getColumn(3).w, 1.0);
-    });
-
-    test('create camera', () async {
-      var viewer = await createViewer();
-
-      await viewer.setCameraPosition(0, 0, 5);
-      await viewer.setBackgroundColor(1.0, 0.0, 1.0, 1.0);
-      await viewer.createGeometry(GeometryHelper.cube());
-      await _capture(viewer, "create_camera_main_camera");
-      var newCamera = await viewer.createCamera();
-      await newCamera.setTransform(Matrix4.translation(Vector3(0, 0, 4)));
-      newCamera.setLensProjection();
-      await viewer.setActiveCamera(newCamera);
-      await _capture(viewer, "create_camera_new_camera");
-      final mainCamera = await viewer.getMainCamera();
-      await viewer.setActiveCamera(mainCamera);
-      await _capture(viewer, "create_camera_back_to_main");
-    });
-  });
+  final testHelper = TestHelper("integration");

  group('background', () {
    test('set background color to solid green', () async {
      var viewer = await createViewer();
      await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
-      await _capture(viewer, "set_background_color_to_solid_green");
+      await testHelper.capture(viewer, "set_background_color_to_solid_green");
      await viewer.dispose();
    });

    test('set background color to full transparency', () async {
      var viewer = await createViewer();
      await viewer.setBackgroundColor(0.0, 1.0, 0.0, 0.0);
-      await _capture(viewer, "set_background_color_to_transparent_green");
+      await testHelper.capture(viewer, "set_background_color_to_transparent_green");
      await viewer.dispose();
    });

@@ -178,7 +36,7 @@ void main() async {
      await viewer.loadSkybox(
          "file:///$testDir/../../examples/assets/default_env/default_env_skybox.ktx");
      await Future.delayed(Duration(seconds: 1));
-      await _capture(viewer, "skybox");
+      await testHelper.capture(viewer, "skybox");
    });

    test('set background image', () async {
@@ -187,7 +45,7 @@ void main() async {
          .setBackgroundImage("file:///$testDir/cube_texture_512x512.png");
      await viewer.setPostProcessing(true);
      await viewer.setToneMapping(ToneMapper.LINEAR);
-      await _capture(viewer, "set_background_image");
+      await testHelper.capture(viewer, "set_background_image");
      await viewer.dispose();
    });
  });
@@ -201,7 +59,7 @@ void main() async {
      await viewer.setCameraPosition(0, 1, 5);
      await viewer
          .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
-      await _capture(viewer, "load_glb_from_file");
+      await testHelper.capture(viewer, "load_glb_from_file");
    });

    test('load glb from buffer', () async {
@@ -213,7 +71,7 @@ void main() async {
      await viewer.setCameraPosition(0, 1, 5);
      await viewer
          .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
-      await _capture(viewer, "load_glb_from_buffer");
+      await testHelper.capture(viewer, "load_glb_from_buffer");
    });

    test('load glb from buffer with priority', () async {
@@ -236,7 +94,7 @@ void main() async {
        await viewer.setMaterialPropertyFloat4(
            entity, "baseColorFactor", 0, 0, 1.0, 0.0, 1.0);
      }
-      await _capture(viewer, "load_glb_from_buffer_with_priority");
+      await testHelper.capture(viewer, "load_glb_from_buffer_with_priority");
    });
  });

@@ -370,7 +228,7 @@ void main() async {
      await viewer
          .createGeometry(GeometryHelper.cube(normals: false, uvs: false));

-      await _capture(viewer, "geometry_cube_no_uv_no_normal");
+      await testHelper.capture(viewer, "geometry_cube_no_uv_no_normal");
    });

    test('create cube (no normals)', () async {
@@ -384,7 +242,7 @@ void main() async {
      await viewer.setBackgroundColor(1.0, 0.0, 1.0, 1.0);
      await viewer
          .createGeometry(GeometryHelper.cube(normals: false, uvs: false));
-      await _capture(viewer, "geometry_cube_no_normals");
+      await testHelper.capture(viewer, "geometry_cube_no_normals");
    });

    test('create cube (with normals)', () async {
@@ -399,7 +257,7 @@ void main() async {
      await viewer.setBackgroundColor(1.0, 1.0, 1.0, 1.0);
      await viewer
          .createGeometry(GeometryHelper.cube(normals: true, uvs: false));
-      await _capture(viewer, "geometry_cube_with_normals");
+      await testHelper.capture(viewer, "geometry_cube_with_normals");
    });

    test('create cube with custom ubershader material instance (color)',
@@ -418,7 +276,7 @@ void main() async {
          materialInstance: materialInstance);
      await viewer.setMaterialPropertyFloat4(
          cube, "baseColorFactor", 0, 0.0, 1.0, 0.0, 0.0);
-      await _capture(viewer, "geometry_cube_with_custom_material_ubershader");
+      await testHelper.capture(viewer, "geometry_cube_with_custom_material_ubershader");
      await viewer.removeEntity(cube);
      await viewer.destroyMaterialInstance(materialInstance);
    });
@@ -440,7 +298,7 @@ void main() async {
          File("$testDir/cube_texture_512x512.png").readAsBytesSync();
      var texture = await viewer.createTexture(textureData);
      await viewer.applyTexture(texture as ThermionFFITexture, cube);
-      await _capture(
+      await testHelper.capture(
          viewer, "geometry_cube_with_custom_material_ubershader_texture");
      await viewer.removeEntity(cube);
      await viewer.destroyMaterialInstance(materialInstance);
@@ -464,7 +322,7 @@ void main() async {
          File("$testDir/cube_texture_512x512.png").readAsBytesSync();
      var texture = await viewer.createTexture(textureData);
      await viewer.applyTexture(texture, cube);
-      await _capture(
+      await testHelper.capture(
          viewer, "geometry_cube_with_custom_material_unlit_texture_only");
      await viewer.removeEntity(cube);

@@ -474,7 +332,7 @@ void main() async {
      await viewer.setMaterialPropertyInt(cube, "baseColorIndex", 0, -1);
      await viewer.setMaterialPropertyFloat4(
          cube, "baseColorFactor", 0, 0.0, 1.0, 0.0, 1.0);
-      await _capture(
+      await testHelper.capture(
          viewer, "geometry_cube_with_custom_material_unlit_color_only");
      await viewer.removeEntity(cube);

@@ -486,7 +344,7 @@ void main() async {
          cube, "baseColorFactor", 0, 0.0, 1.0, 0.0, 0.5);
      await viewer.applyTexture(texture, cube);

-      await _capture(
+      await testHelper.capture(
          viewer, "geometry_cube_with_custom_material_unlit_color_and_texture");

      await viewer.removeEntity(cube);
@@ -502,7 +360,7 @@ void main() async {
      await viewer.setCameraPosition(0, 0, 6);
      await viewer
          .createGeometry(GeometryHelper.sphere(normals: false, uvs: false));
-      await _capture(viewer, "geometry_sphere_no_normals");
+      await testHelper.capture(viewer, "geometry_sphere_no_normals");
    });
  });

@@ -525,16 +383,16 @@ void main() async {
      expect(materialInstance, isNotNull);

      // with depth write enabled on both materials, cube2 renders behind the white cube
-      await _capture(viewer, "material_instance_depth_write_enabled");
+      await testHelper.capture(viewer, "material_instance_depth_write_enabled");

      // if we disable depth write on cube1, then cube2 will always appear in front
      // (relying on insertion order)
      materialInstance!.setDepthWriteEnabled(false);
-      await _capture(viewer, "material_instance_depth_write_disabled");
+      await testHelper.capture(viewer, "material_instance_depth_write_disabled");

      // set priority for the cube1 cube to 7 (render) last, cube1 renders in front
      await viewer.setPriority(cube1, 7);
-      await _capture(
+      await testHelper.capture(
          viewer, "material_instance_depth_write_disabled_with_priority");
    });
  });
@@ -549,7 +407,7 @@ void main() async {
  //     await viewer
  //         .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
  //     await viewer.setRendering(true);
-  //     await _capture(viewer, "glb_create_instance");
+  //     await testHelper.capture(viewer, "glb_create_instance");
  //     await viewer.setRendering(false);
  //   });

@@ -605,10 +463,10 @@ void main() async {

      final cube = await viewer.createGeometry(GeometryHelper.cube());

-      await _capture(viewer, "set_material_float4_pre");
+      await testHelper.capture(viewer, "set_material_float4_pre");
      await viewer.setMaterialPropertyFloat4(
          cube, "baseColorFactor", 0, 0.0, 1.0, 0.0, 1.0);
-      await _capture(viewer, "set_material_float4_post");
+      await testHelper.capture(viewer, "set_material_float4_post");
    });
    test('set float material property for custom geometry', () async {
      var viewer = await createViewer();
@@ -622,9 +480,9 @@ void main() async {

      // this won't actually do anything because the default ubershader doesn't use specular/glossiness
      // but we can at least check that the call succeeds
-      await _capture(viewer, "set_material_specular_pre");
+      await testHelper.capture(viewer, "set_material_specular_pre");
      await viewer.setMaterialPropertyFloat(cube, "specularFactor", 0, 0.0);
-      await _capture(viewer, "set_material_specular_post");
+      await testHelper.capture(viewer, "set_material_specular_post");
    });

    test('set float material property (roughness) for custom geometry',
@@ -640,11 +498,11 @@ void main() async {

      // this won't actually do anything because the default ubershader doesn't use specular/glossiness
      // but we can at least check that the call succeeds
-      await _capture(viewer, "set_material_roughness_pre");
+      await testHelper.capture(viewer, "set_material_roughness_pre");

      await viewer.setMaterialPropertyFloat(cube, "metallicFactor", 0, 0.0);
      await viewer.setMaterialPropertyFloat(cube, "roughnessFactor", 0, 0.0);
-      await _capture(viewer, "set_material_roughness_post");
+      await testHelper.capture(viewer, "set_material_roughness_post");
    });
  });

@@ -703,7 +561,7 @@ void main() async {
      // we need an explicit render call here to process the transform queue
      await viewer.render();

-      await _capture(viewer, "set_position_from_viewport_coords");
+      await testHelper.capture(viewer, "set_position_from_viewport_coords");
    });
  });

@@ -714,11 +572,11 @@ void main() async {
      await viewer
          .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 8));
      await viewer.setCameraPosition(0, 2, 0);
-      await _capture(viewer, "grid_overlay_default");
+      await testHelper.capture(viewer, "grid_overlay_default");
      await viewer.setLayerVisibility(7, true);
-      await _capture(viewer, "grid_overlay_enabled");
+      await testHelper.capture(viewer, "grid_overlay_enabled");
      await viewer.setLayerVisibility(7, false);
-      await _capture(viewer, "grid_overlay_disabled");
+      await testHelper.capture(viewer, "grid_overlay_disabled");
    });

    test('load glb from buffer with layer', () async {
@@ -731,9 +589,9 @@ void main() async {

      var buffer = File("$testDir/cube.glb").readAsBytesSync();
      var model = await viewer.loadGlbFromBuffer(buffer, layer: 1);
-      await _capture(viewer, "load_glb_from_buffer_with_layer_disabled");
+      await testHelper.capture(viewer, "load_glb_from_buffer_with_layer_disabled");
      await viewer.setLayerVisibility(1, true);
-      await _capture(viewer, "load_glb_from_buffer_with_layer_enabled");
+      await testHelper.capture(viewer, "load_glb_from_buffer_with_layer_enabled");
    });

    test('change layer visibility at runtime', () async {
@@ -745,21 +603,21 @@ void main() async {
          .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));

      var cube = await viewer.createGeometry(GeometryHelper.cube());
-      await _capture(viewer, "change_layer_visibility_at_runtime_default");
+      await testHelper.capture(viewer, "change_layer_visibility_at_runtime_default");

      // all entities set to layer 0 by default, so this should now be invisible
      await viewer.setLayerVisibility(0, false);
-      await _capture(
+      await testHelper.capture(
          viewer, "change_layer_visibility_at_runtime_layer0_invisible");

      // now change the visibility layer to 5, should be invisible
      await viewer.setVisibilityLayer(cube, 5);
-      await _capture(
+      await testHelper.capture(
          viewer, "change_layer_visibility_at_runtime_layer5_invisible");

      // now toggle layer 5 visibility, cube should now be visible
      await viewer.setLayerVisibility(5, true);
-      await _capture(
+      await testHelper.capture(
          viewer, "change_layer_visibility_at_runtime_layer5_visible");
    });
  });
@@ -775,7 +633,7 @@ void main() async {
  //     await viewer
  //         .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
  //     await viewer.setRendering(true);
-  //     await _capture(viewer, "point_light");
+  //     await testHelper.capture(viewer, "point_light");
  //     await viewer.setRendering(false);
  //   });

@@ -791,7 +649,7 @@ void main() async {
  //     await viewer
  //         .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
  //     await viewer.setRendering(true);
-  //     await _capture(viewer, "move_point_light");
+  //     await testHelper.capture(viewer, "move_point_light");
  //     await viewer.setRendering(false);
  //   });

@@ -805,7 +663,7 @@ void main() async {
  //     await viewer
  //         .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
  //     await viewer.setRendering(true);
-  //     await _capture(viewer, "directional_light");
+  //     await testHelper.capture(viewer, "directional_light");
  //     await viewer.setRendering(false);
  //   });

@@ -820,7 +678,7 @@ void main() async {
  //     await viewer
  //         .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
  //     await viewer.setRendering(true);
-  //     await _capture(viewer, "set_directional_light_direction");
+  //     await testHelper.capture(viewer, "set_directional_light_direction");
  //     await viewer.setRendering(false);
  //   });

@@ -839,7 +697,7 @@ void main() async {
      await viewer
          .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), pi / 8));
      await viewer.setStencilHighlight(model);
-      await _capture(viewer, "stencil_highlight_glb");
+      await testHelper.capture(viewer, "stencil_highlight_glb");
    });

    test('set stencil highlight for geometry', () async {
@@ -853,11 +711,11 @@ void main() async {
      var cube = await viewer.createGeometry(GeometryHelper.cube());
      await viewer.setStencilHighlight(cube);

-      await _capture(viewer, "stencil_highlight_geometry");
+      await testHelper.capture(viewer, "stencil_highlight_geometry");

      await viewer.removeStencilHighlight(cube);

-      await _capture(viewer, "stencil_highlight_geometry_remove");
+      await testHelper.capture(viewer, "stencil_highlight_geometry_remove");
    });

    test('set stencil highlight for gltf asset', () async {
@@ -873,11 +731,11 @@ void main() async {

      await viewer.setStencilHighlight(cube1);

-      await _capture(viewer, "stencil_highlight_gltf");
+      await testHelper.capture(viewer, "stencil_highlight_gltf");

      await viewer.removeStencilHighlight(cube1);

-      await _capture(viewer, "stencil_highlight_gltf_removed");
+      await testHelper.capture(viewer, "stencil_highlight_gltf_removed");
    });

    test('set stencil highlight for multiple geometry ', () async {
@@ -894,12 +752,12 @@ void main() async {
      await viewer.setStencilHighlight(cube1);
      await viewer.setStencilHighlight(cube2, r: 0.0, g: 0.0, b: 1.0);

-      await _capture(viewer, "stencil_highlight_multiple_geometry");
+      await testHelper.capture(viewer, "stencil_highlight_multiple_geometry");

      await viewer.removeStencilHighlight(cube1);
      await viewer.removeStencilHighlight(cube2);

-      await _capture(viewer, "stencil_highlight_multiple_geometry_removed");
+      await testHelper.capture(viewer, "stencil_highlight_multiple_geometry_removed");
    });

    test('set stencil highlight for multiple gltf assets ', () async {
@@ -918,12 +776,12 @@ void main() async {
      await viewer.setStencilHighlight(cube1);
      await viewer.setStencilHighlight(cube2, r: 0.0, g: 0.0, b: 1.0);

-      await _capture(viewer, "stencil_highlight_multiple_geometry");
+      await testHelper.capture(viewer, "stencil_highlight_multiple_geometry");

      await viewer.removeStencilHighlight(cube1);
      await viewer.removeStencilHighlight(cube2);

-      await _capture(viewer, "stencil_highlight_multiple_geometry_removed");
+      await testHelper.capture(viewer, "stencil_highlight_multiple_geometry_removed");
    });
  });

@@ -959,7 +817,7 @@ void main() async {
      await viewer.applyTexture(texture, cube,
          materialIndex: 0, parameterName: "baseColorMap");

-      await _capture(viewer, "texture_applied_to_geometry");
+      await testHelper.capture(viewer, "texture_applied_to_geometry");

      await viewer.removeEntity(cube);
      await viewer.destroyTexture(texture);
@@ -976,136 +834,136 @@ void main() async {
    });
  });

-  group("unproject", () {
-    test("unproject", () async {
-      final dimensions = (width: 1280, height: 768);
+  // group("unproject", () {
+  //   test("unproject", () async {
+  //     final dimensions = (width: 1280, height: 768);

-      var viewer = await createViewer(viewportDimensions: dimensions);
-      await viewer.setPostProcessing(false);
-      // await viewer.setToneMapping(ToneMapper.LINEAR);
-      await viewer.setBackgroundColor(1.0, 1.0, 1.0, 1.0);
-      // await viewer.createIbl(1.0, 1.0, 1.0, 100000);
-      await viewer.addLight(LightType.SUN, 6500, 100000, -2, 0, 0, 1, -1, 0);
-      await viewer.addLight(LightType.SPOT, 6500, 500000, 0, 0, 2, 0, 0, -1,
-          falloffRadius: 10, spotLightConeInner: 1.0, spotLightConeOuter: 2.0);
+  //     var viewer = await createViewer(viewportDimensions: dimensions);
+  //     await viewer.setPostProcessing(false);
+  //     // await viewer.setToneMapping(ToneMapper.LINEAR);
+  //     await viewer.setBackgroundColor(1.0, 1.0, 1.0, 1.0);
+  //     // await viewer.createIbl(1.0, 1.0, 1.0, 100000);
+  //     await viewer.addLight(LightType.SUN, 6500, 100000, -2, 0, 0, 1, -1, 0);
+  //     await viewer.addLight(LightType.SPOT, 6500, 500000, 0, 0, 2, 0, 0, -1,
+  //         falloffRadius: 10, spotLightConeInner: 1.0, spotLightConeOuter: 2.0);

-      await viewer.setCameraPosition(-3, 4, 6);
-      await viewer.setCameraRotation(
-          Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
-              Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 6));
-      var cube =
-          await viewer.createGeometry(GeometryHelper.cube(), keepData: true);
-      await viewer.setMaterialPropertyFloat4(
-          cube, "baseColorFactor", 0, 1.0, 1.0, 1.0, 1.0);
-      var textureData =
-          File("$testDir/cube_texture_512x512.png").readAsBytesSync();
-      var texture = await viewer.createTexture(textureData);
-      await viewer.applyTexture(texture, cube,
-          materialIndex: 0, parameterName: "baseColorMap");
+  //     await viewer.setCameraPosition(-3, 4, 6);
+  //     await viewer.setCameraRotation(
+  //         Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
+  //             Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 6));
+  //     var cube =
+  //         await viewer.createGeometry(GeometryHelper.cube(), keepData: true);
+  //     await viewer.setMaterialPropertyFloat4(
+  //         cube, "baseColorFactor", 0, 1.0, 1.0, 1.0, 1.0);
+  //     var textureData =
+  //         File("$testDir/cube_texture_512x512.png").readAsBytesSync();
+  //     var texture = await viewer.createTexture(textureData);
+  //     await viewer.applyTexture(texture, cube,
+  //         materialIndex: 0, parameterName: "baseColorMap");

-      var numFrames = 60;
+  //     var numFrames = 60;

-      // first do the render
-      for (int i = 0; i < numFrames; i++) {
-        await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);
+  //     // first do the render
+  //     for (int i = 0; i < numFrames; i++) {
+  //       await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);

-        await viewer.setCameraRotation(
-            Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
-                Quaternion.axisAngle(
-                    Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));
+  //       await viewer.setCameraRotation(
+  //           Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
+  //               Quaternion.axisAngle(
+  //                   Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));

-        var rendered = await _capture(viewer, "unproject_render$i");
-        var renderPng =
-            await pixelsToPng(rendered, dimensions.width, dimensions.height);
+  //       var rendered = await testHelper.capture(viewer, "unproject_render$i");
+  //       var renderPng =
+  //           await pixelsToPng(rendered, dimensions.width, dimensions.height);

-        File("${outDir.path}/unproject_render${i}.png")
-            .writeAsBytesSync(renderPng);
-      }
+  //       File("${outDir.path}/unproject_render${i}.png")
+  //           .writeAsBytesSync(renderPng);
+  //     }

-      // then go off and convert the video
+  //     // then go off and convert the video

-      // now unproject the render back onto the geometry
-      final textureSize = (width: 1280, height: 768);
-      var pixels = <Uint8List>[];
-      // note we skip the first frame
-      for (int i = 0; i < numFrames; i++) {
-        await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);
+  //     // now unproject the render back onto the geometry
+  //     final textureSize = (width: 1280, height: 768);
+  //     var pixels = <Uint8List>[];
+  //     // note we skip the first frame
+  //     for (int i = 0; i < numFrames; i++) {
+  //       await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);

-        await viewer.setCameraRotation(
-            Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
-                Quaternion.axisAngle(
-                    Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));
+  //       await viewer.setCameraRotation(
+  //           Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
+  //               Quaternion.axisAngle(
+  //                   Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));

-        var input = pngToPixelBuffer(File(
-                "${outDir.path}/a8c317af-6081-4848-8a06-f6b69bc57664_${i + 1}.png")
-            .readAsBytesSync());
-        var pixelBuffer = await (await viewer as ThermionViewerFFI).unproject(
-            cube,
-            input,
-            dimensions.width,
-            dimensions.height,
-            textureSize.width,
-            textureSize.height);
+  //       var input = pngToPixelBuffer(File(
+  //               "${outDir.path}/a8c317af-6081-4848-8a06-f6b69bc57664_${i + 1}.png")
+  //           .readAsBytesSync());
+  //       var pixelBuffer = await (await viewer as ThermionViewerFFI).unproject(
+  //           cube,
+  //           input,
+  //           dimensions.width,
+  //           dimensions.height,
+  //           textureSize.width,
+  //           textureSize.height);

-        // var png = await pixelsToPng(Uint8List.fromList(pixelBuffer),
-        //     dimensions.width, dimensions.height);
+  //       // var png = await pixelsToPng(Uint8List.fromList(pixelBuffer),
+  //       //     dimensions.width, dimensions.height);

-        await savePixelBufferToBmp(
-            pixelBuffer,
-            textureSize.width,
-            textureSize.height,
-            p.join(outDir.path, "unprojected_texture${i}.bmp"));
+  //       await savePixelBufferToBmp(
+  //           pixelBuffer,
+  //           textureSize.width,
+  //           textureSize.height,
+  //           p.join(outDir.path, "unprojected_texture${i}.bmp"));

-        pixels.add(pixelBuffer);
+  //       pixels.add(pixelBuffer);

-        if (i > 10) {
-          break;
-        }
-      }
+  //       if (i > 10) {
+  //         break;
+  //       }
+  //     }

-      // }
+  //     // }

-      final aggregatePixelBuffer = medianImages(pixels);
-      await savePixelBufferToBmp(aggregatePixelBuffer, textureSize.width,
-          textureSize.height, "unproject_texture.bmp");
-      var pixelBufferPng = await pixelsToPng(
-          Uint8List.fromList(aggregatePixelBuffer),
-          dimensions.width,
-          dimensions.height);
-      File("${outDir.path}/unproject_texture.png")
-          .writeAsBytesSync(pixelBufferPng);
+  //     final aggregatePixelBuffer = medianImages(pixels);
+  //     await savePixelBufferToBmp(aggregatePixelBuffer, textureSize.width,
+  //         textureSize.height, "unproject_texture.bmp");
+  //     var pixelBufferPng = await pixelsToPng(
+  //         Uint8List.fromList(aggregatePixelBuffer),
+  //         dimensions.width,
+  //         dimensions.height);
+  //     File("${outDir.path}/unproject_texture.png")
+  //         .writeAsBytesSync(pixelBufferPng);

-      await viewer.setPostProcessing(true);
-      await viewer.setToneMapping(ToneMapper.LINEAR);
+  //     await viewer.setPostProcessing(true);
+  //     await viewer.setToneMapping(ToneMapper.LINEAR);

-      final unlit = await viewer.createUnlitMaterialInstance();
-      await viewer.removeEntity(cube);
-      cube = await viewer.createGeometry(GeometryHelper.cube(),
-          materialInstance: unlit);
-      var reconstructedTexture = await viewer.createTexture(pixelBufferPng);
-      await viewer.applyTexture(reconstructedTexture, cube);
+  //     final unlit = await viewer.createUnlitMaterialInstance();
+  //     await viewer.removeEntity(cube);
+  //     cube = await viewer.createGeometry(GeometryHelper.cube(),
+  //         materialInstance: unlit);
+  //     var reconstructedTexture = await viewer.createTexture(pixelBufferPng);
+  //     await viewer.applyTexture(reconstructedTexture, cube);

-      await viewer.setCameraRotation(
-          Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
-              Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 6));
-      await _capture(viewer, "unproject_reconstruct");
+  //     await viewer.setCameraRotation(
+  //         Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
+  //             Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 6));
+  //     await testHelper.capture(viewer, "unproject_reconstruct");

-      // now re-render
-      for (int i = 0; i < numFrames; i++) {
-        await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);
+  //     // now re-render
+  //     for (int i = 0; i < numFrames; i++) {
+  //       await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);

-        await viewer.setCameraRotation(
-            Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
-                Quaternion.axisAngle(
-                    Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));
+  //       await viewer.setCameraRotation(
+  //           Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
+  //               Quaternion.axisAngle(
+  //                   Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));

-        var rendered = await _capture(viewer, "unproject_rerender$i");
-        var renderPng =
-            await pixelsToPng(rendered, dimensions.width, dimensions.height);
+  //       var rendered = await testHelper.capture(viewer, "unproject_rerender$i");
+  //       var renderPng =
+  //           await pixelsToPng(rendered, dimensions.width, dimensions.height);

-        File("${outDir.path}/unproject_rerender${i}.png")
-            .writeAsBytesSync(renderPng);
-      }
-    }, timeout: Timeout(Duration(minutes: 2)));
-  });
+  //       File("${outDir.path}/unproject_rerender${i}.png")
+  //           .writeAsBytesSync(renderPng);
+  //     }
+  //   }, timeout: Timeout(Duration(minutes: 2)));
+  // });
 }
--- a/thermion_flutter/thermion_flutter/analysis_options.yaml
+++ b/thermion_flutter/thermion_flutter/analysis_options.yaml
@@ -1,4 +1,7 @@
 include: package:flutter_lints/flutter.yaml
+analyzer:
+  errors:
+    constant_identifier_names: ignore

 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_keyboard_camera_flight_delegate.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_keyboard_camera_flight_delegate.dart
@@ -1,87 +0,0 @@
-import 'dart:async';
-import 'dart:ui';
-
-import 'package:flutter/services.dart';
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-class DefaultKeyboardCameraFlightDelegate
-     {
-  final ThermionViewer viewer;
-
-  static const double _panSensitivity = 0.005;
-  static const double _keyMoveSensitivity = 0.1;
-
-  final Map<PhysicalKeyboardKey, bool> _pressedKeys = {};
-  Timer? _moveTimer;
-
-  DefaultKeyboardCameraFlightDelegate(this.viewer) {
-    _startMoveLoop();
-  }
-
-  @override
-  Future<void> panCamera(Offset delta, Vector2? velocity) async {
-    double deltaX = delta.dx;
-    double deltaY = delta.dy;
-    deltaX *= _panSensitivity * viewer.pixelRatio;
-    deltaY *= _panSensitivity * viewer.pixelRatio;
-
-    await _moveCamera(deltaX, deltaY, 0);
-  }
-
-  @override
-  Future<void> onKeypress(PhysicalKeyboardKey key) async {
-    _pressedKeys[key] = true;
-  }
-
-  // New method to handle key release
-  Future<void> onKeyRelease(PhysicalKeyboardKey key) async {
-    _pressedKeys.remove(key);
-  }
-
-  void _startMoveLoop() {
-    _moveTimer = Timer.periodic(
-        Duration(milliseconds: 16), (_) => _processKeyboardInput());
-  }
-
-  Future<void> _processKeyboardInput() async {
-    double dx = 0, dy = 0, dz = 0;
-
-    if (_pressedKeys[PhysicalKeyboardKey.keyW] == true)
-      dz += _keyMoveSensitivity;
-    if (_pressedKeys[PhysicalKeyboardKey.keyS] == true)
-      dz -= _keyMoveSensitivity;
-    if (_pressedKeys[PhysicalKeyboardKey.keyA] == true)
-      dx -= _keyMoveSensitivity;
-    if (_pressedKeys[PhysicalKeyboardKey.keyD] == true)
-      dx += _keyMoveSensitivity;
-
-    if (dx != 0 || dy != 0 || dz != 0) {
-      await _moveCamera(dx, dy, dz);
-    }
-    // Removed _pressedKeys.clear(); from here
-  }
-
-  Future<void> _moveCamera(double dx, double dy, double dz) async {
-    Matrix4 currentModelMatrix = await viewer.getCameraModelMatrix();
-    Vector3 currentPosition = currentModelMatrix.getTranslation();
-    Quaternion currentRotation =
-        Quaternion.fromRotation(currentModelMatrix.getRotation());
-
-    Vector3 forward = Vector3(0, 0, -1)..applyQuaternion(currentRotation);
-    Vector3 right = Vector3(1, 0, 0)..applyQuaternion(currentRotation);
-    Vector3 up = Vector3(0, 1, 0)..applyQuaternion(currentRotation);
-
-    Vector3 moveOffset = right * dx + up * dy + forward * dz;
-    Vector3 newPosition = currentPosition + moveOffset;
-
-    Matrix4 newModelMatrix =
-        Matrix4.compose(newPosition, currentRotation, Vector3(1, 1, 1));
-    await viewer.setCameraModelMatrix4(newModelMatrix);
-  }
-
-  void dispose() {
-    _moveTimer?.cancel();
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_pick_delegate.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_pick_delegate.dart
@@ -1,15 +0,0 @@
-import 'dart:ui';
-
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-
-class DefaultPickDelegate extends PickDelegate {
-  final ThermionViewer _viewer;
-
-  const DefaultPickDelegate(this._viewer);
-
-  @override
-  void pick(Offset location) {
-    _viewer.pick(location.dx.toInt(), location.dy.toInt());
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_velocity_delegate.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_velocity_delegate.dart
@@ -1,46 +0,0 @@
-import 'dart:async';
-import 'dart:ui';
-
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-class DefaultVelocityDelegate extends VelocityDelegate {
-  Vector2? _velocity;
-  Timer? _decelerationTimer;
-  final double _decelerationFactor = 0.95;
-  final double _minVelocity = 0.01;
-
-  Vector2? get velocity => _velocity;
-
-  @override
-  void updateVelocity(Offset delta) {
-    _velocity = Vector2(delta.dx, delta.dy);
-  }
-
-  @override
-  void startDeceleration() {
-    if (_velocity != null && _velocity!.length > _minVelocity) {
-      _decelerationTimer = Timer.periodic(Duration(milliseconds: 16), (timer) {
-        if (_velocity == null || _velocity!.length <= _minVelocity) {
-          stopDeceleration();
-          return;
-        }
-
-        _velocity = _velocity! * _decelerationFactor;
-
-      });
-    }
-  }
-
-  @override
-  void stopDeceleration() {
-    _decelerationTimer?.cancel();
-    _decelerationTimer = null;
-    _velocity = null;
-  }
-
-  @override
-  void dispose() {
-    stopDeceleration();
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_zoom_camera_delegate.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_zoom_camera_delegate.dart
@@ -1,47 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/widgets.dart';
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-class DefaultZoomCameraDelegate {
-  final ThermionViewer viewer;
-  final double zoomSensitivity;
-
-  final double? Function(Vector3 cameraPosition)? getDistanceToTarget;
-
-  DefaultZoomCameraDelegate(this.viewer,
-      {this.zoomSensitivity = 0.005, this.getDistanceToTarget});
-
-  ///
-  /// Converts the given [scrollDelta] (usually somewhere between 1 and -1) to
-  /// a percentage of the current camera distance (either to the origin,
-  /// or to a custom target) along its forward vector.
-  /// In other words, "shift "
-  ///
-  double calculateZoomFactor(
-      double scrollDelta, Vector2? velocity) {
-    double zoomFactor = scrollDelta * zoomSensitivity;
-    if (zoomFactor.abs() < 0.0001) {
-      zoomFactor = scrollDelta * zoomSensitivity;
-    }
-    return zoomFactor;
-  }
-
-  @override
-  Future<void> zoom(double scrollDelta, Vector2? velocity) async {
-    Matrix4 currentModelMatrix = await viewer.getCameraModelMatrix();
-    final cameraRotation = currentModelMatrix.getRotation();
-    final cameraPosition = currentModelMatrix.getTranslation();
-
-    Vector3 forwardVector = cameraRotation.getColumn(2);
-    forwardVector.normalize();
-
-    var zoomDistance =
-        calculateZoomFactor(scrollDelta, velocity);
-
-    Vector3 newPosition = cameraPosition + (forwardVector * zoomDistance);
-    await viewer.setCameraPosition(newPosition.x, newPosition.y, newPosition.z);
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/delegate_gesture_handler.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/delegate_gesture_handler.dart
@@ -1,245 +0,0 @@
-import 'dart:async';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/scheduler.dart';
-import 'package:flutter/services.dart';
-import 'package:logging/logging.dart';
-import 'package:thermion_flutter/src/gestures/default_pick_delegate.dart';
-import 'package:thermion_flutter/src/gestures/default_velocity_delegate.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-import 'package:thermion_flutter/src/gestures/fixed_orbit_camera_rotation_delegate.dart';
-import 'package:thermion_flutter/src/gestures/free_flight_camera_delegate.dart';
-import 'package:thermion_flutter/thermion_flutter.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-class DelegateGestureHandler implements ThermionGestureHandler {
-  final ThermionViewer viewer;
-  final Logger _logger = Logger("CustomGestureHandler");
-
-  CameraDelegate? cameraDelegate;
-  VelocityDelegate? velocityDelegate;
-  PickDelegate? pickDelegate;
-
-  Ticker? _ticker;
-
-  Map<GestureType, Offset> _accumulatedDeltas = {};
-  double _accumulatedScrollDelta = 0.0;
-  int _activePointers = 0;
-  bool _isMiddleMouseButtonPressed = false;
-
-  VoidCallback? _keyboardListenerDisposer;
-
-  final Map<GestureType, GestureAction> _actions = {
-    GestureType.LMB_HOLD_AND_MOVE: GestureAction.PAN_CAMERA,
-    GestureType.MMB_HOLD_AND_MOVE: GestureAction.ROTATE_CAMERA,
-    GestureType.SCROLLWHEEL: GestureAction.ZOOM_CAMERA,
-    GestureType.POINTER_MOVE: GestureAction.NONE,
-  };
-
-  DelegateGestureHandler({
-    required this.viewer,
-    required this.cameraDelegate,
-    required this.velocityDelegate,
-    this.pickDelegate,
-    Map<GestureType, GestureAction>? actions,
-  }) {
-    _initializeKeyboardListener();
-    if (actions != null) {
-      _actions.addAll(actions);
-    }
-    _initializeAccumulatedDeltas();
-  }
-
-  factory DelegateGestureHandler.fixedOrbit(ThermionViewer viewer,
-          {double minimumDistance = 10.0,
-          double? Function(Vector3)? getDistanceToTarget,
-          PickDelegate? pickDelegate}) =>
-      DelegateGestureHandler(
-        viewer: viewer,
-        pickDelegate: pickDelegate,
-        cameraDelegate: FixedOrbitRotateCameraDelegate(viewer,
-            getDistanceToTarget: getDistanceToTarget,
-            minimumDistance: minimumDistance),
-        velocityDelegate: DefaultVelocityDelegate(),
-        actions: {GestureType.MMB_HOLD_AND_MOVE:GestureAction.ROTATE_CAMERA}
-      );
-
-  factory DelegateGestureHandler.flight(ThermionViewer viewer,
-          {PickDelegate? pickDelegate}) =>
-      DelegateGestureHandler(
-        viewer: viewer,
-        pickDelegate: pickDelegate,
-        cameraDelegate: FreeFlightCameraDelegate(viewer),
-        velocityDelegate: DefaultVelocityDelegate(),
-        actions: {GestureType.POINTER_MOVE: GestureAction.ROTATE_CAMERA},
-      );
-
-  void _initializeAccumulatedDeltas() {
-    for (var gestureType in GestureType.values) {
-      _accumulatedDeltas[gestureType] = Offset.zero;
-    }
-  }
-
-  Future<void> _applyAccumulatedUpdates() async {
-    for (var gestureType in GestureType.values) {
-      Offset delta = _accumulatedDeltas[gestureType] ?? Offset.zero;
-      if (delta != Offset.zero) {
-        velocityDelegate?.updateVelocity(delta);
-
-        var action = _actions[gestureType];
-        switch (action) {
-          case GestureAction.PAN_CAMERA:
-            await cameraDelegate?.pan(delta, velocityDelegate?.velocity);
-            break;
-          case GestureAction.ROTATE_CAMERA:
-            await cameraDelegate?.rotate(delta, velocityDelegate?.velocity);
-            break;
-          case GestureAction.NONE:
-            // Do nothing
-            break;
-          default:
-            _logger.warning(
-                "Unsupported gesture action: $action for type: $gestureType");
-            break;
-        }
-
-        _accumulatedDeltas[gestureType] = Offset.zero;
-      }
-    }
-
-    if (_accumulatedScrollDelta != 0.0) {
-      await cameraDelegate?.zoom(
-          _accumulatedScrollDelta, velocityDelegate?.velocity);
-      _accumulatedScrollDelta = 0.0;
-    }
-  }
-
-  @override
-  Future<void> onPointerDown(Offset localPosition, int buttons) async {
-    velocityDelegate?.stopDeceleration();
-    _activePointers++;
-    if (buttons & kMiddleMouseButton != 0) {
-      _isMiddleMouseButtonPressed = true;
-    }
-    if (buttons & kPrimaryButton != 0) {
-      final action = _actions[GestureType.LMB_DOWN];
-      switch (action) {
-        case GestureAction.PICK_ENTITY:
-          pickDelegate?.pick(localPosition);
-        default:
-        // noop
-      }
-    }
-    await _applyAccumulatedUpdates();
-  }
-
-  @override
-  Future<void> onPointerMove(
-      Offset localPosition, Offset delta, int buttons) async {
-    GestureType gestureType = _getGestureTypeFromButtons(buttons);
-    if (gestureType == GestureType.MMB_HOLD_AND_MOVE ||
-        (_actions[GestureType.POINTER_MOVE] == GestureAction.ROTATE_CAMERA &&
-            gestureType == GestureType.POINTER_MOVE)) {
-      _accumulatedDeltas[GestureType.MMB_HOLD_AND_MOVE] =
-          (_accumulatedDeltas[GestureType.MMB_HOLD_AND_MOVE] ?? Offset.zero) +
-              delta;
-    } else {
-      _accumulatedDeltas[gestureType] =
-          (_accumulatedDeltas[gestureType] ?? Offset.zero) + delta;
-    }
-    await _applyAccumulatedUpdates();
-  }
-
-  @override
-  Future<void> onPointerUp(int buttons) async {
-    _activePointers--;
-    if (_activePointers == 0) {
-      velocityDelegate?.startDeceleration();
-    }
-    if (buttons & kMiddleMouseButton != 0) {
-      _isMiddleMouseButtonPressed = false;
-    }
-  }
-
-  GestureType _getGestureTypeFromButtons(int buttons) {
-    if (buttons & kPrimaryMouseButton != 0) {
-      return GestureType.LMB_HOLD_AND_MOVE;
-    }
-    if (buttons & kMiddleMouseButton != 0 || _isMiddleMouseButtonPressed) {
-      return GestureType.MMB_HOLD_AND_MOVE;
-    }
-    return GestureType.POINTER_MOVE;
-  }
-
-  @override
-  Future<void> onPointerHover(Offset localPosition, Offset delta) async {
-    if (_actions[GestureType.POINTER_MOVE] == GestureAction.ROTATE_CAMERA) {
-      _accumulatedDeltas[GestureType.POINTER_MOVE] =
-          (_accumulatedDeltas[GestureType.POINTER_MOVE] ?? Offset.zero) + delta;
-    }
-  }
-
-  @override
-  Future<void> onPointerScroll(Offset localPosition, double scrollDelta) async {
-    if (_actions[GestureType.SCROLLWHEEL] != GestureAction.ZOOM_CAMERA) {
-      throw Exception(
-          "Unsupported action: ${_actions[GestureType.SCROLLWHEEL]}");
-    }
-
-    try {
-      _accumulatedScrollDelta += scrollDelta;
-    } catch (e) {
-      _logger.warning("Error during scroll accumulation: $e");
-    }
-    await _applyAccumulatedUpdates();
-  }
-
-  @override
-  void dispose() {
-    velocityDelegate?.dispose();
-    _keyboardListenerDisposer?.call();
-    _ticker?.dispose();
-  }
-
-  @override
-  Future<bool> get initialized => viewer.initialized;
-
-  @override
-  Future<void> onScaleEnd() async {}
-
-  @override
-  Future<void> onScaleStart() async {}
-
-  @override
-  Future<void> onScaleUpdate() async {}
-
-  @override
-  void setActionForType(GestureType gestureType, GestureAction gestureAction) {
-    _actions[gestureType] = gestureAction;
-  }
-
-  @override
-  GestureAction? getActionForType(GestureType gestureType) {
-    return _actions[gestureType];
-  }
-
-  void _initializeKeyboardListener() {
-    HardwareKeyboard.instance.addHandler(_handleKeyEvent);
-    _keyboardListenerDisposer = () {
-      HardwareKeyboard.instance.removeHandler(_handleKeyEvent);
-    };
-  }
-
-  bool _handleKeyEvent(KeyEvent event) {
-    if (_actions[GestureType.KEYDOWN] == GestureAction.NONE) {
-      return false;
-    }
-    if (event is KeyDownEvent || event is KeyRepeatEvent) {
-      cameraDelegate?.onKeypress(event.physicalKey);
-      return true;
-    } else if (event is KeyUpEvent) {
-      cameraDelegate?.onKeyRelease(event.physicalKey);
-      return true;
-    }
-    return false;
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/delegates.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/delegates.dart
@@ -1,30 +0,0 @@
-import 'dart:ui';
-import 'package:flutter/services.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-abstract class CameraDelegate {
-  Future<void> rotate(Offset delta, Vector2? velocity);
-  Future<void> pan(Offset delta, Vector2? velocity);
-  Future<void> zoom(double yScrollDeltaInPixels, Vector2? velocity);
-  Future<void> onKeypress(PhysicalKeyboardKey key);
-  Future<void> onKeyRelease(PhysicalKeyboardKey key);
-}
-
-abstract class VelocityDelegate {
-  Vector2? get velocity;
-
-  void updateVelocity(Offset delta);
-
-  void startDeceleration();
-
-  void stopDeceleration();
-
-  void dispose() {
-    stopDeceleration();
-  }
-}
-
-abstract class PickDelegate {
-  const PickDelegate();
-  void pick(Offset location);
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/fixed_orbit_camera_rotation_delegate.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/fixed_orbit_camera_rotation_delegate.dart
@@ -1,150 +0,0 @@
-import 'dart:async';
-import 'dart:math';
-import 'package:flutter/services.dart';
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-/// A camera delegate that rotates the camera around the origin.
-/// Panning is not permitted; zooming is permitted (up to a minimum distance)
-///
-/// The rotation sensitivity will be automatically adjusted so that
-/// 100 horizontal pixels equates to a geodetic distance of 1m when the camera
-/// is 1m from the surface (denoted by distanceToSurface). This scales to 10m
-/// geodetic distance when the camera is 100m from the surface, 100m when the
-/// camera is 1000m from the surface, and so on.
-///
-///
-class FixedOrbitRotateCameraDelegate implements CameraDelegate {
-  final ThermionViewer viewer;
-  final double minimumDistance;
-  double? Function(Vector3)? getDistanceToTarget;
-
-  Offset _accumulatedRotationDelta = Offset.zero;
-  double _accumulatedZoomDelta = 0.0;
-
-  static final _up = Vector3(0, 1, 0);
-  Timer? _updateTimer;
-
-  FixedOrbitRotateCameraDelegate(
-    this.viewer, {
-    this.getDistanceToTarget,
-    this.minimumDistance = 10.0,
-  });
-
-  void dispose() {
-    _updateTimer?.cancel();
-  }
-
-  @override
-  Future<void> rotate(Offset delta, Vector2? velocity) async {
-    _accumulatedRotationDelta += delta;
-    await _applyAccumulatedUpdates();
-  }
-
-  @override
-  Future<void> pan(Offset delta, Vector2? velocity) {
-    throw UnimplementedError("Not supported in fixed orbit mode");
-  }
-
-  @override
-  Future<void> zoom(double yScrollDeltaInPixels, Vector2? velocity) async {
-    _accumulatedZoomDelta += yScrollDeltaInPixels > 0 ? 1 : -1;
-    await _applyAccumulatedUpdates();
-  }
-
-  Future<void> _applyAccumulatedUpdates() async {
-    if (_accumulatedRotationDelta.distanceSquared == 0.0 &&
-        _accumulatedZoomDelta == 0.0) {
-      return;
-    }
-
-    var viewMatrix = await viewer.getCameraViewMatrix();
-    var modelMatrix = await viewer.getCameraModelMatrix();
-    var projectionMatrix = await viewer.getCameraProjectionMatrix();
-    var inverseProjectionMatrix = projectionMatrix.clone()..invert();
-    Vector3 currentPosition = modelMatrix.getTranslation();
-
-    Vector3 forward = -currentPosition.normalized();
-    Vector3 right = _up.cross(forward).normalized();
-    Vector3 up = forward.cross(right);
-
-    // first, we find the point in the sphere that intersects with the camera
-    // forward vector
-    double radius = 0.0;
-    double? distanceToTarget = getDistanceToTarget?.call(currentPosition);
-    if (distanceToTarget != null) {
-      radius = currentPosition.length - distanceToTarget;
-    } else {
-      radius = 1.0;
-    }
-    Vector3 intersection = (-forward).scaled(radius);
-
-    // next, calculate the depth value at that intersection point
-    final intersectionInViewSpace = viewMatrix *
-        Vector4(intersection.x, intersection.y, intersection.z, 1.0);
-    final intersectionInClipSpace = projectionMatrix * intersectionInViewSpace;
-    final intersectionInNdcSpace =
-        intersectionInClipSpace / intersectionInClipSpace.w;
-
-    // using that depth value, find the world space position of the mouse
-    // note we flip the signs of the X and Y values
-
-    final ndcX = 2 *
-        ((-_accumulatedRotationDelta.dx * viewer.pixelRatio) /
-            viewer.viewportDimensions.$1);
-    final ndcY = 2 *
-        ((_accumulatedRotationDelta.dy * viewer.pixelRatio) /
-            viewer.viewportDimensions.$2);
-    final ndc = Vector4(ndcX, ndcY, intersectionInNdcSpace.z, 1.0);
-
-    var clipSpace = Vector4(
-        ndc.x * intersectionInClipSpace.w,
-        ndcY * intersectionInClipSpace.w,
-        ndc.z * intersectionInClipSpace.w,
-        intersectionInClipSpace.w);
-    Vector4 cameraSpace = inverseProjectionMatrix * clipSpace;
-    Vector4 worldSpace = modelMatrix * cameraSpace;
-
-    // the new camera world space position will be that position,
-    // scaled to the camera's current distance
-    var worldSpace3 = worldSpace.xyz.normalized() * currentPosition.length;
-    currentPosition = worldSpace3;
-
-    // Apply zoom
-    if (_accumulatedZoomDelta != 0.0) {
-      // double zoomFactor = 1.0 + ();
-      Vector3 toSurface = currentPosition - intersection;
-      currentPosition = currentPosition + toSurface.scaled(_accumulatedZoomDelta * 0.1);
-      _accumulatedZoomDelta = 0.0;
-    }
-
-    // Ensure minimum distance
-    if (currentPosition.length < radius + minimumDistance) {
-      currentPosition =
-          (currentPosition.normalized() * (radius + minimumDistance));
-    }
-
-    // Calculate view matrix
-    forward = -currentPosition.normalized();
-    right = _up.cross(forward).normalized();
-    up = forward.cross(right);
-
-    Matrix4 newViewMatrix = makeViewMatrix(currentPosition, Vector3.zero(), up);
-    newViewMatrix.invert();
-
-    // Set the camera model matrix
-    await viewer.setCameraModelMatrix4(newViewMatrix);
-    _accumulatedRotationDelta = Offset.zero;
-  }
-
-  @override
-  Future<void> onKeyRelease(PhysicalKeyboardKey key) async {
-    // Ignore
-  }
-
-  @override
-  Future<void> onKeypress(PhysicalKeyboardKey key) async {
-    // Ignore
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/free_flight_camera_delegate.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/free_flight_camera_delegate.dart
@@ -1,206 +0,0 @@
-import 'dart:async';
-import 'dart:ui';
-
-import 'package:flutter/scheduler.dart';
-import 'package:flutter/services.dart';
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-import 'package:vector_math/vector_math_64.dart';
-
-class FreeFlightCameraDelegate implements CameraDelegate {
-  final ThermionViewer viewer;
-  
-  final Vector3? minBounds;
-  final Vector3? maxBounds;
-
-  final double rotationSensitivity;
-  final double movementSensitivity;
-  final double zoomSensitivity;
-  final double panSensitivity;
-  final double keyMoveSensitivity;
-
-  static final _up = Vector3(0, 1, 0);
-  static final _forward = Vector3(0, 0, -1);
-  static final Vector3 _right = Vector3(1, 0, 0);
-
-  Offset _accumulatedRotation = Offset.zero;
-  Offset _accumulatedPan = Offset.zero;
-  double _accumulatedZoom = 0.0;
-  Vector2? _lastVelocity;
-
-  Ticker? _ticker;
-  Timer? _moveTimer;
-  final Map<PhysicalKeyboardKey, bool> _pressedKeys = {};
-
-  FreeFlightCameraDelegate(
-    this.viewer, {
-    this.minBounds,
-    this.maxBounds,
-    this.rotationSensitivity = 0.001,
-    this.movementSensitivity = 0.1,
-    this.zoomSensitivity = 0.1,
-    this.panSensitivity = 0.01,
-    this.keyMoveSensitivity = 0.1,
-  }) {
-    _initializeTicker();
-    _startMoveLoop();
-  }
-
-  void _initializeTicker() {
-    _ticker = Ticker(_onTick);
-    _ticker!.start();
-  }
-
-  void _startMoveLoop() {
-    _moveTimer = Timer.periodic(
-        Duration(milliseconds: 16), (_) => _processKeyboardInput());
-  }
-
-  void _onTick(Duration elapsed) {
-    _applyAccumulatedUpdates();
-  }
-
-  Future<void> _applyAccumulatedUpdates() async {
-    if (_accumulatedRotation != Offset.zero ||
-        _accumulatedPan != Offset.zero ||
-        _accumulatedZoom != 0.0) {
-      Matrix4 currentModelMatrix = await viewer.getCameraModelMatrix();
-      Vector3 currentPosition = currentModelMatrix.getTranslation();
-      Quaternion currentRotation =
-          Quaternion.fromRotation(currentModelMatrix.getRotation());
-
-      // Apply rotation
-      if (_accumulatedRotation != Offset.zero) {
-        double deltaX = _accumulatedRotation.dx * rotationSensitivity * viewer.pixelRatio;
-        double deltaY = _accumulatedRotation.dy * rotationSensitivity * viewer.pixelRatio;
-        double deltaZ = (_accumulatedRotation.dx + _accumulatedRotation.dy) * rotationSensitivity * 0.5 * viewer.pixelRatio;
-
-        Quaternion yawRotation = Quaternion.axisAngle(_up, -deltaX);
-        Quaternion pitchRotation = Quaternion.axisAngle(_right, -deltaY);
-        Quaternion rollRotation = Quaternion.axisAngle(_forward, deltaZ);
-
-        currentRotation = currentRotation * rollRotation * pitchRotation * yawRotation ;
-        currentRotation.normalize();
-
-        _accumulatedRotation = Offset.zero;
-      }
-
-      // Apply pan
-      if (_accumulatedPan != Offset.zero) {
-        Vector3 right = _right.clone()..applyQuaternion(currentRotation);
-        Vector3 up = _up.clone()..applyQuaternion(currentRotation);
-        
-        double deltaX = _accumulatedPan.dx * panSensitivity * viewer.pixelRatio;
-        double deltaY = _accumulatedPan.dy * panSensitivity * viewer.pixelRatio;
-
-        Vector3 newPosition = currentPosition + right * -deltaX + up * deltaY;
-        newPosition = _constrainPosition(newPosition);
-
-        currentPosition = newPosition;
-
-        _accumulatedPan = Offset.zero;
-      }
-
-      // Apply zoom
-      if (_accumulatedZoom != 0.0) {
-        Vector3 forward = _forward.clone()..applyQuaternion(currentRotation);
-        Vector3 newPosition = currentPosition + forward * _accumulatedZoom * zoomSensitivity;
-        newPosition = _constrainPosition(newPosition);
-
-        currentPosition = newPosition;
-        _accumulatedZoom = 0.0;
-      }
-
-      Matrix4 newModelMatrix =
-          Matrix4.compose(currentPosition, currentRotation, Vector3(1, 1, 1));
-      await viewer.setCameraModelMatrix4(newModelMatrix);
-    }
-  }
-
-  Vector3 _constrainPosition(Vector3 position) {
-    if (minBounds != null) {
-      position.x = position.x.clamp(minBounds!.x, double.infinity);
-      position.y = position.y.clamp(minBounds!.y, double.infinity);
-      position.z = position.z.clamp(minBounds!.z, double.infinity);
-    }
-    if (maxBounds != null) {
-      position.x = position.x.clamp(double.negativeInfinity, maxBounds!.x);
-      position.y = position.y.clamp(double.negativeInfinity, maxBounds!.y);
-      position.z = position.z.clamp(double.negativeInfinity, maxBounds!.z);
-    }
-    return position;
-  }
-
-  @override
-  Future<void> rotate(Offset delta, Vector2? velocity) async {
-    _accumulatedRotation += delta;
-    _lastVelocity = velocity;
-  }
-
-  @override
-  Future<void> pan(Offset delta, Vector2? velocity) async {
-    _accumulatedPan += delta;
-    _lastVelocity = velocity;
-  }
-
-  @override
-  Future<void> zoom(double scrollDelta, Vector2? velocity) async {
-    _accumulatedZoom -= scrollDelta;
-    _lastVelocity = velocity;
-  }
-
-  @override
-  Future<void> onKeypress(PhysicalKeyboardKey key) async {
-    _pressedKeys[key] = true;
-  }
-  
-  @override
-  Future<void> onKeyRelease(PhysicalKeyboardKey key) async {
-    _pressedKeys.remove(key);
-  }
-
-  Future<void> _processKeyboardInput() async {
-    double dx = 0, dy = 0, dz = 0;
-
-    if (_pressedKeys[PhysicalKeyboardKey.keyW] == true) {
-      dz += keyMoveSensitivity;
-    }
-    if (_pressedKeys[PhysicalKeyboardKey.keyS] == true) {
-      dz -= keyMoveSensitivity;
-    }
-    if (_pressedKeys[PhysicalKeyboardKey.keyA] == true) {
-      dx -= keyMoveSensitivity;
-    }
-    if (_pressedKeys[PhysicalKeyboardKey.keyD] == true) {
-      dx += keyMoveSensitivity;
-    }
-
-    if (dx != 0 || dy != 0 || dz != 0) {
-      await _moveCamera(dx, dy, dz);
-    }
-  }
-
-  Future<void> _moveCamera(double dx, double dy, double dz) async {
-    Matrix4 currentModelMatrix = await viewer.getCameraModelMatrix();
-    Vector3 currentPosition = currentModelMatrix.getTranslation();
-    Quaternion currentRotation =
-        Quaternion.fromRotation(currentModelMatrix.getRotation());
-
-    Vector3 forward = Vector3(0, 0, -1)..applyQuaternion(currentRotation);
-    Vector3 right = Vector3(1, 0, 0)..applyQuaternion(currentRotation);
-    Vector3 up = Vector3(0, 1, 0)..applyQuaternion(currentRotation);
-
-    Vector3 moveOffset = right * dx + up * dy + forward * dz;
-    Vector3 newPosition = currentPosition + moveOffset;
-    newPosition = _constrainPosition(newPosition);
-
-    Matrix4 newModelMatrix =
-        Matrix4.compose(newPosition, currentRotation, Vector3(1, 1, 1));
-    await viewer.setCameraModelMatrix4(newModelMatrix);
-  }
-
-  void dispose() {
-    _ticker?.dispose();
-    _moveTimer?.cancel();
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/gestures/picking_camera_gesture_handler.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/gestures/picking_camera_gesture_handler.dart
@@ -1,231 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/gestures.dart';
-import 'package:flutter/services.dart';
-import 'package:logging/logging.dart';
-import 'package:thermion_dart/thermion_dart/entities/abstract_gizmo.dart';
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-import 'dart:ui';
-import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart';
-
-// Renamed implementation
-class PickingCameraGestureHandler implements ThermionGestureHandler {
-  final ThermionViewer viewer;
-  final bool enableCamera;
-  final bool enablePicking;
-  final Logger _logger = Logger("PickingCameraGestureHandler");
-
-  ThermionGestureState _currentState = ThermionGestureState.NULL;
-  AbstractGizmo? _gizmo;
-  Timer? _scrollTimer;
-  ThermionEntity? _highlightedEntity;
-  StreamSubscription<FilamentPickResult>? _pickResultSubscription;
-
-  bool _gizmoAttached = false;
-
-  PickingCameraGestureHandler({
-    required this.viewer,
-    this.enableCamera = true,
-    this.enablePicking = true,
-  }) {
-    try {
-      _gizmo = viewer.gizmo;
-    } catch (err) {
-      _logger.warning(
-          "Failed to get gizmo. If you are running on WASM, this is expected");
-    }
-
-    _pickResultSubscription = viewer.pickResult.listen(_onPickResult);
-
-    // Add keyboard listener
-    RawKeyboard.instance.addListener(_handleKeyEvent);
-  }
-
-  @override
-  ThermionGestureState get currentState => _currentState;
-
-  void _handleKeyEvent(RawKeyEvent event) {
-    if (event is RawKeyDownEvent &&
-        event.logicalKey == LogicalKeyboardKey.escape) {
-      _resetToNullState();
-    }
-  }
-
-  void _resetToNullState() async {
-    _currentState = ThermionGestureState.NULL;
-    if (_highlightedEntity != null) {
-      await viewer.removeStencilHighlight(_highlightedEntity!);
-      _highlightedEntity = null;
-    }
-  }
-
-  void _onPickResult(FilamentPickResult result) async {
-    var targetEntity = await viewer.getAncestor(result.entity) ?? result.entity;
-
-    if (_highlightedEntity != targetEntity) {
-      if (_highlightedEntity != null) {
-        await viewer.removeStencilHighlight(_highlightedEntity!);
-      }
-
-      _highlightedEntity = targetEntity;
-      if (_highlightedEntity != null) {
-        await viewer.setStencilHighlight(_highlightedEntity!);
-        _gizmo?.attach(_highlightedEntity!);
-      }
-    }
-  }
-
-  @override
-  Future<void> onPointerHover(Offset localPosition, Offset delta) async {
-    if (_gizmoAttached) {
-      _gizmo?.checkHover(localPosition.dx, localPosition.dy);
-    }
-
-    if (_highlightedEntity != null) {
-      await viewer.queuePositionUpdateFromViewportCoords(
-        _highlightedEntity!,
-        localPosition.dx,
-        localPosition.dy,
-      );
-    }
-  }
-
-  @override
-  Future<void> onPointerScroll(Offset localPosition, double scrollDelta) async {
-    if (!enableCamera) {
-      return;
-    }
-    if (_currentState == ThermionGestureState.NULL ||
-        _currentState == ThermionGestureState.ZOOMING) {
-      await _zoom(localPosition, scrollDelta);
-    }
-  }
-
-  @override
-  Future<void> onPointerDown(Offset localPosition, int buttons) async {
-    if (_highlightedEntity != null) {
-      _resetToNullState();
-      return;
-    }
-
-    if (enablePicking && buttons != kMiddleMouseButton) {
-      viewer.pick(localPosition.dx.toInt(), localPosition.dy.toInt());
-    }
-
-    if (buttons == kMiddleMouseButton && enableCamera) {
-      await viewer.rotateStart(localPosition.dx, localPosition.dy);
-      _currentState = ThermionGestureState.ROTATING;
-    } else if (buttons == kPrimaryMouseButton && enableCamera) {
-      await viewer.panStart(localPosition.dx, localPosition.dy);
-      _currentState = ThermionGestureState.PANNING;
-    }
-  }
-
-  @override
-  Future<void> onPointerMove(
-      Offset localPosition, Offset delta, int buttons) async {
-    if (_highlightedEntity != null) {
-      await _handleEntityHighlightedMove(localPosition);
-      return;
-    }
-
-    switch (_currentState) {
-      case ThermionGestureState.NULL:
-        break;
-
-      case ThermionGestureState.ROTATING:
-        if (enableCamera) {
-          await viewer.rotateUpdate(localPosition.dx, localPosition.dy);
-        }
-        break;
-      case ThermionGestureState.PANNING:
-        if (enableCamera) {
-          await viewer.panUpdate(localPosition.dx, localPosition.dy);
-        }
-        break;
-      case ThermionGestureState.ZOOMING:
-        // ignore
-        break;
-    }
-  }
-
-  @override
-  Future<void> onPointerUp(int buttons) async {
-    switch (_currentState) {
-      case ThermionGestureState.ROTATING:
-        await viewer.rotateEnd();
-        _currentState = ThermionGestureState.NULL;
-        break;
-      case ThermionGestureState.PANNING:
-        await viewer.panEnd();
-        _currentState = ThermionGestureState.NULL;
-        break;
-      default:
-        break;
-    }
-  }
-
-  Future<void> _handleEntityHighlightedMove(Offset localPosition) async {
-    if (_highlightedEntity != null) {
-      await viewer.queuePositionUpdateFromViewportCoords(
-        _highlightedEntity!,
-        localPosition.dx,
-        localPosition.dy,
-      );
-    }
-  }
-
-  Future<void> _zoom(Offset localPosition, double scrollDelta) async {
-    _scrollTimer?.cancel();
-    _currentState = ThermionGestureState.ZOOMING;
-    await viewer.zoomBegin();
-    await viewer.zoomUpdate(
-        localPosition.dx, localPosition.dy, scrollDelta > 0 ? 1 : -1);
-
-    _scrollTimer = Timer(const Duration(milliseconds: 100), () async {
-      await viewer.zoomEnd();
-      _currentState = ThermionGestureState.NULL;
-    });
-  }
-
-  @override
-  void dispose() {
-    _pickResultSubscription?.cancel();
-    if (_highlightedEntity != null) {
-      viewer.removeStencilHighlight(_highlightedEntity!);
-    }
-    RawKeyboard.instance.removeListener(_handleKeyEvent);
-  }
-
-  @override
-  Future<bool> get initialized => viewer.initialized;
-
-  @override
-  GestureAction getActionForType(GestureType type) {
-    // TODO: implement getActionForType
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<void> onScaleEnd() {
-    // TODO: implement onScaleEnd
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<void> onScaleStart() {
-    // TODO: implement onScaleStart
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<void> onScaleUpdate() {
-    // TODO: implement onScaleUpdate
-    throw UnimplementedError();
-  }
-
-  @override
-  void setActionForType(GestureType type, GestureAction action) {
-    // TODO: implement setActionForType
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/mobile_gesture_handler_selector_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/mobile_gesture_handler_selector_widget.dart
@@ -1,28 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart';
-
-class MobileGestureHandlerSelectorWidget extends StatelessWidget {
-  final ThermionGestureHandler handler;
-
-  const MobileGestureHandlerSelectorWidget({super.key, required this.handler});
-  @override
-  Widget build(BuildContext context) {
-    throw Exception("TODO");
-    // return GestureDetector(
-    //   onTap: () {
-
-    //       var curIdx =
-    //           GestureType.values.indexOf(handler.gestureType);
-    //       var nextIdx =
-    //           curIdx == GestureType.values.length - 1 ? 0 : curIdx + 1;
-    //       handler.setGestureType(GestureType.values[nextIdx]);
-    //     });
-    //   },
-    //   child: Container(
-    //     padding: const EdgeInsets.all(50),
-    //     child: Icon(_icons[widget.gestureHandler.gestureType],
-    //         color: Colors.green),
-    //   ),
-    // );
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_detector_desktop.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_detector_desktop.dart
@@ -1,56 +0,0 @@
-import 'dart:async';
-import 'package:logging/logging.dart';
-import 'package:thermion_dart/thermion_dart/entities/abstract_gizmo.dart';
-import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
-
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart';
-import 'package:vector_math/vector_math_64.dart' as v64;
-
-class ThermionGestureDetectorDesktop extends StatefulWidget {
-  final Widget? child;
-  final ThermionGestureHandler gestureHandler;
-  final bool showControlOverlay;
-  final bool enableCamera;
-  final bool enablePicking;
-
-  const ThermionGestureDetectorDesktop({
-    Key? key,
-    required this.gestureHandler,
-    this.child,
-    this.showControlOverlay = false,
-    this.enableCamera = true,
-    this.enablePicking = true,
-  }) : super(key: key);
-
-  @override
-  State<StatefulWidget> createState() => _ThermionGestureDetectorDesktopState();
-}
-
-class _ThermionGestureDetectorDesktopState
-    extends State<ThermionGestureDetectorDesktop> {
-  
-  @override
-  Widget build(BuildContext context) {
-    return Listener(
-      onPointerHover: (event) =>
-          widget.gestureHandler.onPointerHover(event.localPosition, event.delta),
-      onPointerSignal: (PointerSignalEvent pointerSignal) {
-        if (pointerSignal is PointerScrollEvent) {
-          widget.gestureHandler.onPointerScroll(
-              pointerSignal.localPosition, pointerSignal.scrollDelta.dy);
-        }
-      },
-      onPointerPanZoomStart: (pzs) {
-        throw Exception("TODO - is this a pinch zoom on laptop trackpad?");
-      },
-      onPointerDown: (d) =>
-          widget.gestureHandler.onPointerDown(d.localPosition, d.buttons),
-      onPointerMove: (d) =>
-          widget.gestureHandler.onPointerMove(d.localPosition, d.delta, d.buttons),
-      onPointerUp: (d) => widget.gestureHandler.onPointerUp(d.buttons),
-      child: widget.child,
-    );
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_handler.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_handler.dart
@@ -1,54 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/gestures.dart';
-import 'package:flutter/services.dart';
-import 'package:thermion_flutter/src/gestures/delegates.dart';
-
-enum GestureType {
-  LMB_DOWN,
-  LMB_HOLD_AND_MOVE,
-  LMB_UP,
-  LMB_HOVER,
-  MMB_DOWN,
-  MMB_HOLD_AND_MOVE,
-  MMB_UP,
-  MMB_HOVER,
-  SCALE1,
-  SCALE2,
-  SCROLLWHEEL,
-  POINTER_MOVE,
-  KEYDOWN
-}
-
-enum GestureAction {
-  PAN_CAMERA,
-  ROTATE_CAMERA,
-  ZOOM_CAMERA,
-  TRANSLATE_ENTITY,
-  ROTATE_ENTITY,
-  PICK_ENTITY,
-  NONE
-}
-
-enum ThermionGestureState {
-  NULL,
-  ROTATING,
-  PANNING,
-  ZOOMING, // aka SCROLL
-}
-
-abstract class ThermionGestureHandler {
-  Future<void> onPointerHover(Offset localPosition, Offset delta);
-  Future<void> onPointerScroll(Offset localPosition, double scrollDelta);
-  Future<void> onPointerDown(Offset localPosition, int buttons);
-  Future<void> onPointerMove(Offset localPosition, Offset delta, int buttons);
-  Future<void> onPointerUp(int buttons);
-  Future<void> onScaleStart();
-  Future<void> onScaleUpdate();
-  Future<void> onScaleEnd();
-  Future<bool> get initialized;
-  void dispose();
-
-  void setActionForType(GestureType gestureType, GestureAction gestureAction);
-  GestureAction? getActionForType(GestureType gestureType);
-}
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_listener_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_listener_widget.dart
@@ -1,132 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart';
-
-///
-/// A widget that captures swipe/pointer events.
-/// This is a dumb listener; events are forwarded to a [ThermionGestureHandler].
-///
-class ThermionListenerWidget extends StatelessWidget {
-  ///
-  /// The content to display below the gesture detector/listener widget.
-  /// This will usually be a ThermionWidget (so you can navigate by directly interacting with the viewport), but this is not necessary.
-  /// It is equally possible to render the viewport/gesture controls elsewhere in the widget hierarchy. The only requirement is that they share the same [FilamentViewer].
-  ///
-  final Widget? child;
-
-  ///
-  /// The handler to use for interpreting gestures/pointer movements.
-  ///
-  final ThermionGestureHandler gestureHandler;
-
-  const ThermionListenerWidget({
-    Key? key,
-    required this.gestureHandler,
-    this.child,
-  }) : super(key: key);
-
-  bool get isDesktop =>
-      kIsWeb || Platform.isLinux || Platform.isWindows || Platform.isMacOS;
-
-  Widget _desktop() { 
-    return Listener(
-      onPointerHover: (event) =>
-          gestureHandler.onPointerHover(event.localPosition, event.delta),
-      onPointerSignal: (PointerSignalEvent pointerSignal) {
-        if (pointerSignal is PointerScrollEvent) {
-          gestureHandler.onPointerScroll(
-              pointerSignal.localPosition, pointerSignal.scrollDelta.dy);
-        }
-      },
-      onPointerPanZoomStart: (pzs) {
-        throw Exception("TODO - is this a pinch zoom on laptop trackpad?");
-      },
-      onPointerDown: (d) =>
-          gestureHandler.onPointerDown(d.localPosition, d.buttons),
-      onPointerMove: (d) =>
-          gestureHandler.onPointerMove(d.localPosition, d.delta, d.buttons),
-      onPointerUp: (d) => gestureHandler.onPointerUp(d.buttons),
-      child: child,
-    );
-  }
-
-  Widget _mobile() { 
-    return _MobileListenerWidget(
-      gestureHandler: gestureHandler);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder(
-        future: gestureHandler.initialized,
-        builder: (_, initialized) {
-          if (initialized.data != true) {
-            return child ?? Container();
-          }
-          return Stack(children: [
-            if (child != null) Positioned.fill(child: child!),
-            if (isDesktop)
-              Positioned.fill(
-                  child: _desktop()),
-            if (!isDesktop)
-              Positioned.fill(
-                  child: _mobile())
-          ]);
-        });
-  }
-}
-
-
-class _MobileListenerWidget extends StatefulWidget {
-  final ThermionGestureHandler gestureHandler;
-
-  const _MobileListenerWidget(
-      {Key? key, required this.gestureHandler})
-      : super(key: key);
-
-  @override
-  State<StatefulWidget> createState() => _MobileListenerWidgetState();
-}
-
-class _MobileListenerWidgetState
-    extends State<_MobileListenerWidget> {
-  GestureAction current = GestureAction.PAN_CAMERA;
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTapDown: (details) =>
-              widget.gestureHandler.onPointerDown(details.localPosition, 0),
-          onDoubleTap: () {
-            if (current == GestureAction.PAN_CAMERA) {
-              widget.gestureHandler.setActionForType(
-                  GestureType.SCALE1, GestureAction.ROTATE_CAMERA);
-              current = GestureAction.ROTATE_CAMERA;
-            } else {
-              widget.gestureHandler.setActionForType(
-                  GestureType.SCALE1, GestureAction.PAN_CAMERA);
-              current = GestureAction.PAN_CAMERA;
-            }
-          },
-          onScaleStart: (details) async {
-            await widget.gestureHandler.onScaleStart();
-          },
-          onScaleUpdate: (details) async {
-            await widget.gestureHandler.onScaleUpdate();
-          },
-          onScaleEnd: (details) async {
-            await widget.gestureHandler.onScaleUpdate();
-          },
-        );
-      
-  }
-}
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/camera_options_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/camera_options_widget.dart
@@ -1,6 +1,6 @@

 import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';import 'package:flutter/material.dart';
-import '../../utils/camera_orientation.dart';
+import '../../../utils/camera_orientation.dart';

 import 'dart:math';

--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/camera_orientation_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/camera_orientation_widget.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/mobile_gesture_handler_selector_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/mobile_gesture_handler_selector_widget.dart
@@ -0,0 +1,28 @@
+// import 'package:flutter/widgets.dart';
+// import 'package:thermion_dart/thermion_dart/input/input_handler.dart';
+
+// class MobileGestureHandlerSelectorWidget extends StatelessWidget {
+//   final InputHandler handler;
+
+//   const MobileGestureHandlerSelectorWidget({super.key, required this.handler});
+//   @override
+//   Widget build(BuildContext context) {
+//     throw Exception("TODO");
+//     // return GestureDetector(
+//     //   onTap: () {
+
+//     //       var curIdx =
+//     //           InputType.values.indexOf(handler.gestureType);
+//     //       var nextIdx =
+//     //           curIdx == InputType.values.length - 1 ? 0 : curIdx + 1;
+//     //       handler.setInputType(InputType.values[nextIdx]);
+//     //     });
+//     //   },
+//     //   child: Container(
+//     //     padding: const EdgeInsets.all(50),
+//     //     child: Icon(_icons[widget.gestureHandler.gestureType],
+//     //         color: Colors.green),
+//     //   ),
+//     // );
+//   }
+// }
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_gesture_detector.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_gesture_detector.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_gesture_detector_desktop.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_gesture_detector_desktop.dart
@@ -0,0 +1,60 @@
+// import 'package:thermion_dart/thermion_dart.dart';
+
+// import 'package:flutter/gestures.dart';
+// import 'package:flutter/material.dart';
+
+// import 'package:vector_math/vector_math_64.dart';
+// import 'dart:ui' show Offset;
+
+// extension OffsetExtension on Offset {
+//   Vector2 toVector2() {
+//     return Vector2(dx, dy);
+//   }
+// }
+
+// class ThermionGestureDetectorDesktop extends StatefulWidget {
+//   final Widget? child;
+//   final InputHandler gestureHandler;
+//   final bool showControlOverlay;
+//   final bool enableCamera;
+//   final bool enablePicking;
+
+//   const ThermionGestureDetectorDesktop({
+//     Key? key,
+//     required this.gestureHandler,
+//     this.child,
+//     this.showControlOverlay = false,
+//     this.enableCamera = true,
+//     this.enablePicking = true,
+//   }) : super(key: key);
+
+//   @override
+//   State<StatefulWidget> createState() => _ThermionGestureDetectorDesktopState();
+// }
+
+// class _ThermionGestureDetectorDesktopState
+//     extends State<ThermionGestureDetectorDesktop> {
+  
+//   @override
+//   Widget build(BuildContext context) {
+//     return Listener(
+//       onPointerHover: (event) =>
+//           widget.gestureHandler.onPointerHover(event.localPosition.toVector2(), event.delta.toVector2()),
+//       onPointerSignal: (PointerSignalEvent pointerSignal) {
+//         if (pointerSignal is PointerScrollEvent) {
+//           widget.gestureHandler.onPointerScroll(
+//               pointerSignal.localPosition.toVector2(), pointerSignal.scrollDelta.dy);
+//         }
+//       },
+//       onPointerPanZoomStart: (pzs) {
+//         throw Exception("TODO - is this a pinch zoom on laptop trackpad?");
+//       },
+//       onPointerDown: (d) =>
+//           widget.gestureHandler.onPointerDown(d.localPosition.toVector2(), d.buttons & kMiddleMouseButton != 0),
+//       onPointerMove: (PointerMoveEvent d) =>
+//           widget.gestureHandler.onPointerMove(d.localPosition.toVector2(), d.delta.toVector2(), d.buttons & kMiddleMouseButton != 0),
+//       onPointerUp: (d) => widget.gestureHandler.onPointerUp(d.buttons),
+//       child: widget.child,
+//     );
+//   }
+// }
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_gesture_detector_mobile.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_gesture_detector_mobile.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
 import 'package:flutter/material.dart';

-enum GestureType { rotateCamera, panCamera, panBackground }
+enum InputType { rotateCamera, panCamera, panBackground }

 ///
 /// A widget that translates finger/mouse gestures to zoom/pan/rotate actions.
@@ -62,12 +62,12 @@ class ThermionGestureDetectorMobile extends StatefulWidget {

 class _ThermionGestureDetectorMobileState
    extends State<ThermionGestureDetectorMobile> {
-  GestureType gestureType = GestureType.panCamera;
+  InputType gestureType = InputType.panCamera;

  final _icons = {
-    GestureType.panBackground: Icons.image,
-    GestureType.panCamera: Icons.pan_tool,
-    GestureType.rotateCamera: Icons.rotate_90_degrees_ccw
+    InputType.panBackground: Icons.image,
+    InputType.panCamera: Icons.pan_tool,
+    InputType.rotateCamera: Icons.rotate_90_degrees_ccw
  };

  // on mobile, we can't differentiate between pointer down events like we do on desktop with primary/secondary/tertiary buttons
@@ -97,18 +97,18 @@ class _ThermionGestureDetectorMobileState

  void _setFunction() {
    switch (gestureType) {
-      case GestureType.rotateCamera:
+      case InputType.rotateCamera:
        _functionStart = widget.viewer.rotateStart;
        _functionUpdate = widget.viewer.rotateUpdate;
        _functionEnd = widget.viewer.rotateEnd;
        break;
-      case GestureType.panCamera:
+      case InputType.panCamera:
        _functionStart = widget.viewer.panStart;
        _functionUpdate = widget.viewer.panUpdate;
        _functionEnd = widget.viewer.panEnd;
        break;
      // TODO
-      case GestureType.panBackground:
+      case InputType.panBackground:
        _functionStart = (x, y) async {};
        _functionUpdate = (x, y) async {};
        _functionEnd = () async {};
@@ -216,11 +216,11 @@ class _ThermionGestureDetectorMobileState
              child: GestureDetector(
                onTap: () {
                  setState(() {
-                    var curIdx = GestureType.values.indexOf(gestureType);
-                    var nextIdx = curIdx == GestureType.values.length - 1
+                    var curIdx = InputType.values.indexOf(gestureType);
+                    var nextIdx = curIdx == InputType.values.length - 1
                        ? 0
                        : curIdx + 1;
-                    gestureType = GestureType.values[nextIdx];
+                    gestureType = InputType.values[nextIdx];
                    _setFunction();
                  });
                },
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_listener_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/camera/gestures/thermion_listener_widget.dart
@@ -0,0 +1,165 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:thermion_dart/thermion_dart.dart';
+import 'package:vector_math/vector_math_64.dart';
+
+extension OffsetExtension on Offset {
+  Vector2 toVector2() {
+    return Vector2(dx, dy);
+  }
+}
+
+///
+/// A widget that captures swipe/pointer events.
+/// This is a dumb listener; events are forwarded to a [InputHandler].
+///
+class ThermionListenerWidget extends StatefulWidget {
+  ///
+  /// The content to display below the gesture detector/listener widget.
+  /// This will usually be a ThermionWidget (so you can navigate by directly interacting with the viewport), but this is not necessary.
+  /// It is equally possible to render the viewport/gesture controls elsewhere in the widget hierarchy. The only requirement is that they share the same [FilamentViewer].
+  ///
+  final Widget? child;
+
+  ///
+  /// The handler to use for interpreting gestures/pointer movements.
+  ///
+  final InputHandler gestureHandler;
+
+  const ThermionListenerWidget({
+    Key? key,
+    required this.gestureHandler,
+    this.child,
+  }) : super(key: key);
+
+  @override
+  State<ThermionListenerWidget> createState() => _ThermionListenerWidgetState();
+}
+
+class _ThermionListenerWidgetState extends State<ThermionListenerWidget> {
+  bool get isDesktop =>
+      kIsWeb || Platform.isLinux || Platform.isWindows || Platform.isMacOS;
+
+  @override
+  void initState() {
+    super.initState();
+    HardwareKeyboard.instance.addHandler(_handleKeyEvent);
+  }
+
+  final _keyMap = {
+    PhysicalKeyboardKey.keyW: PhysicalKey.W,
+    PhysicalKeyboardKey.keyA: PhysicalKey.A,
+    PhysicalKeyboardKey.keyS: PhysicalKey.S,
+    PhysicalKeyboardKey.keyD: PhysicalKey.D,
+  };
+
+  bool _handleKeyEvent(KeyEvent event) {
+    PhysicalKey? key = _keyMap[event.physicalKey];
+
+    if (key == null) {
+      return false;
+    }
+
+    if (event is KeyDownEvent || event is KeyRepeatEvent) {
+      widget.gestureHandler.keyDown(key!);
+    } else if (event is KeyUpEvent) {
+      widget.gestureHandler.keyUp(key!);
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    HardwareKeyboard.instance.removeHandler(_handleKeyEvent);
+  }
+
+  Widget _desktop() {
+    return Listener(
+      onPointerHover: (event) => widget.gestureHandler
+          .onPointerHover(event.localPosition.toVector2(), event.delta.toVector2()),
+      onPointerSignal: (PointerSignalEvent pointerSignal) {
+        if (pointerSignal is PointerScrollEvent) {
+          widget.gestureHandler.onPointerScroll(
+              pointerSignal.localPosition.toVector2(),
+              pointerSignal.scrollDelta.dy);
+        }
+      },
+      onPointerPanZoomStart: (pzs) {
+        throw Exception("TODO - is this a pinch zoom on laptop trackpad?");
+      },
+      onPointerDown: (d) => widget.gestureHandler
+          .onPointerDown(d.localPosition.toVector2(), d.buttons & kMiddleMouseButton != 0),
+      onPointerMove: (d) => widget.gestureHandler
+          .onPointerMove(d.localPosition.toVector2(), d.delta.toVector2(), d.buttons & kMiddleMouseButton != 0),
+      onPointerUp: (d) => widget.gestureHandler.onPointerUp(d.buttons & kMiddleMouseButton != 0),
+      child: widget.child,
+    );
+  }
+
+  Widget _mobile() {
+    return _MobileListenerWidget(gestureHandler: widget.gestureHandler);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+        future: widget.gestureHandler.initialized,
+        builder: (_, initialized) {
+          if (initialized.data != true) {
+            return widget.child ?? Container();
+          }
+          return Stack(children: [
+            if (widget.child != null) Positioned.fill(child: widget.child!),
+            if (isDesktop) Positioned.fill(child: _desktop()),
+            if (!isDesktop) Positioned.fill(child: _mobile())
+          ]);
+        });
+  }
+}
+
+class _MobileListenerWidget extends StatefulWidget {
+  final InputHandler gestureHandler;
+
+  const _MobileListenerWidget({Key? key, required this.gestureHandler})
+      : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() => _MobileListenerWidgetState();
+}
+
+class _MobileListenerWidgetState extends State<_MobileListenerWidget> {
+  bool isPan = true;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTapDown: (details) => widget.gestureHandler
+          .onPointerDown(details.localPosition.toVector2(), false),
+      onDoubleTap: () {
+        widget.gestureHandler.setActionForType(InputType.SCALE1,
+            isPan ? InputAction.TRANSLATE : InputAction.ROTATE);
+      },
+      onScaleStart: (details) async {
+        await widget.gestureHandler.onScaleStart();
+      },
+      onScaleUpdate: (details) async {
+        await widget.gestureHandler.onScaleUpdate();
+      },
+      onScaleEnd: (details) async {
+        await widget.gestureHandler.onScaleUpdate();
+      },
+    );
+  }
+}
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/debug/child_renderable_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/debug/child_renderable_widget.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/debug/skeleton_menu_item_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/debug/skeleton_menu_item_widget.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/lights/ibl_rotation_slider.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/lights/ibl_rotation_slider.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/lights/light_slider.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/lights/light_slider.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/resize_observer.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/resize_observer.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 import 'dart:math';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:thermion_flutter/src/widgets/thermion_widget_web.dart';
-import 'package:thermion_flutter/src/widgets/transparent_filament_widget.dart';
+import 'package:thermion_flutter/src/widgets/src/thermion_widget_web.dart';
+import 'package:thermion_flutter/src/widgets/src/transparent_filament_widget.dart';
 import 'dart:async';

 import 'package:thermion_flutter_platform_interface/thermion_flutter_texture.dart';
@@ -12,9 +12,11 @@ import 'package:thermion_flutter_web/thermion_flutter_web_options.dart';
 import 'resize_observer.dart';

 class ThermionWidget extends StatefulWidget {
+  
  final ThermionViewer viewer;
  final ThermionFlutterOptions? options;

+
  ///
  /// The content to render before the texture widget is available.
  /// The default is a solid red Container, intentionally chosen to make it clear that there will be at least one frame where the Texture widget is not being rendered.
@@ -63,6 +65,7 @@ class _ThermionWidgetState extends State<ThermionWidget> {

  void _requestFrame() {
    WidgetsBinding.instance.scheduleFrameCallback((d) {
+
      widget.viewer.requestFrame();
      _requestFrame();
    });
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_web.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_web.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_web_impl.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_web_impl.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_web_stub.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_web_stub.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/transparent_filament_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/transparent_filament_widget.dart
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/widgets.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/widgets.dart
@@ -0,0 +1,4 @@
+library;
+
+export 'src/thermion_widget.dart';
+export 'src/camera/gestures/thermion_listener_widget.dart';
--- a/thermion_flutter/thermion_flutter/lib/thermion_flutter.dart
+++ b/thermion_flutter/thermion_flutter/lib/thermion_flutter.dart
@@ -1,11 +1,6 @@
 library thermion_flutter;

 export 'src/thermion_flutter_plugin.dart';
-export 'src/widgets/thermion_widget.dart';
-export 'src/widgets/camera/gestures/thermion_gesture_detector.dart';
-export 'src/widgets/camera/gestures/thermion_gesture_handler.dart';
-export 'src/gestures/delegate_gesture_handler.dart';
-
-export 'src/widgets/camera/camera_orientation_widget.dart';
+export 'src/widgets/widgets.dart';
 export 'package:thermion_flutter_platform_interface/thermion_flutter_platform_interface.dart';
 export 'package:thermion_dart/thermion_dart.dart';