From 2c6e953b4b239344f715da51600d92f74225fd2a Mon Sep 17 00:00:00 2001
From: Nick Fisher <nick.fisher@avinium.com>
Date: Sat, 11 May 2024 10:16:13 +0800
Subject: [PATCH] fix compatibility imports

---
 dart_filament/lib/dart_filament.dart                        | 1 -
 .../dart_filament/compatibility/native/compatibility.dart   | 2 ++
 dart_filament/lib/dart_filament/filament_viewer_impl.dart   | 1 -
 dart_filament/lib/dart_filament/scene.dart                  | 6 +++---
 dart_filament/lib/dart_filament/utils/dart_resources.dart   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dart_filament/lib/dart_filament.dart b/dart_filament/lib/dart_filament.dart
index 1ace6852..48cdfb48 100644
--- a/dart_filament/lib/dart_filament.dart
+++ b/dart_filament/lib/dart_filament.dart
@@ -3,5 +3,4 @@ library filament_dart;
 export 'dart_filament/entities/filament_entity.dart';
 export 'dart_filament/abstract_filament_viewer.dart';
 export 'dart_filament/filament_viewer_impl.dart';
-export 'dart_filament/dart_filament.g.dart';
 export 'dart_filament/entities/entity_transform_controller.dart';
diff --git a/dart_filament/lib/dart_filament/compatibility/native/compatibility.dart b/dart_filament/lib/dart_filament/compatibility/native/compatibility.dart
index b14b0fba..383c0993 100644
--- a/dart_filament/lib/dart_filament/compatibility/native/compatibility.dart
+++ b/dart_filament/lib/dart_filament/compatibility/native/compatibility.dart
@@ -1,5 +1,7 @@
 import 'package:ffi/ffi.dart';
 export 'package:ffi/ffi.dart';
+export 'dart_filament.g.dart';
+
 
 final allocator = calloc;
 
diff --git a/dart_filament/lib/dart_filament/filament_viewer_impl.dart b/dart_filament/lib/dart_filament/filament_viewer_impl.dart
index 8bad3171..5f33e1c7 100644
--- a/dart_filament/lib/dart_filament/filament_viewer_impl.dart
+++ b/dart_filament/lib/dart_filament/filament_viewer_impl.dart
@@ -9,7 +9,6 @@ import 'abstract_filament_viewer.dart';
 import 'scene.dart';
 import 'compatibility/compatibility.dart';
 
-import 'dart:ffi';
 
 // ignore: constant_identifier_names
 const FilamentEntity _FILAMENT_ASSET_ERROR = 0;
diff --git a/dart_filament/lib/dart_filament/scene.dart b/dart_filament/lib/dart_filament/scene.dart
index d9ae4119..abbf7409 100644
--- a/dart_filament/lib/dart_filament/scene.dart
+++ b/dart_filament/lib/dart_filament/scene.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
-import 'dart:ffi';
-import 'package:dart_filament/dart_filament/dart_filament.g.dart';
+
 import 'package:dart_filament/dart_filament/entities/filament_entity.dart';
 import 'package:dart_filament/dart_filament/filament_viewer_impl.dart';
-import 'package:ffi/ffi.dart';
+
+import 'compatibility/compatibility.dart';
 
 import 'entities/gizmo.dart';
 import 'abstract_filament_viewer.dart';
diff --git a/dart_filament/lib/dart_filament/utils/dart_resources.dart b/dart_filament/lib/dart_filament/utils/dart_resources.dart
index 002f4358..c7119ad9 100644
--- a/dart_filament/lib/dart_filament/utils/dart_resources.dart
+++ b/dart_filament/lib/dart_filament/utils/dart_resources.dart
@@ -1,7 +1,7 @@
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:dart_filament/dart_filament/dart_filament.g.dart';
+import '../compatibility/compatibility.dart';
 import 'package:ffi/ffi.dart';
 
 class DartResourceLoader {