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

don't expose FILAMENT_ASSET_ERROR

Browse Source
This commit is contained in:
Nick Fisher
2023-10-11 15:34:19 +08:00
parent 08ba9400d3
commit 1be2367b4f
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/filament_controller.dart
View File

@@ -5,7 +5,6 @@ import 'package:polyvox_filament/animations/bone_animation_data.dart';
import 'package:polyvox_filament/animations/morph_animation_data.dart'; import 'package:polyvox_filament/animations/morph_animation_data.dart';
typedef FilamentEntity = int; typedef FilamentEntity = int;
const FilamentEntity FILAMENT_ASSET_ERROR = 0;
enum ToneMapper { ACES, FILMIC, LINEAR } enum ToneMapper { ACES, FILMIC, LINEAR }

7
lib/filament_controller_ffi.dart
View File

@@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:ffi'; import 'dart:ffi';
import 'dart:io'; import 'dart:io';
import 'dart:typed_data';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:ffi/ffi.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/animations/morph_animation_data.dart';
import 'package:polyvox_filament/generated_bindings.dart'; import 'package:polyvox_filament/generated_bindings.dart';
const FilamentEntity _FILAMENT_ASSET_ERROR = 0;
class FilamentControllerFFI extends FilamentController { class FilamentControllerFFI extends FilamentController {
late MethodChannel _channel = MethodChannel("app.polyvox.filament/event"); late MethodChannel _channel = MethodChannel("app.polyvox.filament/event");
@@ -352,7 +353,7 @@ class FilamentControllerFFI extends FilamentController {
} }
var asset = _lib.load_glb_ffi( var asset = _lib.load_glb_ffi(
_assetManager!, path.toNativeUtf8().cast<Char>(), unlit); _assetManager!, path.toNativeUtf8().cast<Char>(), unlit);
if (asset == FILAMENT_ASSET_ERROR) { if (asset == _FILAMENT_ASSET_ERROR) {
throw Exception("An error occurred loading the asset at $path"); throw Exception("An error occurred loading the asset at $path");
} }
return asset; return asset;
@@ -372,7 +373,7 @@ class FilamentControllerFFI extends FilamentController {
_assetManager!, _assetManager!,
path.toNativeUtf8().cast<Char>(), path.toNativeUtf8().cast<Char>(),
relativeResourcePath.toNativeUtf8().cast<Char>()); relativeResourcePath.toNativeUtf8().cast<Char>());
if (asset == FILAMENT_ASSET_ERROR) { if (asset == _FILAMENT_ASSET_ERROR) {
throw Exception("An error occurred loading the asset at $path"); throw Exception("An error occurred loading the asset at $path");
} }
return asset; return asset;

10
lib/filament_controller_method_channel.dart
View File

@@ -9,6 +9,8 @@ import 'filament_controller.dart';
typedef AssetManager = int; 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 a previous iteration of FilamentController that used platform channels for every distinct platform.
/// This is no longer used; currently kept only for reference/posterity. /// This is no longer used; currently kept only for reference/posterity.
@@ -245,7 +247,7 @@ class FilamentControllerMethodChannel extends FilamentController {
} }
var asset = var asset =
await _channel.invokeMethod("loadGlb", [_assetManager, path, unlit]); 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"); throw Exception("An error occurred loading the asset at $path");
} }
return asset; return asset;
@@ -659,4 +661,10 @@ class FilamentControllerMethodChannel extends FilamentController {
@override @override
// TODO: implement pickResult // TODO: implement pickResult
Stream<FilamentEntity?> get pickResult => throw UnimplementedError(); Stream<FilamentEntity?> get pickResult => throw UnimplementedError();
@override
String? getNameForEntity(FilamentEntity entity) {
// TODO: implement getNameForEntity
throw UnimplementedError();
}
} }