Merge pull request #176 from anatawa12/errors-in-object-mapping

Errors in object mapping
anatawa12 · May 22, 2023 · 16c5798 · 16c5798
2 parents 16594d9 + d192bb3
commit 16c5798
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -16,6 +16,9 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Errors in Animation Mapping System `#176`
+  - Error with removed property
+  - Error with Property moved twice
 
 ### Security
 

diff --git a/Editor/ObjectMapping/AnimationObjectMapper.cs b/Editor/ObjectMapping/AnimationObjectMapper.cs
@@ -103,7 +103,10 @@ public EditorCurveBinding MapBinding(EditorCurveBinding binding)
                 binding.path = newPath;
 
                 if (componentInfo.PropertyMapping.TryGetValue(binding.propertyName, out var newProp))
+                {
+                    if (newProp == null) return default;
                     binding.propertyName = newProp;
+                }
             }
             else
             {

diff --git a/Editor/ObjectMapping/ObjectMappingBuilder.cs b/Editor/ObjectMapping/ObjectMappingBuilder.cs
@@ -105,7 +105,7 @@ public void MoveProperty(string oldProp, string newProp)
                     _afterPropertyIds.Remove(oldProp);
                     _afterPropertyIds[newProp] = propId;
                     if (!_beforePropertyIds.ContainsKey(oldProp))
-                        _beforePropertyIds.Add(newProp, propId);
+                        _beforePropertyIds.Add(oldProp, propId);
                 }
                 else
                 {

diff --git a/Test~/ObjectMappingTest.cs b/Test~/ObjectMappingTest.cs
@@ -156,6 +156,29 @@ public void RecordMovePropertyTest()
                 Is.EqualTo(B("child1", typeof(SkinnedMeshRenderer), "blendShapes.changed")));
         }
 
+        [Test]
+        public void RecordMovePropertyTwiceTest()
+        {
+            var root = new GameObject();
+            var child1 = Utils.NewGameObject("child1", root.transform);
+            var child1Component = child1.AddComponent<SkinnedMeshRenderer>();
+
+            var builder = new ObjectMappingBuilder(root);
+            builder.RecordMoveProperty(child1Component, "blendShapes.test", "blendShapes.changed0");
+            builder.RecordMoveProperty(child1Component, "blendShapes.changed0", "blendShapes.changed");
+
+            var built = builder.BuildObjectMapping();
+
+            var rootMapper = built.CreateAnimationMapper(root);
+
+            Assert.That(
+                rootMapper.MapBinding(B("child1", typeof(SkinnedMeshRenderer), "blendShapes.test")),
+                Is.EqualTo(B("child1", typeof(SkinnedMeshRenderer), "blendShapes.changed")));
+            Assert.That(
+                rootMapper.MapBinding(B("child1", typeof(SkinnedMeshRenderer), "blendShapes.changed0")),
+                Is.EqualTo(B("child1", typeof(SkinnedMeshRenderer), "blendShapes.changed")));
+        }
+
         [Test]
         public void RecordRemovePropertyTest()
         {
@@ -165,7 +188,6 @@ public void RecordRemovePropertyTest()
 
             var builder = new ObjectMappingBuilder(root);
             builder.RecordRemoveProperty(child1Component, "blendShapes.test");
-            Object.DestroyImmediate(child1Component);
 
             var built = builder.BuildObjectMapping();