From 30f41e29a1efd7aaa55e2d89aeaf30f09a23d116 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 26 Sep 2016 14:39:37 +0100 Subject: [PATCH] Reverted IClickable interface --- .../Fungus/Scripts/Components/Clickable2D.cs | 7 +++++-- .../Fungus/Scripts/Interfaces/IClickable2D.cs | 18 ------------------ .../Scripts/Interfaces/IClickable2D.cs.meta | 12 ------------ 3 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 Assets/Fungus/Scripts/Interfaces/IClickable2D.cs delete mode 100644 Assets/Fungus/Scripts/Interfaces/IClickable2D.cs.meta diff --git a/Assets/Fungus/Scripts/Components/Clickable2D.cs b/Assets/Fungus/Scripts/Components/Clickable2D.cs index f557f950..02f28daa 100644 --- a/Assets/Fungus/Scripts/Components/Clickable2D.cs +++ b/Assets/Fungus/Scripts/Components/Clickable2D.cs @@ -13,7 +13,7 @@ namespace Fungus /// The Game Object must have a Collider or Collider2D component attached. /// Use in conjunction with the ObjectClicked Flowchart event handler. /// - public class Clickable2D : MonoBehaviour, IClickable2D, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler + public class Clickable2D : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler { [Tooltip("Is object clicking enabled")] [SerializeField] protected bool clickEnabled = true; @@ -88,8 +88,11 @@ namespace Fungus #endregion - #region IClickable2D implementation + #region Public methods + /// + /// Is object clicking enabled. + /// public bool ClickEnabled { set { clickEnabled = value; } } #endregion diff --git a/Assets/Fungus/Scripts/Interfaces/IClickable2D.cs b/Assets/Fungus/Scripts/Interfaces/IClickable2D.cs deleted file mode 100644 index d43d67c1..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IClickable2D.cs +++ /dev/null @@ -1,18 +0,0 @@ -// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). -// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) - -namespace Fungus -{ - /// - /// Detects mouse clicks and touches on a Game Object, and sends an event to all Flowchart event handlers in the scene. - /// The Game Object must have a Collider or Collider2D component attached. - /// Use in conjunction with the ObjectClicked Flowchart event handler. - /// - public interface IClickable2D - { - /// - /// Is object clicking enabled. - /// - bool ClickEnabled { set; } - } -} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Interfaces/IClickable2D.cs.meta b/Assets/Fungus/Scripts/Interfaces/IClickable2D.cs.meta deleted file mode 100644 index b67ab2e2..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IClickable2D.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 477f75d30919449dfa922f74038ceaa4 -timeCreated: 1473690975 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: