Removing Containers (UIAbstractContainers), and their contents from the scene.

Assets/DemoSceneScripts/PanelManager.cs

@@ -6,6 +6,9 @@ public class PanelManager : MonoBehaviour
 {
 	void Start()
 	{
+
+		Debug.LogError("PanelManager.Start()");
+
 		// IMPORTANT: depth is 1 on top higher numbers on the bottom.  This means the lower the number is the closer it gets to the camera.
 		var playButton = UIButton.create( "playUp.png", "playDown.png", 0, 0 );
 

Assets/DemoSceneScripts/TextManager.cs

@@ -68,7 +68,7 @@ void Start()
 		textWrap2 = wrapText.addTextInstance( "This should be hyphenated. Check baseline - tytyt", 0, 0, 0.5f, 1, Color.green, UITextAlignMode.Center, UITextVerticalAlignMode.Bottom );
         textWrap2.positionFromBottom( 0f );
 
-		StartCoroutine( modifyTextInstances() );
+		//StartCoroutine( modifyTextInstances() );
 	}
 
 

Assets/Plugins/UIToolkit/BaseElements/ITouchable.cs

@@ -17,12 +17,12 @@ public interface ITouchable
 	bool hitTest( Vector2 point );
 
 
-	void onTouchBegan( Touch touch, Vector2 touchPos );
+	void onTouchBegan( UITouchWrapper touch, Vector2 touchPos );
 
 
-	void onTouchMoved( Touch touch, Vector2 touchPos );
+	void onTouchMoved( UITouchWrapper touch, Vector2 touchPos );
 
 
-	void onTouchEnded( Touch touch, Vector2 touchPos, bool touchWasInsideTouchFrame );
+	void onTouchEnded( UITouchWrapper touch, Vector2 touchPos, bool touchWasInsideTouchFrame );
 
 }

Assets/Plugins/UIToolkit/BaseElements/UIAbstractContainer.cs

@@ -105,7 +105,19 @@ public void removeChild( UISprite child, bool removeFromManager )
 		if( removeFromManager )
 			child.manager.removeElement( child );
 	}
-
+
+	/// <summary>
+	/// A way to remove a container and all it holds. 
+	/// </summary>
+	public void destroy()
+	{
+		while(_children.Count > 0)
+		{
+			removeChild(_children[0], true);
+		}
+
+		Object.Destroy(client);
+	}
 
 	/// <summary>
 	/// Call this when changing multiple properties at once that result in autolayout.  Must be

Assets/Plugins/UIToolkit/BaseElements/UIAbstractTouchableContainer.cs

@@ -25,7 +25,7 @@ public abstract class UIAbstractTouchableContainer : UIAbstractContainer, ITouch
 
 	// touch handling helpers
 	protected float _deltaTouch;
-	protected Touch _lastTouch;
+	protected UITouchWrapper _lastTouch;
 	protected Vector2 _lastTouchPosition;
 	protected ITouchable _activeTouchable;
 
@@ -392,8 +392,8 @@ public bool hitTest( Vector2 point )
 	}
 
 
-	// Touch handlers.  Subclasses should override onTouchMoved
-	public virtual void onTouchBegan( Touch touch, Vector2 touchPos )
+	// UITouchWrapper handlers.  Subclasses should override onTouchMoved
+	public virtual void onTouchBegan( UITouchWrapper touch, Vector2 touchPos )
 	{
 		// sanity check in case we lost a touch (happens with Unity on occassion)
 		if( _activeTouchable != null )
@@ -412,13 +412,13 @@ public virtual void onTouchBegan( Touch touch, Vector2 touchPos )
 	}
 
 
-	public virtual void onTouchMoved( Touch touch, Vector2 touchPos )
+	public virtual void onTouchMoved( UITouchWrapper touch, Vector2 touchPos )
 	{
 
 	}
 
 
-	public virtual void onTouchEnded( Touch touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
+	public virtual void onTouchEnded( UITouchWrapper touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
 	{
 		_isDragging = false;
 

Assets/Plugins/UIToolkit/BaseElements/UIControlTemplate.cs

@@ -66,20 +66,20 @@ public override bool highlighted
 	}
 
 
-	// Touch handlers
-	public override void onTouchBegan( Touch touch, Vector2 touchPos )
+	// UITouchWrapper handlers
+	public override void onTouchBegan( UITouchWrapper touch, Vector2 touchPos )
 	{
 		highlighted = true;
 	}
 
 
-public virtual void onTouchMoved( Touch touch, Vector2 touchPos )
+public virtual void onTouchMoved( UITouchWrapper touch, Vector2 touchPos )
 	{
 		highlighted = true;
 	}
 
 
-	public override void onTouchEnded( Touch touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
+	public override void onTouchEnded( UITouchWrapper touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
 	{
 		highlighted = false;
 	}

Assets/Plugins/UIToolkit/BaseElements/UITouchableSprite.cs

@@ -213,20 +213,20 @@ public override void centerize()
 
 	#region ITouchable
 
-	// Touch handlers.  Subclasses should override these to get their specific behaviour
-	public virtual void onTouchBegan( Touch touch, Vector2 touchPos )
+	// UITouchWrapper handlers.  Subclasses should override these to get their specific behaviour
+	public virtual void onTouchBegan( UITouchWrapper touch, Vector2 touchPos )
 	{
 		highlighted = true;
 	}
 
 
-	public virtual void onTouchMoved( Touch touch, Vector2 touchPos )
+	public virtual void onTouchMoved( UITouchWrapper touch, Vector2 touchPos )
 	{
 
 	}
 
 
-	public virtual void onTouchEnded( Touch touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
+	public virtual void onTouchEnded( UITouchWrapper touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
 	{
 		highlighted = false;
 	}

Assets/Plugins/UIToolkit/Containers/UIScrollableHorizontalLayout.cs

@@ -62,7 +62,7 @@ protected override void clipChild( UISprite child )
 
 	#region ITouchable
 
-	public override void onTouchMoved( Touch touch, Vector2 touchPos )
+	public override void onTouchMoved( UITouchWrapper touch, Vector2 touchPos )
 	{
 		// increment deltaTouch so we can pass on the touch if necessary
 		_deltaTouch += touch.deltaPosition.x;

Assets/Plugins/UIToolkit/Containers/UIScrollableVerticalLayout.cs

@@ -62,7 +62,7 @@ protected override void clipChild( UISprite child )
 
 	#region ITouchable
 
-	public override void onTouchMoved( Touch touch, Vector2 touchPos )
+	public override void onTouchMoved( UITouchWrapper touch, Vector2 touchPos )
 	{
 		// increment deltaTouch so we can pass on the touch if necessary
 		_deltaTouch += touch.deltaPosition.y;

Assets/Plugins/UIToolkit/Structs/UITouchMaker.cs

@@ -15,58 +15,75 @@ public enum UIMouseState
 
 
 /// <summary>
-/// this class now exists only to allow standalones/web players to create Touch objects
+/// this class now exists only to allow standalones/web players to create UITouchWrapper objects
 /// </summary>
 public struct UITouchMaker
 {
-	public static Touch createTouch( int finderId, int tapCount, Vector2 position, Vector2 deltaPos, float timeDelta, TouchPhase phase )
+	public static UITouchWrapper createTouch( int finderId, int tapCount, Vector2 position, Vector2 deltaPos, float timeDelta, TouchPhase phase )
 	{
-		var self = new Touch();
-		ValueType valueSelf = self;
-		var type = typeof( Touch );
-
+		var self = new UITouchWrapper();
+		//ValueType valueSelf = self;
+		//var type = typeof( UITouchWrapper );
+		/*
 		type.GetField( "m_FingerId", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, finderId );
 		type.GetField( "m_TapCount", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, tapCount );
 		type.GetField( "m_Position", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, position );
 		type.GetField( "m_PositionDelta", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, deltaPos );
 		type.GetField( "m_TimeDelta", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, timeDelta );
 		type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, phase );
 
-		return (Touch)valueSelf;
+		return (UITouchWrapper)valueSelf;
+		*/
+
+		self.fingerId = finderId;
+		self.tapCount = tapCount;
+		self.position = position;
+		self.deltaPosition = deltaPos;
+		self.deltaTime = timeDelta;
+		self.phase = phase;
+		return self;
 	}
 
 
-	public static Touch createTouchFromInput( UIMouseState mouseState, ref Vector2? lastMousePosition )
+	public static UITouchWrapper createTouchFromInput( UIMouseState mouseState, ref Vector2? lastMousePosition )
 	{
-		var self = new Touch();
-		ValueType valueSelf = self;
-		var type = typeof( Touch );
+		//var self = new UITouchWrapper();
+		//ValueType valueSelf = self;
+		//var type = typeof( UITouchWrapper );
+
+		var self = new UITouchWrapper();
 
 		var currentMousePosition = new Vector2( Input.mousePosition.x, Input.mousePosition.y );
 
+		if(lastMousePosition.HasValue)
 		// if we have a lastMousePosition use it to get a delta
-		if( lastMousePosition.HasValue )
-			type.GetField( "m_PositionDelta", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, currentMousePosition - lastMousePosition );
+		if( lastMousePosition.HasValue ) self.deltaPosition = currentMousePosition - (Vector2)lastMousePosition;
+			//type.GetField( "m_PositionDelta", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, currentMousePosition - lastMousePosition );
 
 		if( mouseState == UIMouseState.DownThisFrame ) // equivalent to touchBegan
 		{
-			type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, TouchPhase.Began );
+			//type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, TouchPhase.Began );
+			self.phase = TouchPhase.Began;
 			lastMousePosition = Input.mousePosition;
 		}
 		else if( mouseState == UIMouseState.UpThisFrame ) // equivalent to touchEnded
 		{
-			type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, TouchPhase.Ended );
+			//type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, TouchPhase.Ended );
+			self.phase = TouchPhase.Ended;
 			lastMousePosition = null;
 		}
 		else // UIMouseState.HeldDown - equivalent to touchMoved/Stationary
 		{
-			type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, TouchPhase.Moved );
+			//type.GetField( "m_Phase", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, TouchPhase.Moved );
+			self.phase = TouchPhase.Moved;
 			lastMousePosition = Input.mousePosition;
 		}
 
-		type.GetField( "m_Position", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, currentMousePosition );
+		//type.GetField( "m_Position", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( valueSelf, currentMousePosition );
+		self.position = currentMousePosition;
 
-		return (Touch)valueSelf;
+		return self;
+		//return (UITouchWrapper)valueSelf;
 	}
 }
 #endif

Assets/Plugins/UIToolkit/Structs/UITouchWrapper.cs

@@ -0,0 +1,104 @@
+using System;
+using UnityEngine;
+
+public class UITouchWrapper
+{
+
+	private int m_FingerId = 0;
+	private Vector2 m_Position = new Vector2();
+	private Vector2 m_PositionDelta = new Vector2();
+	private float m_TimeDelta = 0f;
+	private int m_TapCount = 0;
+	private TouchPhase m_Phase = TouchPhase.Stationary;
+
+	private bool m_Locked = false;
+
+	public UITouchWrapper()
+	{
+	}
+
+
+	public bool locked
+	{
+		get
+		{
+			return m_Locked;
+		}
+
+		set
+		{
+			if(value == true) m_Locked = true;
+		}
+	}
+
+	public int fingerId
+	{
+		get
+		{
+			return this.m_FingerId;
+		}
+		set
+		{
+			if(!locked) this.m_FingerId = value;
+		}
+	}
+
+	public Vector2 position
+	{
+		get
+		{
+			return this.m_Position;
+		}
+		set
+		{
+			if(!locked) this.m_Position = value;
+		}
+	}
+	public Vector2 deltaPosition
+	{
+		get
+		{
+			return this.m_PositionDelta;
+		}
+		set
+		{
+			if(!locked) this.m_PositionDelta = value;
+		}
+	}
+
+	public float deltaTime
+	{
+		get
+		{
+			return this.m_TimeDelta;
+		}
+		set
+		{
+			if(!locked) this.m_TimeDelta = value;
+		}
+	}
+	public int tapCount
+	{
+		get
+		{
+			return this.m_TapCount;
+		}
+		set
+		{
+			if(!locked) this.m_TapCount = value;
+		}
+	}
+	public TouchPhase phase
+	{
+		get
+		{
+			return this.m_Phase;
+		}
+		set
+		{
+			if(!locked) this.m_Phase = value;
+		}
+	}
+
+}
+

Assets/Plugins/UIToolkit/UIElements/TouchInfo.cs

@@ -43,7 +43,7 @@ public TouchInfo( SwipeDirection swipesToDetect )
 	}
 
 
-	public void resetWithTouch( Touch touch )
+	public void resetWithTouch( UITouchWrapper touch )
 	{
 		// Initialize the detectionState only with the swipe types we want to listen for
 		swipeDetectionState = swipesToDetect;

Assets/Plugins/UIToolkit/UIElements/UIButton.cs

@@ -85,8 +85,8 @@ public override bool highlighted
 	}
 
 
-	// Touch handlers
-	public override void onTouchBegan( Touch touch, Vector2 touchPos )
+	// UITouchWrapper handlers
+	public override void onTouchBegan( UITouchWrapper touch, Vector2 touchPos )
 	{
 		highlighted = true;
 
@@ -101,7 +101,7 @@ public override void onTouchBegan( Touch touch, Vector2 touchPos )
 
 
 
-	public override void onTouchEnded( Touch touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
+	public override void onTouchEnded( UITouchWrapper touch, Vector2 touchPos, bool touchWasInsideTouchFrame )
 	{
 		// If someone has un-highlighted us through code we are deactivated 
 		// and should not fire the event