Skip to content

Commit 5b31c8b

Browse files
Merge branch 'development'
2 parents 215f9be + 3c215d9 commit 5b31c8b

File tree

12 files changed

+13
-20
lines changed

12 files changed

+13
-20
lines changed

Prowl.Editor/Editor/AssetsBrowserWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Prowl.Runtime;
1111
using Prowl.Runtime.GUI;
1212
using Prowl.Runtime.Rendering;
13-
using Prowl.Runtime.Utilities;
13+
using Prowl.Runtime.Utils;
1414

1515
namespace Prowl.Editor;
1616

Prowl.Editor/Editor/ScriptedEditors/GameObjectEditor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using Prowl.Runtime.Cloning;
1212
using Prowl.Runtime.GUI;
1313
using Prowl.Runtime.GUI.Layout;
14-
using Prowl.Runtime.Utilities;
1514
using Prowl.Runtime.Utils;
1615

1716
using static Prowl.Editor.EditorGUI;

Prowl.Editor/Utilities/UndoRedo/Actions/GameObjects/GameObjectActions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Prowl.Runtime;
77
using Prowl.Runtime.Cloning;
88
using Prowl.Runtime.SceneManagement;
9-
using Prowl.Runtime.Utilities;
9+
using Prowl.Runtime.Utils;
1010

1111
namespace Prowl.Editor.Utilities;
1212

@@ -66,10 +66,10 @@ protected override void Do()
6666
if (go == null)
6767
throw new InvalidOperationException("Could not find GameObject with identifier: " + GameObject);
6868

69-
_gameObject = go.DeepClone(new(false));
69+
_gameObject = go.DeepClone();
7070
_parent = go.parent?.Identifier ?? Guid.Empty;
7171

72-
var clone = _gameObject.DeepClone();
72+
var clone = _gameObject.DeepClone(new(false));
7373
_clone = clone.Identifier;
7474
GameObject? parent = EngineObject.FindObjectByIdentifier<GameObject>(_parent);
7575
if (parent != null)

Prowl.Runtime/Components/Physics/Rigidbody3D.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public override void Update()
159159
Transform.rotation = new Quaternion(_body.Orientation.X, _body.Orientation.Y, _body.Orientation.Z, _body.Orientation.W);
160160
}
161161

162-
public override void DrawGizmos()
162+
public override void DrawGizmosSelected()
163163
{
164164
if (_body == null || _body.Handle.IsZero || !Application.IsEditor) return;
165165

Prowl.Runtime/Components/Testings/TestDrawers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using Prowl.Icons;
77

8-
namespace Prowl.Runtime.Components.Testings;
8+
namespace Prowl.Runtime;
99

1010
[AddComponentMenu($"{FontAwesome6.Dna} Testing/{FontAwesome6.Shapes} TestDrawers")]
1111
public class TestDrawers : MonoBehaviour

Prowl.Runtime/Components/UI/GuiLayer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
using Veldrid;
1212

13-
namespace Prowl.Runtime.Components.UI;
13+
namespace Prowl.Runtime;
1414

1515
[RequireComponent(typeof(Camera))]
1616
[AddComponentMenu($"{FontAwesome6.MoneyCheck} GUI/{FontAwesome6.WindowMaximize} GUI Layer")]

Prowl.Runtime/GameObject/GameObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
using Prowl.Runtime.Cloning;
1111
using Prowl.Runtime.SceneManagement;
12-
using Prowl.Runtime.Utilities;
12+
using Prowl.Runtime.Utils;
1313

1414
using SoftCircuits.Collections;
1515
using Prowl.Echo;

Prowl.Runtime/GameObject/MonoBehaviour.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class MonoBehaviour : EngineObject
2323
{
2424
private static readonly Dictionary<Type, bool> CachedExecuteAlways = new();
2525

26-
[SerializeField, HideInInspector]
26+
[SerializeField, HideInInspector, CloneField(CloneFieldFlags.IdentityRelevant)]
2727
private Guid _identifier = Guid.NewGuid();
2828

2929
[SerializeField, HideInInspector]
@@ -607,17 +607,12 @@ public void CopyTo(MonoBehaviour target)
607607

608608
public override void SetupCloneTargets(object targetObj, ICloneTargetSetup setup)
609609
{
610-
if (this == targetObj)
611-
System.Diagnostics.Debugger.Break();
612610
MonoBehaviour target = targetObj as MonoBehaviour;
613611
this.OnSetupCloneTargets(targetObj, setup);
614612
}
615613

616614
public override void CopyDataTo(object targetObj, ICloneOperation operation)
617615
{
618-
if (this == targetObj)
619-
System.Diagnostics.Debugger.Break();
620-
621616
MonoBehaviour target = targetObj as MonoBehaviour;
622617
if (!operation.Context.PreserveIdentity)
623618
target._identifier = _identifier;

Prowl.Runtime/Rendering/RenderPipeline/DefaultRenderPipeline.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
using System.Collections.Generic;
66
using System.Linq;
77
using System.Reflection;
8-
9-
using Prowl.Runtime.Components.UI;
8+
using Prowl.Runtime;
109

1110
using Veldrid;
1211

Prowl.Runtime/Resources/Prefab.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
using Prowl.Runtime.Cloning;
1010
using Prowl.Runtime.SceneManagement;
11-
using Prowl.Runtime.Utilities;
11+
using Prowl.Runtime.Utils;
1212
using Prowl.Echo;
1313

1414
namespace Prowl.Runtime;

0 commit comments

Comments
 (0)