Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Better character animation offsets handling.

Browse source
This commit is contained in:
Sword352 2024-05-08 07:35:46 +02:00
parent a6948c3a38
commit 7ce3eabd17
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/funkin/play/character/BaseCharacter.hx
View file

@ -1,6 +1,7 @@
package funkin.play.character; package funkin.play.character;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import flixel.FlxCamera;
import funkin.modding.events.ScriptEvent; import funkin.modding.events.ScriptEvent;
import funkin.play.character.CharacterData.CharacterDataParser; import funkin.play.character.CharacterData.CharacterDataParser;
import funkin.play.character.CharacterData.CharacterRenderType; import funkin.play.character.CharacterData.CharacterRenderType;
@ -118,19 +119,17 @@ class BaseCharacter extends Bopper
*/ */
public var cameraFocusPoint(default, null):FlxPoint = new FlxPoint(0, 0); public var cameraFocusPoint(default, null):FlxPoint = new FlxPoint(0, 0);
/**
* Defines the animation offset.
*/
public var animOffset:FlxPoint = FlxPoint.get();
override function set_animOffsets(value:Array<Float>):Array<Float> override function set_animOffsets(value:Array<Float>):Array<Float>
{ {
if (animOffsets == null) value = [0, 0]; if (animOffsets == null) value = [0, 0];
if ((animOffsets[0] == value[0]) && (animOffsets[1] == value[1])) return value; if ((animOffsets[0] == value[0]) && (animOffsets[1] == value[1])) return value;
// Make sure animOffets are halved when scale is 0.5. animOffset.set(value[0], value[1]);
var xDiff = (animOffsets[0] * this.scale.x / (this.isPixel ? 6 : 1)) - value[0];
var yDiff = (animOffsets[1] * this.scale.y / (this.isPixel ? 6 : 1)) - value[1];
// Call the super function so that camera focus point is not affected.
super.set_x(this.x + xDiff);
super.set_y(this.y + yDiff);
return animOffsets = value; return animOffsets = value;
} }
@ -570,11 +569,25 @@ class BaseCharacter extends Bopper
} }
} }
// override getScreenPosition (used by FlxSprite's draw method) to account for animation offsets.
override function getScreenPosition(?result:FlxPoint, ?camera:FlxCamera):FlxPoint
{
var output:FlxPoint = super.getScreenPosition(result, camera);
output -= animOffset;
return output;
}
public override function onDestroy(event:ScriptEvent):Void public override function onDestroy(event:ScriptEvent):Void
{ {
this.characterType = OTHER; this.characterType = OTHER;
} }
override function destroy():Void
{
animOffset = flixel.util.FlxDestroyUtil.put(animOffset);
super.destroy();
}
/** /**
* Play the appropriate singing animation, for the given note direction. * Play the appropriate singing animation, for the given note direction.
* @param dir The direction of the note. * @param dir The direction of the note.