Merge branch 'development'

ProwlEngine · Nov 25, 2024 · 5b31c8b · 5b31c8b
2 parents 215f9be + 3c215d9
commit 5b31c8b
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 20 deletions.
diff --git a/Prowl.Editor/Editor/AssetsBrowserWindow.cs b/Prowl.Editor/Editor/AssetsBrowserWindow.cs
@@ -10,7 +10,7 @@
 using Prowl.Runtime;
 using Prowl.Runtime.GUI;
 using Prowl.Runtime.Rendering;
-using Prowl.Runtime.Utilities;
+using Prowl.Runtime.Utils;
 
 namespace Prowl.Editor;
 

diff --git a/Prowl.Editor/Editor/ScriptedEditors/GameObjectEditor.cs b/Prowl.Editor/Editor/ScriptedEditors/GameObjectEditor.cs
@@ -11,7 +11,6 @@
 using Prowl.Runtime.Cloning;
 using Prowl.Runtime.GUI;
 using Prowl.Runtime.GUI.Layout;
-using Prowl.Runtime.Utilities;
 using Prowl.Runtime.Utils;
 
 using static Prowl.Editor.EditorGUI;

diff --git a/Prowl.Editor/Utilities/UndoRedo/Actions/GameObjects/GameObjectActions.cs b/Prowl.Editor/Utilities/UndoRedo/Actions/GameObjects/GameObjectActions.cs
@@ -6,7 +6,7 @@
 using Prowl.Runtime;
 using Prowl.Runtime.Cloning;
 using Prowl.Runtime.SceneManagement;
-using Prowl.Runtime.Utilities;
+using Prowl.Runtime.Utils;
 
 namespace Prowl.Editor.Utilities;
 
@@ -66,10 +66,10 @@ protected override void Do()
         if (go == null)
             throw new InvalidOperationException("Could not find GameObject with identifier: " + GameObject);
 
-        _gameObject = go.DeepClone(new(false));
+        _gameObject = go.DeepClone();
         _parent = go.parent?.Identifier ?? Guid.Empty;
 
-        var clone = _gameObject.DeepClone();
+        var clone = _gameObject.DeepClone(new(false));
         _clone = clone.Identifier;
         GameObject? parent = EngineObject.FindObjectByIdentifier<GameObject>(_parent);
         if (parent != null)

diff --git a/Prowl.Runtime/Components/Physics/Rigidbody3D.cs b/Prowl.Runtime/Components/Physics/Rigidbody3D.cs
@@ -159,7 +159,7 @@ public override void Update()
         Transform.rotation = new Quaternion(_body.Orientation.X, _body.Orientation.Y, _body.Orientation.Z, _body.Orientation.W);
     }
 
-    public override void DrawGizmos()
+    public override void DrawGizmosSelected()
     {
         if (_body == null || _body.Handle.IsZero || !Application.IsEditor) return;
 

diff --git a/Prowl.Runtime/Components/Testings/TestDrawers.cs b/Prowl.Runtime/Components/Testings/TestDrawers.cs
@@ -5,7 +5,7 @@
 
 using Prowl.Icons;
 
-namespace Prowl.Runtime.Components.Testings;
+namespace Prowl.Runtime;
 
 [AddComponentMenu($"{FontAwesome6.Dna}  Testing/{FontAwesome6.Shapes}  TestDrawers")]
 public class TestDrawers : MonoBehaviour

diff --git a/Prowl.Runtime/Components/UI/GuiLayer.cs b/Prowl.Runtime/Components/UI/GuiLayer.cs
@@ -10,7 +10,7 @@
 
 using Veldrid;
 
-namespace Prowl.Runtime.Components.UI;
+namespace Prowl.Runtime;
 
 [RequireComponent(typeof(Camera))]
 [AddComponentMenu($"{FontAwesome6.MoneyCheck}  GUI/{FontAwesome6.WindowMaximize}  GUI Layer")]

diff --git a/Prowl.Runtime/GameObject/GameObject.cs b/Prowl.Runtime/GameObject/GameObject.cs
@@ -9,7 +9,7 @@
 
 using Prowl.Runtime.Cloning;
 using Prowl.Runtime.SceneManagement;
-using Prowl.Runtime.Utilities;
+using Prowl.Runtime.Utils;
 
 using SoftCircuits.Collections;
 using Prowl.Echo;

diff --git a/Prowl.Runtime/GameObject/MonoBehaviour.cs b/Prowl.Runtime/GameObject/MonoBehaviour.cs
@@ -23,7 +23,7 @@ public abstract class MonoBehaviour : EngineObject
 {
     private static readonly Dictionary<Type, bool> CachedExecuteAlways = new();
 
-    [SerializeField, HideInInspector]
+    [SerializeField, HideInInspector, CloneField(CloneFieldFlags.IdentityRelevant)]
     private Guid _identifier = Guid.NewGuid();
 
     [SerializeField, HideInInspector]
@@ -607,17 +607,12 @@ public void CopyTo(MonoBehaviour target)
 
     public override void SetupCloneTargets(object targetObj, ICloneTargetSetup setup)
     {
-        if (this == targetObj)
-            System.Diagnostics.Debugger.Break();
         MonoBehaviour target = targetObj as MonoBehaviour;
         this.OnSetupCloneTargets(targetObj, setup);
     }
 
     public override void CopyDataTo(object targetObj, ICloneOperation operation)
     {
-        if (this == targetObj)
-            System.Diagnostics.Debugger.Break();
-
         MonoBehaviour target = targetObj as MonoBehaviour;
         if (!operation.Context.PreserveIdentity)
             target._identifier = _identifier;

diff --git a/Prowl.Runtime/Rendering/RenderPipeline/DefaultRenderPipeline.cs b/Prowl.Runtime/Rendering/RenderPipeline/DefaultRenderPipeline.cs
@@ -5,8 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-
-using Prowl.Runtime.Components.UI;
+using Prowl.Runtime;
 
 using Veldrid;
 

diff --git a/Prowl.Runtime/Resources/Prefab.cs b/Prowl.Runtime/Resources/Prefab.cs
@@ -8,7 +8,7 @@
 
 using Prowl.Runtime.Cloning;
 using Prowl.Runtime.SceneManagement;
-using Prowl.Runtime.Utilities;
+using Prowl.Runtime.Utils;
 using Prowl.Echo;
 
 namespace Prowl.Runtime;

diff --git a/Prowl.Runtime/Resources/Scene.cs b/Prowl.Runtime/Resources/Scene.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 
 using Prowl.Runtime.Cloning;
-using Prowl.Runtime.Utilities;
+using Prowl.Runtime.Utils;
 
 using Vortice.Direct3D11;
 using Prowl.Echo;

diff --git a/Prowl.Runtime/Utils/PrefabUtility.cs b/Prowl.Runtime/Utils/PrefabUtility.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Prowl.Runtime.Utilities;
+namespace Prowl.Runtime.Utils;
 
 public static class PrefabUtility
 {