Optimize StudioObjectExtensions.GetSceneId

IllusionMods · Dec 13, 2023 · f180a61 · f180a61
1 parent 3da7287
commit f180a61
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/Shared.CharaStudio/Studio/StudioObjectExtensions.cs b/src/Shared.CharaStudio/Studio/StudioObjectExtensions.cs
@@ -37,11 +37,9 @@ public static int GetSceneId(this ObjectCtrlInfo obj)
             if (obj == null) throw new ArgumentNullException(nameof(obj));
             if (Studio == null) throw new InvalidOperationException("Studio is not initialized yet!");
 
-            foreach (var info in Studio.dicObjectCtrl)
-            {
-                if (info.Value == obj)
-                    return info.Key;
-            }
+            if (Studio.dicObjectCtrl.TryGetValue(obj.objectInfo.dicKey, out var oci) && oci == obj)
+                return obj.objectInfo.dicKey;
+
             return -1;
         }
 
@@ -53,12 +51,10 @@ public static int GetSceneId(this ObjectInfo obj)
         {
             if (obj == null) throw new ArgumentNullException(nameof(obj));
             if (Studio == null) throw new InvalidOperationException("Studio is not initialized yet!");
+
+            if (Studio.dicObjectCtrl.TryGetValue(obj.dicKey, out var oci) && oci.objectInfo == obj)
+                return obj.dicKey;
 
-            foreach (var info in Studio.dicObjectCtrl)
-            {
-                if (info.Value.objectInfo == obj)
-                    return info.Key;
-            }
             return -1;
         }