From 4f40c9c06f4a8592719eb437bfd78ef6ea40922b Mon Sep 17 00:00:00 2001
From: chrisgregan <chris@snozbot.com>
Date: Mon, 24 Feb 2014 13:48:53 +0000
Subject: [PATCH] New AddButton() and RemoveButton() room methods

Use AddButton() to make any sprite clickable
Use RemoveButton() to remove clickable functionality
---
 Assets/Fungus/Scripts/Button.cs             |  41 +++++++------
 Assets/Fungus/Scripts/Commands.cs           |  60 +++++++++++++++++++-
 Assets/Fungus/Scripts/Room.cs               |  12 ++++
 Assets/FungusExample/Scenes/Example.unity   | Bin 70112 -> 67608 bytes
 Assets/FungusExample/Scripts/SpritesRoom.cs |  12 +++-
 5 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/Assets/Fungus/Scripts/Button.cs b/Assets/Fungus/Scripts/Button.cs
index ab3e8b97..ceb15ca6 100644
--- a/Assets/Fungus/Scripts/Button.cs
+++ b/Assets/Fungus/Scripts/Button.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using System;
 using System.Collections;
 using Fungus;
 
@@ -10,25 +11,34 @@ namespace Fungus
 	[RequireComponent (typeof (BoxCollider2D))]
 	public class Button : MonoBehaviour 
 	{
-		public string methodName;
-
+		public Action buttonAction;
 		public SpriteRenderer spriteRenderer;
 
-		public bool autoDisable = false;
-
-		void Start()
-		{
-			spriteRenderer = GetComponent<SpriteRenderer>();
-		}
-
-		void OnMouseUpAsButton() 
+		// Makes a sprite into a clickable button
+		public static void MakeButton(SpriteRenderer _spriteRenderer, Action _buttonAction)
 		{
-			if (methodName == "")
+			if (_spriteRenderer == null)
 			{
+				Debug.LogError("Sprite renderer must not be null");
 				return;
 			}
 
-			// Ignore button press if button is not fully visible
+			// Remove any previous button component that was added
+			Button oldButton = _spriteRenderer.gameObject.GetComponent<Button>();
+			if (oldButton != null)
+			{
+				Destroy(oldButton);
+			}
+
+			// This will automatically add a BoxCollider2d if none currently exists
+			Button button = _spriteRenderer.gameObject.AddComponent<Button>();
+			button.buttonAction = _buttonAction;
+			button.spriteRenderer = _spriteRenderer;
+		}
+
+		void OnMouseUpAsButton() 
+		{
+			// Ignore button press if sprite is not fully visible
 			if (spriteRenderer.color.a != 1f)
 			{
 				return;
@@ -40,12 +50,7 @@ namespace Fungus
 				return;
 			}
 
-			room.ExecuteCommandMethod(methodName);
-
-			if (autoDisable)
-			{
-				gameObject.SetActive(false);
-			}
+			room.ExecuteCommandMethod(buttonAction);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/Fungus/Scripts/Commands.cs b/Assets/Fungus/Scripts/Commands.cs
index 7a98bb1d..fa3f23d0 100644
--- a/Assets/Fungus/Scripts/Commands.cs
+++ b/Assets/Fungus/Scripts/Commands.cs
@@ -351,7 +351,7 @@ namespace Fungus
 		}		
 	}
 
-	// Sets an animator trigger to change the animation state for an animated sprite
+	// Sets an animator trigger to change the animator state for an animated sprite
 	public class SetAnimatorTriggerCommand : CommandQueue.Command
 	{
 		Animator animator;
@@ -381,6 +381,64 @@ namespace Fungus
 		}		
 	}
 
+	// Makes a sprite behave as a clickable button
+	public class AddButtonCommand : CommandQueue.Command
+	{
+		SpriteRenderer spriteRenderer;
+		Action buttonAction;
+		
+		public AddButtonCommand(SpriteRenderer _spriteRenderer,
+		                        Action _buttonAction)
+		{
+			if (_spriteRenderer == null)
+			{
+				Debug.LogError("Sprite renderer must not be null.");
+				return;
+			}
+			
+			spriteRenderer = _spriteRenderer;
+			buttonAction = _buttonAction;
+		}
+		
+		public override void Execute(CommandQueue commandQueue, Action onComplete)
+		{
+			Button.MakeButton(spriteRenderer, buttonAction);
+			
+			if (onComplete != null)
+			{
+				onComplete();
+			}
+		}		
+	}
+
+	// Makes a sprite stop behaving as a clickable button
+	public class RemoveButtonCommand : CommandQueue.Command
+	{
+		SpriteRenderer spriteRenderer;
+
+		public RemoveButtonCommand(SpriteRenderer _spriteRenderer)
+		{
+			if (_spriteRenderer == null)
+			{
+				Debug.LogError("Sprite renderer must not be null.");
+				return;
+			}
+			
+			spriteRenderer = _spriteRenderer;
+		}
+		
+		public override void Execute(CommandQueue commandQueue, Action onComplete)
+		{
+			Button button = spriteRenderer.gameObject.GetComponent<Button>();
+			GameObject.Destroy(button);
+
+			if (onComplete != null)
+			{
+				onComplete();
+			}
+		}		
+	}
+
 	// Pans the camera to a view over a period of time.
 	public class PanToViewCommand : CommandQueue.Command
 	{
diff --git a/Assets/Fungus/Scripts/Room.cs b/Assets/Fungus/Scripts/Room.cs
index 7fdad37f..824d6823 100644
--- a/Assets/Fungus/Scripts/Room.cs
+++ b/Assets/Fungus/Scripts/Room.cs
@@ -323,6 +323,18 @@ namespace Fungus
 			commandQueue.AddCommand(new FadeSpriteCommand(spriteRenderer, color, duration, slideOffset));
 		}
 
+		// Makes a sprite behave as a clickable button
+		public void AddButton(SpriteRenderer buttonSprite, Action buttonAction)
+		{
+			commandQueue.AddCommand(new AddButtonCommand(buttonSprite, buttonAction));
+		}
+
+		// Makes a sprite stop behaving as a clickable button
+		public void RemoveButton(SpriteRenderer buttonSprite)
+		{
+			commandQueue.AddCommand(new RemoveButtonCommand(buttonSprite));
+		}
+
 		// Sets an animator trigger to change the animation state for an animated sprite
 		public void SetAnimatorTrigger(Animator animator, string triggerName)
 		{
diff --git a/Assets/FungusExample/Scenes/Example.unity b/Assets/FungusExample/Scenes/Example.unity
index 45e0503c60167ece9c7b968a257ab58b781fe250..c7a94e9fe9513929436a2e91f9fb365b4b95c937 100644
GIT binary patch
delta 343
zcmaE`m}SNU7F7m@gC`jnIV2bu7&w9K2SA#^M9)~yB+ZcF-~a#rC4u~}lRxlkZS+6K
z%=it&+U(Zk!MJ$>Ya7$#1Ra*iZv<y;e$Ok=v3b_am+Fk+n_CY4X05LTYGZ_A7LOBE
z26hY#0YE+r6te=w8h~QvKz=+FvjN3+0L3bR{3}q*1=4E|bP|yN73iEIApQQdS#<_b
zEEdRy+3^7=b^<5{wId8{(MO=5gaZSE1yJE%sAg8*_?iHqSR|5WHlWxBkUCZdhCfhs
z>_D*>u5bgv=1Fa?IpN7P`SvO8%|fR)*-rL3!!!K?2cyb%9!|yr#_c@Zj91tIFr!>O

delta 846
zcmY+BUr1AN6vxj`x4ETriwz1VxJ)S&EKO{Y|I!(=vQ}2Khtk`2H!sZHad#vC!4iBB
zdYS!@gq}irDTwrv*^^F#EJJ+gp_fqVF{l<ALVs@OcXx&LgTwEf&pF@U@0{OnDrMN5
zHdF$<{Rm|5CIDCfR&fKUuQ^szAFhSJs;as$-l7}Ms+kLG`4bh@q=?SUo>UfZ-^-`#
zZgVLw_lcqNTt5$3tnSzJ0EF%1G&OgSp1t9uuji~ZUS2?}DvD{Zql5;E?aoA85@h}o
z9}DpkFM$~arF7I;L644{sJ_w}lRd!Ql0~nO;BH2F?ZmR&(>t@lPi4colTY2F2BpOO
zc-+;5xJ?{r7o$-DPp<Pq8<*gr0rA6@ymG%^mKyzig9#y+=;CBv61Zrcw;B3-b|ZS=
zevl^TEghF7ArisP*etf}W!bq}v%yt9D2q~E7`5HP5U)*O&#ePD<k2T%r3C28SeXYy
zwsK_cd<;9#gbppIKO7Tc9FB^d3<EUtz+rW3`79Zv>1hXXD+{Twhe$wqI{(X<oWMM5
zl$pV|GURIp@H1aGBeE%E$1(2F&4g?n*#O4xbu%+<OIEv$A1WcYFfFo1^x5+=+k@-_
zvU>ElR5hs;ep_uAwzmRYN4VR}cVuy7xy@vdEh6(^-5>oDV^`0}4zd8UU9Ab(wNqGU
z1o*Aj6(CEU{{K7|D9Ht1o;}kX`ts>>N8#PIPTNaY<r$hz*V5jlBIQSVwuzYNBlU=t
z4af#y%c8tdhl#Ba-ELWod%0Lph(+kdrOL@?q+l{hEZToAZy#=1-tNO`?>xt(TTdE^
Oi&|gpdvT7Cccy<c{Nc9%

diff --git a/Assets/FungusExample/Scripts/SpritesRoom.cs b/Assets/FungusExample/Scripts/SpritesRoom.cs
index 3e32f215..7819608b 100644
--- a/Assets/FungusExample/Scripts/SpritesRoom.cs
+++ b/Assets/FungusExample/Scripts/SpritesRoom.cs
@@ -12,7 +12,6 @@ public class SpritesRoom : Room
 	void OnEnter() 
 	{	
 		HideSprite(redMushroomSprite);
-		FadeSprite(redMushroomSprite, 1f, 2f);
 
 		ShowSprite(blueAlienSprite);
 
@@ -24,15 +23,24 @@ public class SpritesRoom : Room
 		Say("Blue Alien starts to dance.");
 		Say("Tap on Blue Alien to stop him dancing.");
 
-		FadeSprite(redMushroomSprite, 0f, 2f);
+		AddButton(blueAlienSprite, StopDancing);
 	}	
 
 	// This method is called from the Button component on the BlueAlien object
 	void StopDancing()
 	{
+		RemoveButton(blueAlienSprite);
+
 		SetAnimatorTrigger(blueAlienAnim, "Stop");
 
 		Say("Nice moves there Blue Alien!");
+
+		Say("Maybe you want a nice mushroom to sit down on?");
+		FadeSprite(redMushroomSprite, 1f, 1f);
+
+		Say("Don't want to sit? Ok, no problem.");
+		FadeSprite(redMushroomSprite, 0f, 1f);
+
 		Say("Uh oh, you look like you're turning a little green after all that dancing!");
 
 		SetAnimatorTrigger(blueAlienAnim, "StartGreenWalk");