Merge branch 'refs/heads/dev'

Faraz · Faraz · commit cbd86dbf3b6d · 2024-10-14T18:27:49.000+03:30
diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.8/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2024-10-07 02:35:16.696609","version":"3.22.3"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.8/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2024-10-14 18:08:53.321095","version":"3.22.3"}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v2.0.2
+
+### Fixes
+* Fix multiple model controllers issue
+* Updated minimum SDK version.
+
+
 ## v2.0.1
 
 ### Fixes
diff --git a/README.md b/README.md
@@ -176,7 +176,7 @@ Flutter3DViewer.obj(
 
 ```yaml
 dependencies:
-  flutter_3d_controller: ^2.0.1
+  flutter_3d_controller: ^2.0.2
 ```
 
 ### `AndroidManifest.xml` (Android only)
@@ -233,7 +233,7 @@ Modify the `<head>` tag of your `web/index.html` to load the JavaScript, like so
 ## Frequently Asked Questions
 - **The 3D model could not load** : First check the example, if models in examples loads, may be there is problem with your model or your model path.
 - **The animation list could not be retrieved** : Check if there are any special characters in the animation names that might cause a JSON encoding error.
-- **The 3D model could not load from url** : It might be due to [CORS] security restrictions. The server hosting the model file *must* send appropriate CORS response headers for viewer to be able to load the file. See [google/model-viewer#1015]
+- **The 3D model could not load from url** : It might be due to [CORS] security restrictions. The server hosting the model file *must* send appropriate CORS response headers for viewer to be able to load the file. See [google/model-viewer#1015](google/model-viewer#1015)
 
 ## Not working with a url on a real iOS device?
 
diff --git a/example/assets/business_woman.glb b/example/assets/business_woman.glb
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -0,0 +1,22 @@
+PODS:
+  - Flutter (1.0.0)
+  - webview_flutter_wkwebview (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  webview_flutter_wkwebview:
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
+
+SPEC CHECKSUMS:
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
+
+PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
+
+COCOAPODS: 1.15.2
diff --git a/ios/Flutter/Generated.xcconfig b/ios/Flutter/Generated.xcconfig
@@ -4,8 +4,8 @@ FLUTTER_APPLICATION_PATH=/Users/faraz/StudioProjects/flutter_3d_controller
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_TARGET=lib/main.dart
 FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=2.0.0
-FLUTTER_BUILD_NUMBER=2.0.0
+FLUTTER_BUILD_NAME=2.0.1
+FLUTTER_BUILD_NUMBER=2.0.1
 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
 EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
 DART_OBFUSCATION=false
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
@@ -5,8 +5,8 @@ export "FLUTTER_APPLICATION_PATH=/Users/faraz/StudioProjects/flutter_3d_controll
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=2.0.0"
-export "FLUTTER_BUILD_NUMBER=2.0.0"
+export "FLUTTER_BUILD_NAME=2.0.1"
+export "FLUTTER_BUILD_NUMBER=2.0.1"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"
diff --git a/lib/src/data/datasources/flutter_3d_datasource_mobile.dart b/lib/src/data/datasources/flutter_3d_datasource_mobile.dart
@@ -6,19 +6,23 @@ import 'package:webview_flutter/webview_flutter.dart';
 class Flutter3DDatasource implements IFlutter3DDatasource {
   final WebViewController? _webViewController;
   final bool _activeGestureInterceptor;
+  final String _viewerId;
 
   Flutter3DDatasource(
-      [this._webViewController, this._activeGestureInterceptor = false]);
+    this._viewerId, [
+    this._webViewController,
+    this._activeGestureInterceptor = false,
+  ]);
 
   @override
   void playAnimation({String? animationName}) {
     animationName == null
         ? executeCustomJsCode(
-            "const modelViewer = document.querySelector(\"model-viewer\");"
+            "const modelViewer = document.getElementById(\"$_viewerId\");"
             "modelViewer.play();",
           )
         : executeCustomJsCode(
-            "const modelViewer = document.querySelector(\"model-viewer\");"
+            "const modelViewer = document.getElementById(\"$_viewerId\");"
             "modelViewer.animationName = \"$animationName\";"
             "modelViewer.play();",
           );
@@ -27,15 +31,15 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void pauseAnimation() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.pause();",
     );
   }
 
   @override
   void resetAnimation() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.pause();"
       "modelViewer.currentTime = 0;"
       "modelViewer.play();",
@@ -45,7 +49,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void stopAnimation() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.pause();"
       "modelViewer.currentTime = 0;",
     );
@@ -55,7 +59,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   Future<List<String>> getAvailableAnimations() async {
     try {
       final result = await executeCustomJsCodeWithResult(
-        "document.querySelector(\"model-viewer\").availableAnimations;",
+        "document.getElementById(\"$_viewerId\").availableAnimations;",
       );
       String checkedResult;
       if (result is String) {
@@ -75,15 +79,15 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void setTexture({required String textureName}) {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.variantName = \"$textureName\";",
     );
   }
 
   @override
   Future<List<String>> getAvailableTextures() async {
     final result = await executeCustomJsCodeWithResult(
-      "document.querySelector(\"model-viewer\").availableVariants;",
+      "document.getElementById(\"$_viewerId\").availableVariants;",
     );
     String checkedResult;
     if (result is String) {
@@ -97,7 +101,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void setCameraTarget(double x, double y, double z) {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraTarget = \"${x}m ${y}m ${z}m\";",
       100,
       300,
@@ -108,7 +112,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void resetCameraTarget() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraTarget = \"auto auto auto\";",
       100,
       300,
@@ -119,7 +123,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void setCameraOrbit(double theta, double phi, double radius) {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraOrbit = \"${theta}deg ${phi}deg $radius%\";",
       100,
       400,
@@ -130,7 +134,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void resetCameraOrbit() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraOrbit = \"0deg 75deg 105%\" ;",
       100,
       400,
diff --git a/lib/src/data/datasources/flutter_3d_datasource_web.dart b/lib/src/data/datasources/flutter_3d_datasource_web.dart
@@ -1,25 +1,26 @@
 // ignore_for_file: avoid_web_libraries_in_flutter
-import 'package:flutter/services.dart';
 import 'package:flutter_3d_controller/src/core/exception/flutter_3d_controller_exception.dart';
 import 'package:flutter_3d_controller/src/data/datasources/i_flutter_3d_datasource.dart';
 import 'dart:js' as js;
-import 'package:webview_flutter/webview_flutter.dart';
 
 class Flutter3DDatasource implements IFlutter3DDatasource {
-  final WebViewController? _webViewController;
+  final String _viewerId;
 
   Flutter3DDatasource(
-      [this._webViewController, activeGestureInterceptor = false]);
+    this._viewerId, [
+    webViewController,
+    activeGestureInterceptor = false,
+  ]);
 
   @override
   void playAnimation({String? animationName}) {
     animationName == null
         ? executeCustomJsCode(
-            "const modelViewer = document.querySelector(\"model-viewer\");"
+            "const modelViewer = document.getElementById(\"$_viewerId\");"
             "modelViewer.play();",
           )
         : executeCustomJsCode(
-            "const modelViewer = document.querySelector(\"model-viewer\");"
+            "const modelViewer = document.getElementById(\"$_viewerId\");"
             "modelViewer.animationName = \"$animationName\";"
             "modelViewer.play();",
           );
@@ -28,15 +29,15 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void pauseAnimation() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.pause();",
     );
   }
 
   @override
   void resetAnimation() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.pause();"
       "modelViewer.currentTime = 0;"
       "modelViewer.play();",
@@ -46,7 +47,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void stopAnimation() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.pause();"
       "modelViewer.currentTime = 0;",
     );
@@ -56,7 +57,7 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   Future<List<String>> getAvailableAnimations() async {
     try {
       final result = await executeCustomJsCodeWithResult(
-        "document.querySelector(\"model-viewer\").availableAnimations;",
+        "document.getElementById(\"$_viewerId\").availableAnimations;",
       );
       return result.map<String>((e) => e.toString()).toList();
     } catch (e) {
@@ -68,50 +69,47 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   @override
   void setTexture({required String textureName}) {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.variantName = \"$textureName\";",
     );
   }
 
   @override
   Future<List<String>> getAvailableTextures() async {
     final result = await executeCustomJsCodeWithResult(
-      "document.querySelector(\"model-viewer\").availableVariants;",
+      "document.getElementById(\"$_viewerId\").availableVariants;",
     );
     return result.map<String>((e) => e.toString()).toList();
   }
 
   @override
   void setCameraTarget(double x, double y, double z) {
-    if (_webViewController != null) {
-      throw PlatformException(code: '130', message: 'Mismatch platform usage');
-    }
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraTarget = \"${x}m ${y}m ${z}m\";",
     );
   }
 
   @override
   void resetCameraTarget() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraTarget = \"auto auto auto\";",
     );
   }
 
   @override
   void setCameraOrbit(double theta, double phi, double radius) {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraOrbit = \"${theta}deg ${phi}deg $radius%\";",
     );
   }
 
   @override
   void resetCameraOrbit() {
     executeCustomJsCode(
-      "const modelViewer = document.querySelector(\"model-viewer\");"
+      "const modelViewer = document.getElementById(\"$_viewerId\");"
       "modelViewer.cameraOrbit = \"0deg 75deg 105%\" ;",
     );
   }
diff --git a/lib/src/data/datasources/i_flutter_3d_datasource.dart b/lib/src/data/datasources/i_flutter_3d_datasource.dart
@@ -45,6 +45,8 @@ abstract class IFlutter3DDatasource {
   Future<dynamic> executeCustomJsCodeWithResult(String code);
 
   ///It will make specific instance of datasource per platform
-  factory IFlutter3DDatasource(value, activeGestureInterceptor) =>
-      Flutter3DDatasource(value, activeGestureInterceptor);
+  factory IFlutter3DDatasource(
+          viewerId, webViewController, activeGestureInterceptor) =>
+      Flutter3DDatasource(
+          viewerId, webViewController, activeGestureInterceptor);
 }
diff --git a/lib/src/widgets/flutter_3d_viewer.dart b/lib/src/widgets/flutter_3d_viewer.dart
@@ -101,7 +101,8 @@ class _Flutter3DViewerState extends State<Flutter3DViewer> {
     _id = _utils.generateId();
     _controller = widget.controller ?? Flutter3DController();
     if (kIsWeb) {
-      _controller.init(Flutter3DRepository(IFlutter3DDatasource(null, false)));
+      _controller
+          .init(Flutter3DRepository(IFlutter3DDatasource(_id, null, false)));
     }
     super.initState();
   }
@@ -161,6 +162,7 @@ class _Flutter3DViewerState extends State<Flutter3DViewer> {
                     _controller.init(
                       Flutter3DRepository(
                         IFlutter3DDatasource(
+                          _id,
                           value,
                           widget.activeGestureInterceptor,
                         ),
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_3d_controller
 description: The most complete Flutter package for rendering interactive 3D models in various formats (GLB, GLTF, OBJ, FBX), with the ability to control animations, textures, camera, and more.
-version: 2.0.1
+version: 2.0.2
 homepage: https://github.com/m-r-davari/flutter_3d_controller
 
 topics:
@@ -16,8 +16,8 @@ platforms:
   web:
 
 environment:
-  sdk: '>=3.0.6 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.8/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2024-10-07 02:35:16.696609","version":"3.22.3"}
	`1`	+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.8/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2024-10-14 18:08:53.321095","version":"3.22.3"}