Merge remote-tracking branch 'origin/master' into support_animation

yutopp · yutopp · Jun 5, 2022 · Jun 5, 2022 · Jun 5, 2022 · Jun 5, 2022
commit f3d42ec7ddf537be558db28c45073d47407c47ed
diff --git a/Assets/VGltfExamples/VRMExample/Scripts/VRMLoader.cs b/Assets/VGltfExamples/VRMExample/Scripts/VRMLoader.cs
@@ -234,7 +234,7 @@ async UniTaskVoid UIOnExportButtonClickedAsync()
             var filePath = outputFilePathInput.text;
             await Task.Run(() =>
             {
-                using (var fs = new FileStream(filePath, FileMode.Create))
+                using (var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write))
                 {
                     GltfContainer.ToGlb(fs, gltfContainer);
                 }

diff --git a/Packages/net.yutopp.vgltf.unity/Runtime/Importer.cs b/Packages/net.yutopp.vgltf.unity/Runtime/Importer.cs
@@ -179,6 +179,11 @@ public async Task<IImporterContext> ImportSceneNodes(GameObject parentGo, Cancel
             return TakeContext();
         }
 
+        public Task<IImporterContext> ImportSceneNodes(CancellationToken ct = default)
+        {
+            return ImportSceneNodes(null, ct);
+        }
+
         public async Task<IImporterContext> ImportEmpty(CancellationToken ct)
         {
             foreach (var hook in Hooks)

diff --git a/Packages/net.yutopp.vgltf.unity/Runtime/IndexedResourceDict.cs b/Packages/net.yutopp.vgltf.unity/Runtime/IndexedResourceDict.cs
@@ -14,8 +14,12 @@ namespace VGltf.Unity
 {
     public sealed class IndexedResourceDict<K, V> : IDisposable where V : UnityEngine.Object
     {
-        readonly IndexedDisposableResourceDict<K, Utils.DestroyOnDispose<V>> _internal =
-            new IndexedDisposableResourceDict<K, Utils.DestroyOnDispose<V>>();
+        readonly IndexedDisposableResourceDict<K, Utils.DestroyOnDispose<V>> _internal;
+
+        public IndexedResourceDict(IEqualityComparer<K> equalityComparer = default)
+        {
+            _internal = new IndexedDisposableResourceDict<K, Utils.DestroyOnDispose<V>>(equalityComparer);
+        }
 
         public IndexedResource<V> Add(K k, int index, string name, V v)
         {
@@ -98,8 +102,13 @@ static IndexedResource<V> Unwrap(IndexedResource<Utils.DestroyOnDispose<V>> wres
 
     public sealed class IndexedDisposableResourceDict<K, V> : IDisposable where V : IDisposable
     {
-        readonly Dictionary<K, IndexedResource<V>> _dict = new Dictionary<K, IndexedResource<V>>();
-        readonly Dictionary<string, IndexedResource<V>> _nameDict = new Dictionary<string, IndexedResource<V>>();
+        readonly Dictionary<K, IndexedResource<V>> _dict;
+        readonly MultiMap<string, IndexedResource<V>> _nameDict = new MultiMap<string, IndexedResource<V>>();
+
+        public IndexedDisposableResourceDict(IEqualityComparer<K> equalityComparer = default)
+        {
+            _dict = new Dictionary<K, IndexedResource<V>>(equalityComparer);
+        }
 
         public IndexedResource<V> Add(K k, int index, string name, V v)
         {