GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add skipping showing and applying changes to prefab root actor transform via Level

Browse Source 
#2125
This commit is contained in:
Wojtek Figat
2024-02-26 22:29:43 +01:00
parent 6905382310
commit 7428ecfe63
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
View File

@@ -245,9 +245,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
{
// Special case for new Script added to actor
if (editor.Values[0] is Script script && !script.HasPrefabLink)
{
return CreateDiffNode(editor);
}
// Skip if no change detected
var isRefEdited = editor.Values.IsReferenceValueModified;
@@ -258,9 +256,16 @@ namespace FlaxEditor.CustomEditors.Dedicated
if (editor.ChildrenEditors.Count == 0 || (isRefEdited && editor is CollectionEditor))
result = CreateDiffNode(editor);
bool isScriptEditorWithRefValue = editor is ScriptsEditor && editor.Values.HasReferenceValue;
bool isActorEditorInLevel = editor is ActorEditor && editor.Values[0] is Actor actor && actor.IsPrefabRoot && actor.Scene != null;
for (int i = 0; i < editor.ChildrenEditors.Count; i++)
{
var child = ProcessDiff(editor.ChildrenEditors[i], !isScriptEditorWithRefValue);
var childEditor = editor.ChildrenEditors[i];
// Special case for root actor transformation (can be applied only in Prefab editor, not in Level)
if (isActorEditorInLevel && childEditor.Values.Info.Name is "LocalPosition" or "LocalOrientation" or "LocalScale")
continue;
var child = ProcessDiff(childEditor, !isScriptEditorWithRefValue);
if (child != null)
{
if (result == null)
@@ -276,7 +281,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
{
var prefabObjectScript = prefabObjectScripts[j];
bool isRemoved = true;
for (int i = 0; i < editor.ChildrenEditors.Count; i++)
{
if (editor.ChildrenEditors[i].Values is ScriptsEditor.ScriptsContainer container && container.PrefabObjectId == prefabObjectScript.PrefabObjectID)
@@ -286,14 +290,12 @@ namespace FlaxEditor.CustomEditors.Dedicated
break;
}
}
if (isRemoved)
{
var dummy = new RemovedScriptDummy
{
PrefabObject = prefabObjectScript
};
var child = CreateDiffNode(dummy);
if (result == null)
result = CreateDiffNode(editor);

9
Source/Editor/Modules/PrefabsModule.cs
View File

@@ -225,8 +225,15 @@ namespace FlaxEditor.Modules
throw new ArgumentException("Missing prefab to apply.");
PrefabApplying?.Invoke(prefab, instance);
// When applying changes to prefab from actor in level ignore it's root transformation (see ActorEditor.ProcessDiff)
var originalTransform = instance.LocalTransform;
if (instance.IsPrefabRoot && instance.Scene != null)
instance.LocalTransform = prefab.GetDefaultInstance().Transform;
// Call backend
if (PrefabManager.Internal_ApplyAll(FlaxEngine.Object.GetUnmanagedPtr(instance)))
var failed = PrefabManager.Internal_ApplyAll(FlaxEngine.Object.GetUnmanagedPtr(instance));
instance.LocalTransform = originalTransform;
if (failed)
throw new Exception("Failed to apply the prefab. See log to learn more.");
PrefabApplied?.Invoke(prefab, instance);