From 788907f3b121f322b44c7a29fabc94984e58ec4d Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 15 Feb 2021 12:09:46 +0100 Subject: [PATCH] Remove deprecated and unused `ISceneObject` and `ITransformable` --- Source/Editor/CustomEditors/CustomEditor.cs | 4 +- .../CustomEditors/Dedicated/ActorEditor.cs | 2 +- .../CustomEditors/Values/ValueContainer.cs | 4 +- Source/Editor/SceneGraph/SceneGraphNode.cs | 2 +- Source/Engine/Engine/ISceneObject.cs | 37 ------------------- Source/Engine/Engine/ITransformable.cs | 15 -------- Source/Engine/Level/Actor.cs | 2 +- Source/Engine/Scripting/Script.cs | 2 +- 8 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 Source/Engine/Engine/ISceneObject.cs delete mode 100644 Source/Engine/Engine/ITransformable.cs diff --git a/Source/Editor/CustomEditors/CustomEditor.cs b/Source/Editor/CustomEditors/CustomEditor.cs index 5f992729f..347eb608f 100644 --- a/Source/Editor/CustomEditors/CustomEditor.cs +++ b/Source/Editor/CustomEditors/CustomEditor.cs @@ -624,7 +624,7 @@ namespace FlaxEditor.CustomEditors return FindPrefabRoot(actor.Parent); } - private ISceneObject FindObjectWithPrefabObjectId(Actor actor, ref Guid prefabObjectId) + private SceneObject FindObjectWithPrefabObjectId(Actor actor, ref Guid prefabObjectId) { if (actor.PrefabObjectID == prefabObjectId) return actor; @@ -667,7 +667,7 @@ namespace FlaxEditor.CustomEditors { // Special case for object references // If prefab object has reference to other object in prefab needs to revert to matching prefab instance object not the reference prefab object value - if (Values.ReferenceValue is ISceneObject referenceSceneObject && referenceSceneObject.HasPrefabLink) + if (Values.ReferenceValue is SceneObject referenceSceneObject && referenceSceneObject.HasPrefabLink) { if (Values.Count > 1) { diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs index 924f5aeb3..b8491abfa 100644 --- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs +++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs @@ -206,7 +206,7 @@ namespace FlaxEditor.CustomEditors.Dedicated node.Text = CustomEditorsUtil.GetPropertyNameUI(removed.PrefabObject.GetType().Name); } // Actor or Script - else if (editor.Values[0] is ISceneObject sceneObject) + else if (editor.Values[0] is SceneObject sceneObject) { node.TextColor = sceneObject.HasPrefabLink ? FlaxEngine.GUI.Style.Current.ProgressNormal : FlaxEngine.GUI.Style.Current.BackgroundSelected; node.Text = CustomEditorsUtil.GetPropertyNameUI(sceneObject.GetType().Name); diff --git a/Source/Editor/CustomEditors/Values/ValueContainer.cs b/Source/Editor/CustomEditors/Values/ValueContainer.cs index b2f26bb7b..f8cecb801 100644 --- a/Source/Editor/CustomEditors/Values/ValueContainer.cs +++ b/Source/Editor/CustomEditors/Values/ValueContainer.cs @@ -167,14 +167,14 @@ namespace FlaxEditor.CustomEditors { if (_hasReferenceValue) { - if (_referenceValue is ISceneObject referenceSceneObject && referenceSceneObject.HasPrefabLink) + if (_referenceValue is SceneObject referenceSceneObject && referenceSceneObject.HasPrefabLink) { for (int i = 0; i < Count; i++) { if (this[i] == referenceSceneObject) continue; - if (this[i] == null || (this[i] is ISceneObject valueSceneObject && valueSceneObject.PrefabObjectID != referenceSceneObject.PrefabObjectID)) + if (this[i] == null || (this[i] is SceneObject valueSceneObject && valueSceneObject.PrefabObjectID != referenceSceneObject.PrefabObjectID)) return true; } } diff --git a/Source/Editor/SceneGraph/SceneGraphNode.cs b/Source/Editor/SceneGraph/SceneGraphNode.cs index cc47c20f2..835295147 100644 --- a/Source/Editor/SceneGraph/SceneGraphNode.cs +++ b/Source/Editor/SceneGraph/SceneGraphNode.cs @@ -15,7 +15,7 @@ namespace FlaxEditor.SceneGraph /// A class is responsible for Scene Graph management. /// [HideInEditor] - public abstract class SceneGraphNode : ITransformable + public abstract class SceneGraphNode { /// /// The parent node. diff --git a/Source/Engine/Engine/ISceneObject.cs b/Source/Engine/Engine/ISceneObject.cs deleted file mode 100644 index 2b5ae7706..000000000 --- a/Source/Engine/Engine/ISceneObject.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. - -using System; - -namespace FlaxEngine -{ - /// - /// Interface for scene objects that unifies various properties used across actors and scripts. - /// - public interface ISceneObject - { - /// - /// Gets the scene object which contains this object. - /// - Scene Scene { get; } - - /// - /// Gets a value indicating whether this object has a valid linkage to the prefab asset. - /// - bool HasPrefabLink { get; } - - /// - /// Gets the prefab asset ID. Empty if no prefab link exists. - /// - Guid PrefabID { get; } - - /// - /// Gets the ID of the object within a object that is used for synchronization with this object. Empty if no prefab link exists. - /// - Guid PrefabObjectID { get; } - - /// - /// Breaks the prefab linkage for this object (including all children). - /// - void BreakPrefabLink(); - } -} diff --git a/Source/Engine/Engine/ITransformable.cs b/Source/Engine/Engine/ITransformable.cs deleted file mode 100644 index a8bbd910c..000000000 --- a/Source/Engine/Engine/ITransformable.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. - -namespace FlaxEngine -{ - /// - /// Interface for objects that can be transformed. - /// - public interface ITransformable - { - /// - /// Gets or sets the transform. - /// - Transform Transform { get; set; } - } -} diff --git a/Source/Engine/Level/Actor.cs b/Source/Engine/Level/Actor.cs index 260fef44e..cfb454354 100644 --- a/Source/Engine/Level/Actor.cs +++ b/Source/Engine/Level/Actor.cs @@ -4,7 +4,7 @@ using System; namespace FlaxEngine { - partial class Actor : ITransformable, ISceneObject + partial class Actor { /// /// Returns true if object is fully static on the scene, otherwise false. diff --git a/Source/Engine/Scripting/Script.cs b/Source/Engine/Scripting/Script.cs index 7f8561c68..c1a0894f0 100644 --- a/Source/Engine/Scripting/Script.cs +++ b/Source/Engine/Scripting/Script.cs @@ -2,7 +2,7 @@ namespace FlaxEngine { - partial class Script : ISceneObject + partial class Script { /// /// Gets the scene object which contains this script.