More input hacking

flixel/input/FlxInput.hx

@@ -1,8 +1,122 @@
 package flixel.input;
 
 import flixel.input.FlxInput.FlxInputState;
-import flixel.input.FlxInput.InputStateAgePair;
 
+class FlxInput<T> implements IFlxInput
+{
+	public var ID:T;
+
+	public var pressed(get, null):Bool;
+	public var released(get, null):Bool;
+	public var justPressed(get, null):Bool;
+	public var justReleased(get, null):Bool;
+
+	private var justPressedQueueFalse:Bool;
+	private var justReleasedQueueFalse:Bool;
+
+	public function new(ID:T) 
+	{
+		this.ID = ID;
+		reset();
+	}
+
+	public function dumpInputState():Void
+	{
+		trace("justPressed: " + justPressed + " justReleased: " + justReleased + " pressed: " + pressed + " released: " + released + " justPressedQueueFalse: " + justPressedQueueFalse + " justReleasedQueueFalse: " + justReleasedQueueFalse);
+	}
+
+	public function press():Void
+	{
+		if (released) 
+		{
+			justPressed = true;
+			justPressedQueueFalse = false;
+		}
+
+		pressed = true;
+		released = false;
+	}
+
+	public function release():Void
+	{		
+		if (pressed)
+		{
+			justReleased = true;
+			justReleasedQueueFalse = false;
+		}
+
+		released = true;
+		pressed = false;
+	}
+
+	public function update():Void
+	{		
+		if (justPressedQueueFalse)
+		{
+			justPressed = false;
+			justPressedQueueFalse = false;
+		}
+
+		if (justReleasedQueueFalse)
+		{
+			justReleased = false;
+			justReleasedQueueFalse = false;
+		}
+
+		if (justPressed) 
+		{
+			justPressedQueueFalse = true;
+		}
+
+		if (justReleased)
+		{
+			justReleasedQueueFalse = true;
+		}
+	}
+
+	public function reset():Void
+	{
+		pressed = false;
+		released = true;
+		justPressed = false;
+		justReleased = false;
+		justPressedQueueFalse = false;
+		justReleasedQueueFalse = false;
+	}
+
+	public function hasState(state:FlxInputState):Bool
+	{
+		return switch (state)
+		{
+			case JUST_RELEASED: justReleased;
+			case RELEASED:      released;
+			case PRESSED:       pressed;
+			case JUST_PRESSED:  justPressed;
+		}
+	}
+
+	private function get_released():Bool
+	{
+		return released;
+	}
+
+	private function get_justReleased():Bool
+	{
+		return justReleased;
+	}
+
+	private function get_justPressed():Bool 
+	{
+		return justPressed;
+	}
+
+	private function get_pressed():Bool 
+	{
+		return pressed;
+	}
+}
+
+/*
 class FlxInput<T> implements IFlxInput
 {
 	public var ID:T;
@@ -105,15 +219,6 @@ class FlxInput<T> implements IFlxInput
 	}
 }
 
-@:enum
-abstract FlxInputState(Int) from Int
-{
-	var JUST_RELEASED = -1;
-	var RELEASED      =  0;
-	var PRESSED       =  1;
-	var JUST_PRESSED  =  2;
-}
-
 class InputStateAgePair {
 	public inline function new(state:FlxInputState, updatesAge:Int = 0)
 	{
@@ -123,4 +228,14 @@ class InputStateAgePair {
 	
 	public var state:FlxInputState;
 	public var updatesAge:Int;
+}
+*/
+
+@:enum
+abstract FlxInputState(Int) from Int
+{
+	var JUST_RELEASED = -1;
+	var RELEASED      =  0;
+	var PRESSED       =  1;
+	var JUST_PRESSED  =  2;
 }

flixel/ui/FlxButton.hx

@@ -483,7 +483,7 @@ class FlxTypedButton<T:FlxSprite> extends FlxSprite implements IFlxInput
 #if !FLX_NO_MOUSE
 	private function onUpEventListener(_):Void
 	{
-		if (visible && exists && active && status == FlxButton.PRESSED)
+		if (visible && exists && active && status == FlxButton.PRESSED) // TODO problem is that PRESSED isn't updated until after the up event listener fires?
 		{
 			onUpHandler();
 		}