From f6eb38fa4e0903f9ac19b2baea734d0e3007d77f Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Mon, 14 Feb 2022 19:53:16 +0900
Subject: [PATCH] remove Deconstruct of KeyValuePair

---
 .../Runtime/Extensions/KeyValuePairExtensions.cs    | 13 -------------
 .../Extensions/KeyValuePairExtensions.cs.meta       | 11 -----------
 Assets/VRM10/vrmlib/Runtime/Animation.cs            |  5 ++++-
 Assets/VRM10/vrmlib/Runtime/Model.cs                |  8 ++++++--
 4 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs
 delete mode 100644 Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs.meta

diff --git a/Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs b/Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs
deleted file mode 100644
index 5f94c8101..000000000
--- a/Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace UniGLTF
-{
-    public static class KeyValuePairExtensions
-    {
-        public static void Deconstruct<T, U>(this KeyValuePair<T, U> pair, out T key, out U value)
-        {
-            key = pair.Key;
-            value = pair.Value;
-        }
-    }
-}
diff --git a/Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs.meta b/Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs.meta
deleted file mode 100644
index 022151d5f..000000000
--- a/Assets/UniGLTF/Runtime/Extensions/KeyValuePairExtensions.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: be00d5fb3e17dbf4e87ec4a7aae8dbc3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/VRM10/vrmlib/Runtime/Animation.cs b/Assets/VRM10/vrmlib/Runtime/Animation.cs
index 01d2f7049..5846a9f4f 100644
--- a/Assets/VRM10/vrmlib/Runtime/Animation.cs
+++ b/Assets/VRM10/vrmlib/Runtime/Animation.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Numerics;
 using UniGLTF;
 
+
 namespace VrmLib
 {
     /// <summary>
@@ -160,8 +161,10 @@ namespace VrmLib
                 list.Clear();
 
                 var min = float.PositiveInfinity;
-                foreach (var (curve, index) in curves)
+                foreach (var kv in curves)
                 {
+                    var curve = kv.Key;
+                    var index = kv.Value;
                     var keyframe = new KeyFrameReference(curve, index);
                     var seconds = keyframe.Seconds;
                     if (seconds < min)
diff --git a/Assets/VRM10/vrmlib/Runtime/Model.cs b/Assets/VRM10/vrmlib/Runtime/Model.cs
index 297839456..f18976890 100644
--- a/Assets/VRM10/vrmlib/Runtime/Model.cs
+++ b/Assets/VRM10/vrmlib/Runtime/Model.cs
@@ -450,8 +450,10 @@ namespace VrmLib
             {
                 foreach (var m in g.Meshes)
                 {
-                    foreach (var (k, v) in m.VertexBuffer)
+                    foreach (var kv in m.VertexBuffer)
                     {
+                        var k = kv.Key;
+                        var v = kv.Value;
                         if (k == VertexBuffer.PositionKey || k == VertexBuffer.NormalKey)
                         {
                             if (unique.Add(v.Bytes))
@@ -485,8 +487,10 @@ namespace VrmLib
 
                     foreach (var mt in m.MorphTargets)
                     {
-                        foreach (var (k, v) in mt.VertexBuffer)
+                        foreach (var kv in mt.VertexBuffer)
                         {
+                            var k = kv.Key;
+                            var v = kv.Value;
                             if (k == VertexBuffer.PositionKey || k == VertexBuffer.NormalKey)
                             {
                                 if (unique.Add(v.Bytes))