diff --git a/flixel/FlxObject.hx b/flixel/FlxObject.hx index 7f00e285cc..4292256cb1 100644 --- a/flixel/FlxObject.hx +++ b/flixel/FlxObject.hx @@ -1,5 +1,6 @@ package flixel; +import flixel.FlxBasic.IFlxBasic; import openfl.display.Graphics; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.math.FlxPoint; @@ -1664,3 +1665,22 @@ enum abstract CollisionDragType(Int) /** Drags when colliding with heavier objects. Immovable objects have infinite mass. */ var HEAVIER = 3; } + +interface IFlxObject extends IFlxBasic +{ + var x(default, set):Float; + var y(default, set):Float; + + var angle(default, set):Float; + var moves(default, set):Bool; + var immovable(default, set):Bool; + + var velocity(default, null):FlxPoint; + var maxVelocity(default, null):FlxPoint; + var acceleration(default, null):FlxPoint; + var drag(default, null):FlxPoint; + var scrollFactor(default, null):FlxPoint; + + function reset(X:Float, Y:Float):Void; + function setPosition(X:Float = 0, Y:Float = 0):Void; +} diff --git a/flixel/FlxSprite.hx b/flixel/FlxSprite.hx index deba8336b7..bd34da3805 100644 --- a/flixel/FlxSprite.hx +++ b/flixel/FlxSprite.hx @@ -1,6 +1,6 @@ package flixel; -import flixel.FlxBasic.IFlxBasic; +import flixel.FlxObject.IFlxObject; import flixel.animation.FlxAnimationController; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame; @@ -1651,25 +1651,12 @@ class FlxSprite extends FlxObject } } -interface IFlxSprite extends IFlxBasic +interface IFlxSprite extends IFlxObject { - var x(default, set):Float; - var y(default, set):Float; var alpha(default, set):Float; - var angle(default, set):Float; var facing(default, set):FlxDirectionFlags; - var moves(default, set):Bool; - var immovable(default, set):Bool; var offset(default, null):FlxPoint; var origin(default, null):FlxPoint; var scale(default, null):FlxPoint; - var velocity(default, null):FlxPoint; - var maxVelocity(default, null):FlxPoint; - var acceleration(default, null):FlxPoint; - var drag(default, null):FlxPoint; - var scrollFactor(default, null):FlxPoint; - - function reset(X:Float, Y:Float):Void; - function setPosition(X:Float = 0, Y:Float = 0):Void; }