rename CameraPtr to TCamera and use named arguments for setCameraLensProjection

thermion_dart/lib/thermion_dart/viewer/ffi/thermion_dart.g.dart

@@ -766,73 +766,73 @@ external void set_scale(
 
 @ffi.Native<
     ffi.Void Function(
-        ffi.Pointer<CameraPtr>, ffi.Float, ffi.Float, ffi.Float)>(isLeaf: true)
+        ffi.Pointer<TCamera>, ffi.Float, ffi.Float, ffi.Float)>(isLeaf: true)
 external void set_camera_exposure(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   double aperture,
   double shutterSpeed,
   double sensitivity,
 );
 
-@ffi.Native<ffi.Void Function(ffi.Pointer<CameraPtr>, double4x4)>(isLeaf: true)
+@ffi.Native<ffi.Void Function(ffi.Pointer<TCamera>, double4x4)>(isLeaf: true)
 external void set_camera_model_matrix(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   double4x4 matrix,
 );
 
-@ffi.Native<ffi.Pointer<CameraPtr> Function(ffi.Pointer<ffi.Void>, EntityId)>(
+@ffi.Native<ffi.Pointer<TCamera> Function(ffi.Pointer<ffi.Void>, EntityId)>(
     isLeaf: true)
-external ffi.Pointer<CameraPtr> get_camera(
+external ffi.Pointer<TCamera> get_camera(
   ffi.Pointer<ffi.Void> viewer,
   int entity,
 );
 
-@ffi.Native<ffi.Double Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<ffi.Double Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double get_camera_focal_length(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<double4x4 Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<double4x4 Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double4x4 get_camera_model_matrix(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<double4x4 Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<double4x4 Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double4x4 get_camera_view_matrix(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<double4x4 Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<double4x4 Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double4x4 get_camera_projection_matrix(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<double4x4 Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<double4x4 Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double4x4 get_camera_culling_projection_matrix(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<ffi.Pointer<ffi.Double> Function(ffi.Pointer<CameraPtr>)>(
+@ffi.Native<ffi.Pointer<ffi.Double> Function(ffi.Pointer<TCamera>)>(
     isLeaf: true)
 external ffi.Pointer<ffi.Double> get_camera_frustum(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
 @ffi.Native<
-    ffi.Void Function(ffi.Pointer<CameraPtr>, double4x4, ffi.Double,
+    ffi.Void Function(ffi.Pointer<TCamera>, double4x4, ffi.Double,
         ffi.Double)>(isLeaf: true)
 external void set_camera_projection_matrix(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   double4x4 matrix,
   double near,
   double far,
 );
 
 @ffi.Native<
-    ffi.Void Function(ffi.Pointer<CameraPtr>, ffi.Double, ffi.Double,
+    ffi.Void Function(ffi.Pointer<TCamera>, ffi.Double, ffi.Double,
         ffi.Double, ffi.Double, ffi.Bool)>(isLeaf: true)
 external void set_camera_projection_from_fov(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   double fovInDegrees,
   double aspect,
   double near,
@@ -840,36 +840,36 @@ external void set_camera_projection_from_fov(
   bool horizontal,
 );
 
-@ffi.Native<ffi.Double Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<ffi.Double Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double get_camera_near(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<ffi.Double Function(ffi.Pointer<CameraPtr>)>(isLeaf: true)
+@ffi.Native<ffi.Double Function(ffi.Pointer<TCamera>)>(isLeaf: true)
 external double get_camera_culling_far(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
 );
 
-@ffi.Native<ffi.Float Function(ffi.Pointer<CameraPtr>, ffi.Bool)>(isLeaf: true)
+@ffi.Native<ffi.Float Function(ffi.Pointer<TCamera>, ffi.Bool)>(isLeaf: true)
 external double get_camera_fov(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   bool horizontal,
 );
 
 @ffi.Native<
-    ffi.Void Function(ffi.Pointer<CameraPtr>, ffi.Double, ffi.Double,
+    ffi.Void Function(ffi.Pointer<TCamera>, ffi.Double, ffi.Double,
         ffi.Double, ffi.Double)>(isLeaf: true)
 external void set_camera_lens_projection(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   double near,
   double far,
   double aspect,
   double focalLength,
 );
 
-@ffi.Native<ffi.Void Function(ffi.Pointer<CameraPtr>, ffi.Float)>(isLeaf: true)
+@ffi.Native<ffi.Void Function(ffi.Pointer<TCamera>, ffi.Float)>(isLeaf: true)
 external void set_camera_focus_distance(
-  ffi.Pointer<CameraPtr> camera,
+  ffi.Pointer<TCamera> camera,
   double focusDistance,
 );
 
@@ -1848,7 +1848,7 @@ external void unproject_texture_ffi(
   ffi.Pointer<ffi.NativeFunction<ffi.Void Function()>> callback,
 );
 
-final class CameraPtr extends ffi.Opaque {}
+final class TCamera extends ffi.Opaque {}
 
 final class TMaterialInstance extends ffi.Opaque {}
 

thermion_dart/lib/thermion_dart/viewer/ffi/thermion_viewer_ffi.dart

@@ -18,10 +18,6 @@ const ThermionEntity _FILAMENT_ASSET_ERROR = 0;
 
 typedef RenderCallback = Pointer<NativeFunction<Void Function(Pointer<Void>)>>;
 
-double kNear = 0.05;
-double kFar = 1000.0;
-double kFocalLength = 28.0;
-
 class ThermionViewerFFI extends ThermionViewer {
   final _logger = Logger("ThermionViewerFFI");
 
@@ -1354,8 +1350,9 @@ class ThermionViewerFFI extends ThermionViewer {
   ///
   ///
   @override
-  Future setCameraLensProjection(
-      double near, double far, double aspect, double focalLength) async {
+  Future setCameraLensProjection({double near = kNear, double far = kFar, double? aspect,
+      double focalLength = kFocalLength}) async {
+    aspect ??= viewportDimensions.$1 / viewportDimensions.$2;
     var mainCamera = get_camera(_viewer!, get_main_camera(_viewer!));
     set_camera_lens_projection(mainCamera, near, far, aspect, focalLength);
   }

thermion_dart/lib/thermion_dart/viewer/thermion_viewer_base.dart

@@ -1,5 +1,4 @@
 import 'package:thermion_dart/thermion_dart/viewer/events.dart';
-import 'package:thermion_dart/thermion_dart/viewer/ffi/thermion_viewer_ffi.dart';
 
 import 'shared_types/shared_types.dart';
 export 'shared_types/shared_types.dart';
@@ -11,6 +10,10 @@ import 'package:vector_math/vector_math_64.dart';
 import 'dart:async';
 import 'package:animation_tools_dart/animation_tools_dart.dart';
 
+const double kNear = 0.05;
+const double kFar = 1000.0;
+const double kFocalLength = 28.0;
+
 abstract class ThermionViewer {
   ///
   /// A Future that resolves when the underlying rendering context has been successfully created.
@@ -490,8 +493,8 @@ abstract class ThermionViewer {
   ///
   ///
   ///
-  Future setCameraLensProjection(
-      double near, double far, double aspect, double focalLength);
+  Future setCameraLensProjection({double near = kNear, double far = kFar, double? aspect,
+      double focalLength = kFocalLength});
 
   ///
   /// Sets the focus distance for the camera.