diff --git a/thermion_dart/.gitignore b/thermion_dart/.gitignore index 2f4ad4bd..f8c0ca47 100644 --- a/thermion_dart/.gitignore +++ b/thermion_dart/.gitignore @@ -1,3 +1,4 @@ native/web/build/ +native/web/lib/**/* pubspec.lock test/output/* \ No newline at end of file diff --git a/thermion_dart/lib/thermion_dart.dart b/thermion_dart/lib/thermion_dart.dart index 7288ea20..0d69812a 100644 --- a/thermion_dart/lib/thermion_dart.dart +++ b/thermion_dart/lib/thermion_dart.dart @@ -1,6 +1,5 @@ library filament_dart; -export 'thermion_dart/entities/thermion_entity.dart'; export 'thermion_dart/thermion_viewer.dart'; export 'thermion_dart/thermion_viewer_ffi.dart'; export 'thermion_dart/entities/entity_transform_controller.dart'; diff --git a/thermion_dart/lib/thermion_dart/compatibility/web/interop/filament_viewer_wasm.dart b/thermion_dart/lib/thermion_dart/compatibility/web/interop/filament_viewer_wasm.dart index c6345447..cbca9454 100644 --- a/thermion_dart/lib/thermion_dart/compatibility/web/interop/filament_viewer_wasm.dart +++ b/thermion_dart/lib/thermion_dart/compatibility/web/interop/filament_viewer_wasm.dart @@ -6,11 +6,7 @@ import 'dart:typed_data'; import 'package:web/web.dart'; import 'package:animation_tools_dart/animation_tools_dart.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; -import 'package:thermion_dart/thermion_dart/compatibility/web/interop/shims/thermion_dart_api_js_shim.dart'; - -import 'package:thermion_dart/thermion_dart/scene.dart'; import 'package:vector_math/vector_math_64.dart'; -import 'shims/thermion_viewer_js_shim.dart'; extension type _EmscriptenModule(JSObject _) implements JSObject { external JSAny? ccall(String name, String returnType, diff --git a/thermion_dart/lib/thermion_dart/thermion_viewer_ffi.dart b/thermion_dart/lib/thermion_dart/thermion_viewer_ffi.dart index c3f872ae..ab83957e 100644 --- a/thermion_dart/lib/thermion_dart/thermion_viewer_ffi.dart +++ b/thermion_dart/lib/thermion_dart/thermion_viewer_ffi.dart @@ -1608,7 +1608,7 @@ class ThermionViewerFFI extends ThermionViewer { } for (int i = 0; i < indices.length; i++) { - indicesPtr.elementAt(i).value = indices[i]; + (indicesPtr + i).value = indices[i]; } var entity = await withIntCallback((callback) => create_geometry_ffi( diff --git a/thermion_dart/lib/thermion_dart/utils/dart_resources.dart b/thermion_dart/lib/thermion_dart/utils/dart_resources.dart index cd8d8d2d..e9b0f71d 100644 --- a/thermion_dart/lib/thermion_dart/utils/dart_resources.dart +++ b/thermion_dart/lib/thermion_dart/utils/dart_resources.dart @@ -1,7 +1,6 @@ import 'dart:ffi'; import 'dart:io'; import '../compatibility/compatibility.dart'; -import 'package:ffi/ffi.dart' hide Utf8Pointer; class DartResourceLoader { static final _assets = {};