v0.4.1

Author: fljot

README.textile

@@ -31,33 +31,43 @@ Features:
 
 
 
-h3. Current state of the project
+h3. Getting Started
 
-v0.3 introduces "new architecture". I'm planning to develop everything in develop branch and merge to master only release versions. Release versions suppose to be pretty stable. As much as I test them on the examples project.
-Current plan is to fix possible bugs in v0.3.#, and I really want to introduce Stage3D support in v0.4. So watch both branches.
-And I hope people to become giving some real feedback at least.
+All gestures dispatch (if you listen) GestureEvent with the next types:
+GestureEvent.GESTURE_STATE_CHANGE
+GestureEvent.GESTURE_IDLE
+GestureEvent.GESTURE_POSSIBLE
+GestureEvent.GESTURE_FAILED
 
+Discrete gestures also dispatch:
+GestureEvent.GESTURE_RECOGNIZED
 
+Continuous gestures also dispatch:
+GestureEvent.GESTURE_BEGAN
+GestureEvent.GESTURE_CHANGED
+GestureEvent.GESTURE_ENDED
 
-h3. Getting Started
+If you use a good IDE (such as Intellij IDEA, FDT, FlashDevelop, Flash Builder) you should see these events in autocompletion.
 
-Like so:
+Quick start:
 <pre><code>var doubleTap:TapGesture = new TapGesture(myButton);
 doubleTap.numTapsRequired = 2;
-doubleTap.addEventListener(TapGestureEvent.GESTURE_TAP, onDoubleTap);
+doubleTap.addEventListener(GestureEvent.GESTURE_RECOGNIZED, onDoubleTap);
 ...
-private function onDoubleTap(event:TapGestureEvent):void
+private function onDoubleTap(event:GestureEvent):void
 {
 	// handle double tap!
 }
 </code></pre>
 or
 <pre><code>var freeTransform:TransformGesture = new TransformGesture(myImage);
-freeTransform.addEventListener(TransformGestureEvent.GESTURE_TRANSFORM, onFreeTransform);
+freeTransform.addEventListener(GestureEvent.GESTURE_BEGAN, onFreeTransform);
+freeTransform.addEventListener(GestureEvent.GESTURE_CHANGED, onFreeTransform);
 ...
-private function onFreeTransform(event:TransformGestureEvent):void
+private function onFreeTransform(event:GestureEvent):void
 {
 	// move, rotate, scale — all at once for better performance!
+	trace(freeTransform.offsetX, freeTransform.offsetY, freeTransform.rotation, freeTransform.scale);
 }
 </code></pre>
 

src/org/gestouch/core/GestureState.as

@@ -1,50 +1,46 @@
 package org.gestouch.core
 {
+	import flash.utils.Dictionary;
 	import flash.errors.IllegalOperationError;
 
 
 	/**
 	 * @author Pavel fljot
 	 */
-	public class GestureState
+	final public class GestureState
 	{
-		public static const IDLE:GestureState = new GestureState(1 << 0, "IDLE");
-		public static const POSSIBLE:GestureState = new GestureState(1 << 1, "POSSIBLE");
-		public static const RECOGNIZED:GestureState = new GestureState(1 << 2, "RECOGNIZED");
-		public static const BEGAN:GestureState = new GestureState(1 << 3, "BEGAN");
-		public static const CHANGED:GestureState = new GestureState(1 << 4, "CHANGED");
-		public static const ENDED:GestureState = new GestureState(1 << 5, "ENDED");
-		public static const CANCELLED:GestureState = new GestureState(1 << 6, "CANCELLED");
-		public static const FAILED:GestureState = new GestureState(1 << 7, "FAILED");
-		
-		private static const endStatesBitMask:uint =
-			GestureState.CANCELLED.toUint() |
-			GestureState.RECOGNIZED.toUint() |
-			GestureState.ENDED.toUint() |
-			GestureState.FAILED.toUint();
+		public static const IDLE:GestureState = new GestureState("IDLE");
+		public static const POSSIBLE:GestureState = new GestureState("POSSIBLE");
+		public static const RECOGNIZED:GestureState = new GestureState("RECOGNIZED", true);
+		public static const BEGAN:GestureState = new GestureState("BEGAN");
+		public static const CHANGED:GestureState = new GestureState("CHANGED");
+		public static const ENDED:GestureState = new GestureState("ENDED", true);
+		public static const CANCELLED:GestureState = new GestureState("CANCELLED", true);
+		public static const FAILED:GestureState = new GestureState("FAILED", true);
 
 		private static var allStatesInitialized:Boolean;
 
 
-		private var value:uint;
 		private var name:String;
-		private var validTransitionsBitMask:uint;
+		private var eventType:String;
+		private var validTransitionStateMap:Dictionary = new Dictionary();
 
 		{
 			_initClass();
 		}
 
 
-		public function GestureState(value:uint, name:String)
+		public function GestureState(name:String, isEndState:Boolean = false)
 		{
 			if (allStatesInitialized)
 			{
 				throw new IllegalOperationError("You cannot create gesture states." +
 				"Use predefined constats like GestureState.RECOGNIZED");
 			}
 
-			this.value = value;
-			this.name = name;
+			this.name = "GestureState." + name;
+			this.eventType = "gesture" + name.charAt(0).toUpperCase() + name.substr(1).toLowerCase();
+			this._isEndState = isEndState;
 		}
 
 
@@ -65,36 +61,35 @@ package org.gestouch.core
 
 		public function toString():String
 		{
-			return "GestureState." + name;
-		}
-		
-		
-		public function toUint():uint
-		{
-			return value;
+			return name;
 		}
 
 
 		private function setValidNextStates(...states):void
 		{
-			var mask:uint;
 			for each (var state:GestureState in states)
 			{
-				mask = mask | state.value;
+				validTransitionStateMap[state] = true;
 			}
-			validTransitionsBitMask = mask;
+		}
+		
+		
+		gestouch_internal function toEventType():String
+		{
+			return eventType;
 		}
 
 
 		gestouch_internal function canTransitionTo(state:GestureState):Boolean
 		{
-			return (validTransitionsBitMask & state.value) > 0;
+			return (state in validTransitionStateMap);
 		}
 
 
+		private var _isEndState:Boolean = false;
 		gestouch_internal function get isEndState():Boolean
 		{
-			return (endStatesBitMask & value) > 0;
+			return _isEndState;
 		}
 	}
 }

src/org/gestouch/core/IGestureTargetAdapter.as

@@ -1,15 +1,12 @@
 package org.gestouch.core
 {
-	import flash.geom.Point;
 	/**
 	 * @author Pavel fljot
 	 */
 	public interface IGestureTargetAdapter
 	{
 		function get target():Object;
 
-		function globalToLocal(point:Point):Point;
-		
 		function contains(object:Object):Boolean;
 	}
 }

src/org/gestouch/events/GestureEvent.as

@@ -10,38 +10,40 @@ package org.gestouch.events
 	 */
 	public class GestureEvent extends Event
 	{
-		public var gestureState:GestureState;
-		public var stageX:Number;
-		public var stageY:Number;
-		public var localX:Number;
-		public var localY:Number;
+		public static const GESTURE_IDLE:String = "gestureIdle";
+		public static const GESTURE_POSSIBLE:String = "gesturePossible";
+		public static const GESTURE_RECOGNIZED:String = "gestureRecognized";
+		public static const GESTURE_BEGAN:String = "gestureBegan";
+		public static const GESTURE_CHANGED:String = "gestureChanged";
+		public static const GESTURE_ENDED:String = "gestureEnded";
+		public static const GESTURE_CANCELLED:String = "gestureCancelled";
+		public static const GESTURE_FAILED:String = "gestureFailed";
 
+		public static const GESTURE_STATE_CHANGE:String = "gestureStateChange";
 
-		public function GestureEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false,
-									 gestureState:GestureState = null,
-									 stageX:Number = 0, stageY:Number = 0,
-									 localX:Number = 0, localY:Number = 0)
+		
+		public var newState:GestureState;
+		public var oldState:GestureState;
+		
+		
+		public function GestureEvent(type:String, newState:GestureState, oldState:GestureState)
 		{
-			super(type, bubbles, cancelable);
+			super(type, false, false);
 
-			this.gestureState = gestureState;
-			this.stageX = stageX;
-			this.stageY = stageY;
-			this.localX = localX;
-			this.localY = localY;
+			this.newState = newState;
+			this.oldState = oldState;
 		}
 
 
 		override public function clone():Event
 		{
-			return new GestureEvent(type, bubbles, cancelable, gestureState, stageX, stageY, localX, localY);
+			return new GestureEvent(type, newState, oldState);
 		}
 
 
 		override public function toString():String
 		{
-			return formatToString("org.gestouch.events.GestureEvent", "bubbles", "cancelable",
-				"gestureState", "stageX", "stageY", "localX", "localY");
+			return formatToString("GestureEvent", "type", "oldState", "newState");
 		}
 	}
-}
+}