From 1be2367b4f5afd10d0a3deb99dba49bfa4a5e32c Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Wed, 11 Oct 2023 15:34:19 +0800 Subject: [PATCH] don't expose FILAMENT_ASSET_ERROR --- lib/filament_controller.dart | 1 - lib/filament_controller_ffi.dart | 7 ++++--- lib/filament_controller_method_channel.dart | 10 +++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/filament_controller.dart b/lib/filament_controller.dart index 5fd286fc..1dc3f226 100644 --- a/lib/filament_controller.dart +++ b/lib/filament_controller.dart @@ -5,7 +5,6 @@ import 'package:polyvox_filament/animations/bone_animation_data.dart'; import 'package:polyvox_filament/animations/morph_animation_data.dart'; typedef FilamentEntity = int; -const FilamentEntity FILAMENT_ASSET_ERROR = 0; enum ToneMapper { ACES, FILMIC, LINEAR } diff --git a/lib/filament_controller_ffi.dart b/lib/filament_controller_ffi.dart index a0a420f2..ef8427d6 100644 --- a/lib/filament_controller_ffi.dart +++ b/lib/filament_controller_ffi.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:ffi'; import 'dart:io'; -import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:flutter/services.dart'; import 'package:ffi/ffi.dart'; @@ -10,6 +9,8 @@ import 'package:polyvox_filament/animations/bone_animation_data.dart'; import 'package:polyvox_filament/animations/morph_animation_data.dart'; import 'package:polyvox_filament/generated_bindings.dart'; +const FilamentEntity _FILAMENT_ASSET_ERROR = 0; + class FilamentControllerFFI extends FilamentController { late MethodChannel _channel = MethodChannel("app.polyvox.filament/event"); @@ -352,7 +353,7 @@ class FilamentControllerFFI extends FilamentController { } var asset = _lib.load_glb_ffi( _assetManager!, path.toNativeUtf8().cast(), unlit); - if (asset == FILAMENT_ASSET_ERROR) { + if (asset == _FILAMENT_ASSET_ERROR) { throw Exception("An error occurred loading the asset at $path"); } return asset; @@ -372,7 +373,7 @@ class FilamentControllerFFI extends FilamentController { _assetManager!, path.toNativeUtf8().cast(), relativeResourcePath.toNativeUtf8().cast()); - if (asset == FILAMENT_ASSET_ERROR) { + if (asset == _FILAMENT_ASSET_ERROR) { throw Exception("An error occurred loading the asset at $path"); } return asset; diff --git a/lib/filament_controller_method_channel.dart b/lib/filament_controller_method_channel.dart index 92cc7293..1b2aa2ea 100644 --- a/lib/filament_controller_method_channel.dart +++ b/lib/filament_controller_method_channel.dart @@ -9,6 +9,8 @@ import 'filament_controller.dart'; typedef AssetManager = int; +const FilamentEntity _FILAMENT_ASSET_ERROR = 0; + /// /// This is a previous iteration of FilamentController that used platform channels for every distinct platform. /// This is no longer used; currently kept only for reference/posterity. @@ -245,7 +247,7 @@ class FilamentControllerMethodChannel extends FilamentController { } var asset = await _channel.invokeMethod("loadGlb", [_assetManager, path, unlit]); - if (asset == FILAMENT_ASSET_ERROR) { + if (asset == _FILAMENT_ASSET_ERROR) { throw Exception("An error occurred loading the asset at $path"); } return asset; @@ -659,4 +661,10 @@ class FilamentControllerMethodChannel extends FilamentController { @override // TODO: implement pickResult Stream get pickResult => throw UnimplementedError(); + + @override + String? getNameForEntity(FilamentEntity entity) { + // TODO: implement getNameForEntity + throw UnimplementedError(); + } }