fix: AssetBundle can be loaded only once (#309)

* fix(sample): invalid AssetBundle path * fix(sdk): load AssetBundle only once
homuler · Oct 10, 2021 · 702434d · 702434d
1 parent 10fba23
commit 702434d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/Assets/Mediapipe/Samples/Common/Scripts/Bootstrap.cs b/Assets/Mediapipe/Samples/Common/Scripts/Bootstrap.cs
@@ -66,7 +66,7 @@ private IEnumerator Start()
       {
         case AssetLoaderType.AssetBundle:
           {
-            AssetLoader.Provide(new AssetBundleResourceManager(Path.Combine(Application.streamingAssetsPath, "mediapipe")));
+            AssetLoader.Provide(new AssetBundleResourceManager("mediapipe"));
             break;
           }
         case AssetLoaderType.StreamingAssets:

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Util/AssetBundleResourceManager.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Util/AssetBundleResourceManager.cs
@@ -36,19 +36,9 @@ public override bool IsPrepared(string name)
       return File.Exists(path);
     }
 
-    private AssetBundle _assetBundle;
-    private AssetBundle assetBundle
-    {
-      get => _assetBundle;
-      set
-      {
-        if (_assetBundle != null)
-        {
-          _assetBundle.Unload(false);
-        }
-        _assetBundle = value;
-      }
-    }
+
+    private AssetBundleCreateRequest _assetBundleReq;
+    private AssetBundle assetBundle => _assetBundleReq?.assetBundle;
 
     public void ClearAllCacheFiles()
     {
@@ -66,15 +56,14 @@ public IEnumerator LoadAssetBundleAsync()
         yield break;
       }
 
-      var bundleLoadReq = AssetBundle.LoadFromFileAsync(_AssetBundlePath);
-      yield return bundleLoadReq;
+      // No need to lock because this code can be run in main thread only.
+      _assetBundleReq = AssetBundle.LoadFromFileAsync(_AssetBundlePath);
+      yield return _assetBundleReq;
 
-      if (bundleLoadReq.assetBundle == null)
+      if (_assetBundleReq.assetBundle == null)
       {
         throw new IOException($"Failed to load {_AssetBundlePath}");
       }
-
-      assetBundle = bundleLoadReq.assetBundle;
     }
 
     public override IEnumerator PrepareAssetAsync(string name, string uniqueKey, bool overwrite = true)