Merge branch 'refs/heads/dev'

# Conflicts:
#	.flutter-plugins-dependencies
#	example/pubspec.lock

Author: Faraz

.flutter-plugins

@@ -1,4 +1,7 @@
 # This is a generated file; do not edit or check into version control.
-webview_flutter=/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter-4.8.0/
-webview_flutter_android=/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.8/
-webview_flutter_wkwebview=/Users/faraz/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/
+flutter_inappwebview=/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview-6.1.5/
+flutter_inappwebview_android=/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_android-1.1.3/
+flutter_inappwebview_ios=/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_ios-1.1.2/
+flutter_inappwebview_macos=/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_macos-1.1.2/
+flutter_inappwebview_web=/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_web-1.1.2/
+flutter_inappwebview_windows=/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_windows-0.6.0/

.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":"2025-01-02 02:22:50.796773","version":"3.22.3"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_inappwebview_ios","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_ios-1.1.2/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_inappwebview_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_android-1.1.3/","native_build":true,"dependencies":[]}],"macos":[{"name":"flutter_inappwebview_macos","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_macos-1.1.2/","native_build":true,"dependencies":[]}],"linux":[],"windows":[{"name":"flutter_inappwebview_windows","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_windows-0.6.0/","native_build":true,"dependencies":[]}],"web":[{"name":"flutter_inappwebview_web","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_web-1.1.2/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_inappwebview","dependencies":["flutter_inappwebview_android","flutter_inappwebview_ios","flutter_inappwebview_macos","flutter_inappwebview_web","flutter_inappwebview_windows"]},{"name":"flutter_inappwebview_android","dependencies":[]},{"name":"flutter_inappwebview_ios","dependencies":[]},{"name":"flutter_inappwebview_macos","dependencies":[]},{"name":"flutter_inappwebview_web","dependencies":[]},{"name":"flutter_inappwebview_windows","dependencies":[]}],"date_created":"2025-01-08 19:22:57.405422","version":"3.27.1","swift_package_manager_enabled":false}

.gitignore

@@ -29,3 +29,4 @@ migrate_working_dir/
 .packages
 build/
 /lib/src/core/modules/model_viewer/f3dc_scripts.js
+/lib/src/core/modules/model_viewer/f3dc_scripts_v2.js

CHANGELOG.md

@@ -1,3 +1,17 @@
+## v2.1.0
+
+### Features
+* Change 3D models by setState
+
+### Improvements
+* Improve gesture interceptor
+* Improve performance
+* Update dependencies
+
+### Fixes
+* Fix camera shake rare bug
+
+
 ## v2.0.3
 
 ### Fixes

README.md

@@ -15,6 +15,7 @@ Notably, when testing **other available packages**, users may experience **gestu
 - Mobile and Web stable version (support **glb**, **gltf** and **obj** format)
 - Load 3D model from assets
 - Load 3D model from URL
+- Change 3D models by setState
 - Gesture interceptor (Prevents gesture recognizers from malfunctioning)
 - Controller model loading value listener
 - Model loading states callbacks, **onProgress**, **onLoad** and **onError**
@@ -176,7 +177,7 @@ Flutter3DViewer.obj(
 
 ```yaml
 dependencies:
-  flutter_3d_controller: ^2.0.3
+  flutter_3d_controller: ^2.1.0
 ```
 
 ### `AndroidManifest.xml` (Android only)

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -16,9 +16,9 @@ public final class GeneratedPluginRegistrant {
   private static final String TAG = "GeneratedPluginRegistrant";
   public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     try {
-      flutterEngine.getPlugins().add(new io.flutter.plugins.webviewflutter.WebViewFlutterPlugin());
+      flutterEngine.getPlugins().add(new com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin());
     } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin webview_flutter_android, io.flutter.plugins.webviewflutter.WebViewFlutterPlugin", e);
+      Log.e(TAG, "Error registering plugin flutter_inappwebview_android, com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin", e);
     }
   }
 }

android/local.properties

@@ -1,2 +1,2 @@
 sdk.dir=/Users/faraz/Library/Android/sdk
-flutter.sdk=/Users/faraz/flutter_sdk
+flutter.sdk=/Users/faraz/flutter_sdk_v3.27.1

example/.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

example/assets/Football.mtl

@@ -0,0 +1,26 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 09.04.2013 13:41:41
+
+newmtl 02___Default
+	Ns 25.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.9098 0.9098 0.9098
+	Kd 0.9098 0.9098 0.9098
+	Ks 0.1350 0.1350 0.1350
+	Ke 0.0000 0.0000 0.0000
+
+newmtl 01___Default
+	Ns 25.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.0000 0.0000 0.0000
+	Kd 0.0000 0.0000 0.0000
+	Ks 0.1350 0.1350 0.1350
+	Ke 0.0000 0.0000 0.0000