maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename CameraPtr to TCamera and use named arguments for setCameraLensProjection

Browse Source
This commit is contained in:
Nick Fisher
2024-09-20 18:31:20 +08:00
parent 7cb3080596
commit ddbb4ec5c6
7 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
thermion_dart/lib/thermion_dart/viewer/ffi/thermion_dart.g.dart
View File

@@ -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 {}

9
thermion_dart/lib/thermion_dart/viewer/ffi/thermion_viewer_ffi.dart
View File

@@ -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);
}

9
thermion_dart/lib/thermion_dart/viewer/thermion_viewer_base.dart
View File

@@ -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.

2
thermion_dart/native/include/APIBoundaryTypes.h
View File

@@ -9,7 +9,7 @@ extern "C"
typedef int32_t EntityId;
typedef int32_t _ManipulatorMode;
typedef struct CameraPtr CameraPtr;
typedef struct TCamera TCamera;
typedef struct TMaterialInstance TMaterialInstance;
struct TMaterialKey {

32
thermion_dart/native/include/ThermionDartApi.h
View File

@@ -208,22 +208,22 @@ extern "C"
// Camera methods
EMSCRIPTEN_KEEPALIVE void set_view_frustum_culling(const void *const viewer, bool enabled);
EMSCRIPTEN_KEEPALIVE void set_camera_exposure(CameraPtr *camera, float aperture, float shutterSpeed, float sensitivity);
EMSCRIPTEN_KEEPALIVE void set_camera_model_matrix(CameraPtr *camera, double4x4 matrix);
EMSCRIPTEN_KEEPALIVE CameraPtr *get_camera(const void *const viewer, EntityId entity);
EMSCRIPTEN_KEEPALIVE double get_camera_focal_length(CameraPtr *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_model_matrix(CameraPtr *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_view_matrix(CameraPtr *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_projection_matrix(CameraPtr *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_culling_projection_matrix(CameraPtr *const camera);
EMSCRIPTEN_KEEPALIVE const double *const get_camera_frustum(CameraPtr *const camera);
EMSCRIPTEN_KEEPALIVE void set_camera_projection_matrix(CameraPtr *camera, double4x4 matrix, double near, double far);
EMSCRIPTEN_KEEPALIVE void set_camera_projection_from_fov(CameraPtr *camera, double fovInDegrees, double aspect, double near, double far, bool horizontal);
EMSCRIPTEN_KEEPALIVE double get_camera_near(CameraPtr *camera);
EMSCRIPTEN_KEEPALIVE double get_camera_culling_far(CameraPtr *camera);
EMSCRIPTEN_KEEPALIVE float get_camera_fov(CameraPtr *camera, bool horizontal);
EMSCRIPTEN_KEEPALIVE void set_camera_lens_projection(CameraPtr *camera, double near, double far, double aspect, double focalLength);
EMSCRIPTEN_KEEPALIVE void set_camera_focus_distance(CameraPtr *camera, float focusDistance);
EMSCRIPTEN_KEEPALIVE void set_camera_exposure(TCamera *camera, float aperture, float shutterSpeed, float sensitivity);
EMSCRIPTEN_KEEPALIVE void set_camera_model_matrix(TCamera *camera, double4x4 matrix);
EMSCRIPTEN_KEEPALIVE TCamera *get_camera(const void *const viewer, EntityId entity);
EMSCRIPTEN_KEEPALIVE double get_camera_focal_length(TCamera *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_model_matrix(TCamera *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_view_matrix(TCamera *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_projection_matrix(TCamera *const camera);
EMSCRIPTEN_KEEPALIVE double4x4 get_camera_culling_projection_matrix(TCamera *const camera);
EMSCRIPTEN_KEEPALIVE const double *const get_camera_frustum(TCamera *const camera);
EMSCRIPTEN_KEEPALIVE void set_camera_projection_matrix(TCamera *camera, double4x4 matrix, double near, double far);
EMSCRIPTEN_KEEPALIVE void set_camera_projection_from_fov(TCamera *camera, double fovInDegrees, double aspect, double near, double far, bool horizontal);
EMSCRIPTEN_KEEPALIVE double get_camera_near(TCamera *camera);
EMSCRIPTEN_KEEPALIVE double get_camera_culling_far(TCamera *camera);
EMSCRIPTEN_KEEPALIVE float get_camera_fov(TCamera *camera, bool horizontal);
EMSCRIPTEN_KEEPALIVE void set_camera_lens_projection(TCamera *camera, double near, double far, double aspect, double focalLength);
EMSCRIPTEN_KEEPALIVE void set_camera_focus_distance(TCamera *camera, float focusDistance);
EMSCRIPTEN_KEEPALIVE void set_camera_manipulator_options(const void *const viewer, _ManipulatorMode mode, double orbitSpeedX, double orbitSpeedY, double zoomSpeed);
EMSCRIPTEN_KEEPALIVE int hide_mesh(void *sceneManager, EntityId entity, const char *meshName);

34
thermion_dart/native/src/ThermionDartApi.cpp
View File

@@ -217,80 +217,80 @@ extern "C"
return ((FilamentViewer *)viewer)->setCamera(asset, nodeName);
}
EMSCRIPTEN_KEEPALIVE float get_camera_fov(CameraPtr *camera, bool horizontal)
EMSCRIPTEN_KEEPALIVE float get_camera_fov(TCamera *camera, bool horizontal)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
return cam->getFieldOfViewInDegrees(horizontal ? Camera::Fov::HORIZONTAL : Camera::Fov::VERTICAL);
}
EMSCRIPTEN_KEEPALIVE double get_camera_focal_length(CameraPtr *const camera)
EMSCRIPTEN_KEEPALIVE double get_camera_focal_length(TCamera *const camera)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
return cam->getFocalLength();
}
EMSCRIPTEN_KEEPALIVE void set_camera_projection_from_fov(CameraPtr *camera, double fovInDegrees, double aspect, double near, double far, bool horizontal)
EMSCRIPTEN_KEEPALIVE void set_camera_projection_from_fov(TCamera *camera, double fovInDegrees, double aspect, double near, double far, bool horizontal)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
cam->setProjection(fovInDegrees, aspect, near, far, horizontal ? Camera::Fov::HORIZONTAL : Camera::Fov::VERTICAL);
}
EMSCRIPTEN_KEEPALIVE CameraPtr *get_camera(const void *const viewer, EntityId entity)
EMSCRIPTEN_KEEPALIVE TCamera *get_camera(const void *const viewer, EntityId entity)
{
auto filamentCamera = ((FilamentViewer *)viewer)->getCamera(entity);
return reinterpret_cast<CameraPtr *>(filamentCamera);
return reinterpret_cast<TCamera *>(filamentCamera);
}
double4x4 get_camera_model_matrix(CameraPtr *camera)
double4x4 get_camera_model_matrix(TCamera *camera)
{
const auto &mat = reinterpret_cast<filament::Camera *>(camera)->getModelMatrix();
return convert_mat4_to_double4x4(mat);
}
double4x4 get_camera_view_matrix(CameraPtr *camera)
double4x4 get_camera_view_matrix(TCamera *camera)
{
const auto &mat = reinterpret_cast<filament::Camera *>(camera)->getViewMatrix();
return convert_mat4_to_double4x4(mat);
}
double4x4 get_camera_projection_matrix(CameraPtr *camera)
double4x4 get_camera_projection_matrix(TCamera *camera)
{
const auto &mat = reinterpret_cast<filament::Camera *>(camera)->getProjectionMatrix();
return convert_mat4_to_double4x4(mat);
}
double4x4 get_camera_culling_projection_matrix(CameraPtr *camera)
double4x4 get_camera_culling_projection_matrix(TCamera *camera)
{
const auto &mat = reinterpret_cast<filament::Camera *>(camera)->getCullingProjectionMatrix();
return convert_mat4_to_double4x4(mat);
}
void set_camera_projection_matrix(CameraPtr *camera, double4x4 matrix, double near, double far)
void set_camera_projection_matrix(TCamera *camera, double4x4 matrix, double near, double far)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
const auto &mat = convert_double4x4_to_mat4(matrix);
cam->setCustomProjection(mat, near, far);
}
void set_camera_lens_projection(CameraPtr *camera, double near, double far, double aspect, double focalLength)
void set_camera_lens_projection(TCamera *camera, double near, double far, double aspect, double focalLength)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
cam->setLensProjection(focalLength, aspect, near, far);
}
double get_camera_near(CameraPtr *camera)
double get_camera_near(TCamera *camera)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
return cam->getNear();
}
double get_camera_culling_far(CameraPtr *camera)
double get_camera_culling_far(TCamera *camera)
{
auto cam = reinterpret_cast<filament::Camera *>(camera);
return cam->getCullingFar();
}
const double *const get_camera_frustum(CameraPtr *camera)
const double *const get_camera_frustum(TCamera *camera)
{
const auto frustum = reinterpret_cast<filament::Camera *>(camera)->getFrustum();
@@ -319,19 +319,19 @@ extern "C"
((FilamentViewer *)viewer)->setViewFrustumCulling(enabled);
}
EMSCRIPTEN_KEEPALIVE void set_camera_focus_distance(CameraPtr *camera, float distance)
EMSCRIPTEN_KEEPALIVE void set_camera_focus_distance(TCamera *camera, float distance)
{
auto *cam = reinterpret_cast<filament::Camera *>(camera);
cam->setFocusDistance(distance);
}
EMSCRIPTEN_KEEPALIVE void set_camera_exposure(CameraPtr *camera, float aperture, float shutterSpeed, float sensitivity)
EMSCRIPTEN_KEEPALIVE void set_camera_exposure(TCamera *camera, float aperture, float shutterSpeed, float sensitivity)
{
auto *cam = reinterpret_cast<filament::Camera *>(camera);
cam->setExposure(aperture, shutterSpeed, sensitivity);
}
EMSCRIPTEN_KEEPALIVE void set_camera_model_matrix(CameraPtr *camera, double4x4 matrix)
EMSCRIPTEN_KEEPALIVE void set_camera_model_matrix(TCamera *camera, double4x4 matrix)
{
auto *cam = reinterpret_cast<filament::Camera *>(camera);
const filament::math::mat4 &mat = convert_double4x4_to_mat4(matrix);

2
thermion_dart/test/integration_test.dart
View File

@@ -92,7 +92,7 @@ void main() async {
print(frustum.plane5.normal);
print(frustum.plane5.constant);
await viewer.setCameraLensProjection(10.0, 1000.0, 1.0, 28.0);
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);