Add analog directional input to FlxVirtualPad (#3340)

* add overloaded scale * add FlxReadOnlyPoint * deprecate statusAnimations * fix drawCircle centering * Add analog stick to FlxVirtualPad * fix code climate * D'oh * fix coverage * fix flash * add distance overloads * add FlxMath.getFrameLerp * honor camera in checkInput * add FlxVirtualStick deprecate FlxAnalog * rename to getElapsedLerp * fix multi-touch * D'oh! * doc * add FlxAnalogState helpers * rename signals, add statuses * add deadzone * remove lerp constructor arg * fix unit test warning * overload more shit * 5.10.0 * change 5.10->6
HaxeFlixel · Jan 29, 2025 · 39e1fcf · 39e1fcf
1 parent b386d54
commit 39e1fcf
Show file tree

Hide file tree

Showing 22 changed files with 822 additions and 184 deletions.
diff --git a/flixel/FlxCamera.hx b/flixel/FlxCamera.hx
@@ -1182,7 +1182,7 @@ class FlxCamera extends FlxBasic
 		if (deadzone == null)
 		{
 			target.getMidpoint(_point);
-			_point.addPoint(targetOffset);
+			_point.add(targetOffset);
 			_scrollTarget.set(_point.x - width * 0.5, _point.y - height * 0.5);
 		}
 		else

diff --git a/flixel/FlxSprite.hx b/flixel/FlxSprite.hx
@@ -833,11 +833,11 @@ class FlxSprite extends FlxObject
 	@:noCompletion
 	function drawSimple(camera:FlxCamera):Void
 	{
-		getScreenPosition(_point, camera).subtractPoint(offset);
+		getScreenPosition(_point, camera).subtract(offset);
 		if (isPixelPerfectRender(camera))
 			_point.floor();
 
-		_point.copyToFlash(_flashPoint);
+		_point.copyTo(_flashPoint);
 		camera.copyPixels(_frame, framePixels, _flashRect, _flashPoint, colorTransform, blend, antialiasing);
 	}
 
@@ -856,7 +856,7 @@ class FlxSprite extends FlxObject
 				_matrix.rotateWithTrig(_cosAngle, _sinAngle);
 		}
 
-		getScreenPosition(_point, camera).subtractPoint(offset);
+		getScreenPosition(_point, camera).subtract(offset);
 		_point.add(origin.x, origin.y);
 		_matrix.translate(_point.x, _point.y);
 
@@ -1122,11 +1122,11 @@ class FlxSprite extends FlxObject
 
 		result.subtract(worldPoint.x, worldPoint.y);
 		result.negate();
-		result.addPoint(offset);
-		result.subtractPoint(origin);
+		result.add(offset);
+		result.subtract(origin);
 		result.scale(1 / scale.x, 1 / scale.y);
 		result.degrees -= angle;
-		result.addPoint(origin);
+		result.add(origin);
 
 		worldPoint.putWeak();
 
@@ -1148,11 +1148,11 @@ class FlxSprite extends FlxObject
 
 		result.subtract(screenPoint.x, screenPoint.y);
 		result.negate();
-		result.addPoint(offset);
-		result.subtractPoint(origin);
+		result.add(offset);
+		result.subtract(origin);
 		result.scale(1 / scale.x, 1 / scale.y);
 		result.degrees -= angle;
-		result.addPoint(origin);
+		result.add(origin);
 
 		screenPoint.putWeak();
 

diff --git a/flixel/graphics/frames/FlxAtlasFrames.hx b/flixel/graphics/frames/FlxAtlasFrames.hx
@@ -423,7 +423,7 @@ class FlxAtlasFrames extends FlxFramesCollection
 
 	override public function addBorder(border:FlxPoint):FlxAtlasFrames
 	{
-		var resultBorder = FlxPoint.weak().addPoint(this.border).addPoint(border);
+		var resultBorder = FlxPoint.weak().add(this.border).add(border);
 		var atlasFrames = FlxAtlasFrames.findFrame(parent, resultBorder);
 		if (atlasFrames != null)
 			return atlasFrames;

diff --git a/flixel/graphics/frames/FlxBitmapFont.hx b/flixel/graphics/frames/FlxBitmapFont.hx
@@ -466,7 +466,7 @@ class FlxBitmapFont extends FlxFramesCollection
 		final h:Float = charFrame.sourceSize.y + (offset != null && offset.y > 0 ? offset.y : 0);
 		charFrame.sourceSize.set(w, h);
 		if (offset != null)
-			charFrame.offset.addPoint(offset);//calls putWeak
+			charFrame.offset.add(offset);//calls putWeak
 		charFrame.name = charName;
 		pushFrame(charFrame, true);
 		charMap.set(charCode, charFrame);
@@ -536,7 +536,7 @@ class FlxBitmapFont extends FlxFramesCollection
 
 	override public function addBorder(border:FlxPoint):FlxBitmapFont
 	{
-		var resultBorder:FlxPoint = FlxPoint.weak().addPoint(this.border).addPoint(border);
+		var resultBorder:FlxPoint = FlxPoint.weak().add(this.border).add(border);
 
 		var font:FlxBitmapFont = FlxBitmapFont.findFont(frame, resultBorder);
 		if (font != null)

diff --git a/flixel/graphics/frames/FlxFrame.hx b/flixel/graphics/frames/FlxFrame.hx
@@ -349,7 +349,7 @@ class FlxFrame implements IFlxDestroyable
 
 		if (angle == FlxFrameAngle.ANGLE_0)
 		{
-			offset.copyToFlash(_point);
+			offset.copyTo(_point);
 			if (point != null)
 				_point.offset(point.x, point.y);
 
@@ -521,7 +521,7 @@ class FlxFrame implements IFlxDestroyable
 		else
 		{
 			frameToFill.type = FlxFrameType.REGULAR;
-			frameToFill.offset.set(frameRect.x, frameRect.y).subtract(rect.x, rect.y).addPoint(offset);
+			frameToFill.offset.set(frameRect.x, frameRect.y).subtract(rect.x, rect.y).add(offset);
 
 			final p1 = FlxPoint.weak(frameRect.x, frameRect.y);
 			final p2 = FlxPoint.weak(frameRect.right, frameRect.bottom);
@@ -623,7 +623,7 @@ class FlxFrame implements IFlxDestroyable
 		else
 		{
 			clippedFrame.type = FlxFrameType.REGULAR;
-			clippedFrame.offset.set(frameRect.x, frameRect.y).addPoint(offset);
+			clippedFrame.offset.set(frameRect.x, frameRect.y).add(offset);
 
 			var p1 = FlxPoint.weak(frameRect.x, frameRect.y);
 			var p2 = FlxPoint.weak(frameRect.right, frameRect.bottom);

diff --git a/flixel/graphics/frames/FlxImageFrame.hx b/flixel/graphics/frames/FlxImageFrame.hx
@@ -242,7 +242,7 @@ class FlxImageFrame extends FlxFramesCollection
 
 	override public function addBorder(border:FlxPoint):FlxImageFrame
 	{
-		var resultBorder:FlxPoint = FlxPoint.weak().addPoint(this.border).addPoint(border);
+		var resultBorder:FlxPoint = FlxPoint.weak().add(this.border).add(border);
 
 		var imageFrame:FlxImageFrame = FlxImageFrame.findFrame(parent, frame.frame, resultBorder);
 		if (imageFrame != null)

diff --git a/flixel/graphics/frames/FlxTileFrames.hx b/flixel/graphics/frames/FlxTileFrames.hx
@@ -514,7 +514,7 @@ class FlxTileFrames extends FlxFramesCollection
 
 	override public function addBorder(border:FlxPoint):FlxTileFrames
 	{
-		var resultBorder:FlxPoint = FlxPoint.get().addPoint(this.border).addPoint(border);
+		var resultBorder:FlxPoint = FlxPoint.get().add(this.border).add(border);
 		var resultSize:FlxPoint = FlxPoint.get().copyFrom(tileSize).subtract(2 * border.x, 2 * border.y);
 		var tileFrames:FlxTileFrames = FlxTileFrames.findFrame(parent, resultSize, region, atlasFrame, tileSpacing, resultBorder);
 		if (tileFrames != null)

diff --git a/flixel/input/actions/FlxActionInputAnalog.hx b/flixel/input/actions/FlxActionInputAnalog.hx
@@ -20,6 +20,15 @@ enum abstract FlxAnalogState(Int) from Int
 	var STOPPED = cast FlxInputState.RELEASED; // is 0
 	var MOVED = cast FlxInputState.PRESSED; // is !0
 	var JUST_MOVED = cast FlxInputState.JUST_PRESSED; // became !0 on this frame
+
+	public var moved(get, never):Bool;
+	inline function get_moved() return this == MOVED || justMoved;
+	public var justMoved(get, never):Bool;
+	inline function get_justMoved() return this == JUST_MOVED;
+	public var justStopped(get, never):Bool;
+	inline function get_justStopped() return this == JUST_STOPPED;
+	public var stopped(get, never):Bool;
+	inline function get_stopped() return this == STOPPED || justStopped;
 }
 
 /**

diff --git a/flixel/math/FlxMath.hx b/flixel/math/FlxMath.hx
@@ -108,6 +108,18 @@ class FlxMath
 	{
 		return a + ratio * (b - a);
 	}
+
+	/**
+	 * Adjusts the given lerp to account for the time that has passed
+	 * 
+	 * @param   lerp     The ratio to lerp in 1/60th of a second
+	 * @param   elapsed  The amount of time that has actually passed
+	 * @since 6.0.0
+	 */
+	public static function getElapsedLerp(lerp:Float, elapsed:Float):Float
+	{
+		return 1.0 - Math.pow(1.0 - lerp, elapsed * 60);
+	}
 
 	/**
 	 * Checks if number is in defined range. A null bound means that side is unbounded.