From bd3454008619e10b8303f138d8be94785c6c20a7 Mon Sep 17 00:00:00 2001 From: Abra <47716519+abrasivetroop@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:03:48 +0300 Subject: [PATCH 1/6] Fix for resetting local transform of new created prefab child --- Source/Editor/SceneGraph/ActorNode.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Editor/SceneGraph/ActorNode.cs b/Source/Editor/SceneGraph/ActorNode.cs index 7c5a6c1ba..c0ee43c83 100644 --- a/Source/Editor/SceneGraph/ActorNode.cs +++ b/Source/Editor/SceneGraph/ActorNode.cs @@ -294,6 +294,9 @@ namespace FlaxEditor.SceneGraph /// public virtual void PostSpawn() { + _actor.LocalPosition = Vector3.Zero; + _actor.LocalEulerAngles = Vector3.Zero; + _actor.LocalScale = Vector3.One; } /// From c41d1aaec51a693882b85fa7d671e96e0c92d6e6 Mon Sep 17 00:00:00 2001 From: Abra <47716519+abrasivetroop@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:25:59 +0300 Subject: [PATCH 2/6] Update ActorNode.cs --- Source/Editor/SceneGraph/ActorNode.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Editor/SceneGraph/ActorNode.cs b/Source/Editor/SceneGraph/ActorNode.cs index c0ee43c83..7c5a6c1ba 100644 --- a/Source/Editor/SceneGraph/ActorNode.cs +++ b/Source/Editor/SceneGraph/ActorNode.cs @@ -294,9 +294,6 @@ namespace FlaxEditor.SceneGraph /// public virtual void PostSpawn() { - _actor.LocalPosition = Vector3.Zero; - _actor.LocalEulerAngles = Vector3.Zero; - _actor.LocalScale = Vector3.One; } /// From 101e33868b4167681c906835d94a38ed1448827a Mon Sep 17 00:00:00 2001 From: Abra <47716519+abrasivetroop@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:27:16 +0300 Subject: [PATCH 3/6] fix local transform prefab child --- Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs index 478439e0e..e80d300c4 100644 --- a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs +++ b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs @@ -366,6 +366,9 @@ namespace FlaxEditor.Windows.Assets actor.Transform = parentActor.Transform; actor.StaticFlags = parentActor.StaticFlags; actor.Layer = parentActor.Layer; + _actor.LocalPosition = Vector3.Zero; + _actor.LocalEulerAngles = Vector3.Zero; + _actor.LocalScale = Vector3.One; // Rename actor to identify it easily actor.Name = Utilities.Utils.IncrementNameNumber(actor.Name, x => parentActor.GetChild(x) == null); From 25b69449bc9d8eedc04659a5917f4b0f2ecda357 Mon Sep 17 00:00:00 2001 From: Abra <47716519+abrasivetroop@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:40:33 +0300 Subject: [PATCH 4/6] fix _actor > actor --- Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs index e80d300c4..2489f7ec4 100644 --- a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs +++ b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs @@ -366,9 +366,9 @@ namespace FlaxEditor.Windows.Assets actor.Transform = parentActor.Transform; actor.StaticFlags = parentActor.StaticFlags; actor.Layer = parentActor.Layer; - _actor.LocalPosition = Vector3.Zero; - _actor.LocalEulerAngles = Vector3.Zero; - _actor.LocalScale = Vector3.One; + actor.LocalPosition = Vector3.Zero; + actor.LocalEulerAngles = Vector3.Zero; + actor.LocalScale = Vector3.One; // Rename actor to identify it easily actor.Name = Utilities.Utils.IncrementNameNumber(actor.Name, x => parentActor.GetChild(x) == null); From 7eb0600549a3fffe6d6a2b08da73d6d2d6abbb00 Mon Sep 17 00:00:00 2001 From: Abra <47716519+abrasivetroop@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:50:07 +0300 Subject: [PATCH 5/6] fix transform identity --- Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs index 2489f7ec4..ca2e14295 100644 --- a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs +++ b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs @@ -366,9 +366,7 @@ namespace FlaxEditor.Windows.Assets actor.Transform = parentActor.Transform; actor.StaticFlags = parentActor.StaticFlags; actor.Layer = parentActor.Layer; - actor.LocalPosition = Vector3.Zero; - actor.LocalEulerAngles = Vector3.Zero; - actor.LocalScale = Vector3.One; + actor.LocalTransform = Transform.Identity; // Rename actor to identify it easily actor.Name = Utilities.Utils.IncrementNameNumber(actor.Name, x => parentActor.GetChild(x) == null); From 3133c6fb1b6cbb432d3ab93304d55162b54b44c0 Mon Sep 17 00:00:00 2001 From: Abra <47716519+abrasivetroop@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:02:52 +0300 Subject: [PATCH 6/6] remove transform/ --- Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs index ca2e14295..27fe7c254 100644 --- a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs +++ b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs @@ -363,10 +363,9 @@ namespace FlaxEditor.Windows.Assets if (parentActor != null) { // Match the parent - actor.Transform = parentActor.Transform; + actor.LocalTransform = Transform.Identity; actor.StaticFlags = parentActor.StaticFlags; actor.Layer = parentActor.Layer; - actor.LocalTransform = Transform.Identity; // Rename actor to identify it easily actor.Name = Utilities.Utils.IncrementNameNumber(actor.Name, x => parentActor.GetChild(x) == null);