From 7900965cbd5275e65fc94c0b78566fefc807ccca Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 31 Mar 2015 15:22:47 +0100 Subject: [PATCH] Changed SetCollider2D to SetClickable2D It makes more sense to disable the click event messaging than to disable the physics object. --- ...ollider2D.cs.meta => SetClickable.cs.meta} | 0 .../Sprite/Scripts/Commands/SetClickable2D.cs | 45 +++++++++++++++++++ .../Sprite/Scripts/Commands/SetCollider2D.cs | 45 ------------------- 3 files changed, 45 insertions(+), 45 deletions(-) rename Assets/Fungus/Sprite/Scripts/Commands/{SetCollider2D.cs.meta => SetClickable.cs.meta} (100%) create mode 100644 Assets/Fungus/Sprite/Scripts/Commands/SetClickable2D.cs delete mode 100644 Assets/Fungus/Sprite/Scripts/Commands/SetCollider2D.cs diff --git a/Assets/Fungus/Sprite/Scripts/Commands/SetCollider2D.cs.meta b/Assets/Fungus/Sprite/Scripts/Commands/SetClickable.cs.meta similarity index 100% rename from Assets/Fungus/Sprite/Scripts/Commands/SetCollider2D.cs.meta rename to Assets/Fungus/Sprite/Scripts/Commands/SetClickable.cs.meta diff --git a/Assets/Fungus/Sprite/Scripts/Commands/SetClickable2D.cs b/Assets/Fungus/Sprite/Scripts/Commands/SetClickable2D.cs new file mode 100644 index 00000000..67ff85ea --- /dev/null +++ b/Assets/Fungus/Sprite/Scripts/Commands/SetClickable2D.cs @@ -0,0 +1,45 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + [CommandInfo("Sprite", + "Set Clickable 2D", + "Sets a Clickable2D component to be clickable / non-clickable.")] + [AddComponentMenu("")] + public class SetClickable2D : Command + { + [Tooltip("Reference to Clickable2D component on a gameobject")] + public Clickable2D targetClickable2D; + + [Tooltip("Set to true to enable the component")] + public BooleanData activeState; + + public override void OnEnter() + { + if (targetClickable2D != null) + { + targetClickable2D.clickEnabled = activeState.Value; + } + + Continue(); + } + + public override string GetSummary() + { + if (targetClickable2D == null) + { + return "Error: No Clickable2D component selected"; + } + + return targetClickable2D.gameObject.name; + } + + public override Color GetButtonColor() + { + return new Color32(235, 191, 217, 255); + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Sprite/Scripts/Commands/SetCollider2D.cs b/Assets/Fungus/Sprite/Scripts/Commands/SetCollider2D.cs deleted file mode 100644 index 57223637..00000000 --- a/Assets/Fungus/Sprite/Scripts/Commands/SetCollider2D.cs +++ /dev/null @@ -1,45 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; - -namespace Fungus -{ - [CommandInfo("Sprite", - "Set Collider2D", - "Sets a Collider2D component to be active / inactive. Use this to make a clickable object be non-clickable.")] - [AddComponentMenu("")] - public class SetCollider2D : Command - { - [Tooltip("Reference to Collider2D component on a gameobject")] - public Collider2D targetCollider2D; - - [Tooltip("Set to true to enable the component")] - public BooleanData activeState; - - public override void OnEnter() - { - if (targetCollider2D != null) - { - targetCollider2D.enabled = activeState.Value; - } - - Continue(); - } - - public override string GetSummary() - { - if (targetCollider2D == null) - { - return "Error: No Collider2D component selected"; - } - - return targetCollider2D.gameObject.name; - } - - public override Color GetButtonColor() - { - return new Color32(235, 191, 217, 255); - } - } - -} \ No newline at end of file