gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OH YEA BABY NEW FLXANIMATE UPDATE THAT MADE CODE 50X SIMPLER **AGAIN** 💖 /pos

Browse Source
This commit is contained in:
Yoshman29
2026-01-21 23:05:55 +01:00
parent e3e82e8249
commit 59e04f86e7
3 changed files with 38 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/FunkinSprite.hx
+20 -148
View File
@@ -252,6 +252,7 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
{
// no need to...
//super.doAdditionalMatrixStuff(matrix, camera);
if(__shouldDoZoomFactor()) {
__prepareZoomFactor(_rect, camera);
matrix.setTo(
@@ -263,100 +264,6 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
}
}
override function drawAnimate(camera:FlxCamera):Void
{
// TODO: Possible macro that makes it maintainable in case FlxAnimate gets updated
#if flash
var willUseRenderTexture:Bool = false;
#else
var willUseRenderTexture:Bool = useRenderTexture && (alpha != 1 || shader != null || (blend != null && blend != NORMAL));
#end
var matrix = _matrix;
matrix.identity();
@:privateAccess
var bounds = timeline._bounds;
if (!willUseRenderTexture)
matrix.translate(-bounds.x, -bounds.y);
if (checkFlipX())
{
matrix.scale(-1, 1);
matrix.translate(bounds.width, 0);
}
if (checkFlipY())
{
matrix.scale(1, -1);
matrix.translate(0, bounds.height);
}
if (applyStageMatrix)
{
matrix.concat(library.matrix);
matrix.translate(-library.matrix.tx, -library.matrix.ty);
}
matrix.translate(-origin.x, -origin.y);
matrix.scale(scale.x, scale.y);
if (angle != 0)
{
updateTrig();
matrix.rotateWithTrig(_cosAngle, _sinAngle);
}
if (skew.x != 0 || skew.y != 0)
{
updateSkew();
@:privateAccess
matrix.concat(FlxAnimate._skewMatrix);
}
getScreenPosition(_point, camera);
_point.x += origin.x - offset.x;
_point.y += origin.y - offset.y;
matrix.translate(_point.x, _point.y);
if (isPixelPerfectRender(camera))
preparePixelPerfectMatrix(matrix);
doAdditionalMatrixStuff(matrix, camera);
if (renderStage)
drawStage(camera);
timeline.currentFrame = animation.frameIndex;
#if !flash
if (willUseRenderTexture)
{
if (_renderTexture == null)
_renderTexture = new RenderTexture(Math.ceil(bounds.width), Math.ceil(bounds.height));
if (_renderTextureDirty)
{
_renderTexture.init(Math.ceil(bounds.width), Math.ceil(bounds.height));
_renderTexture.drawToCamera((camera, matrix) ->
{
matrix.translate(-bounds.x, -bounds.y);
timeline.draw(camera, matrix, null, null, antialiasing, null);
});
_renderTexture.render();
_renderTextureDirty = false;
}
camera.drawPixels(_renderTexture.graphic.imageFrame.frame, framePixels, matrix, colorTransform, blend, antialiasing, shader);
}
else
#end
{
timeline.draw(camera, matrix, colorTransform, blend, antialiasing, shader);
}
}
// OFFSETTING
#if REGION
public var animOffsets:Map<String, FlxPoint> = new Map<String, FlxPoint>();
@@ -397,7 +304,7 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
lastAnimContext = Context;
}
public inline function addAnim(name:String, prefix:String, frameRate:Float = 24, ?looped:Bool, ?forced:Bool, ?indices:Array<Int>, x:Float = 0, y:Float = 0, animType:XMLAnimType = NONE)
public inline function addAnim(name:String, prefix:String, frameRate:Float = 24, ?looped:Bool, ?forced:Bool, ?indices:Array<Int>, x:Float = 0, y:Float = 0, animType:XMLAnimType = NONE, animateAtlasLabel:Bool = false)
{
return XMLUtil.addAnimToSprite(this, {
name: name,
@@ -408,7 +315,8 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
x: x,
y: y,
indices: indices,
forced: forced
forced: forced,
label: animateAtlasLabel
});
}
@@ -482,36 +390,10 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
return val;
}
override function draw():Void {
if (isAnimate) {
var posOffset:FlxPoint = FlxPoint.get(-frameOffset.x * scale.x, -frameOffset.y * scale.y);
override function draw():Void
super.draw();
var angleOff = angle;
if (frameOffsetAngle != null)
angleOff = frameOffsetAngle;
angleOff *= FlxAngle.TO_RAD;
posOffset.rotateWithTrig(Math.sin(angleOff), Math.cos(angleOff));
x += posOffset.x;
y += posOffset.y;
super.draw();
x -= posOffset.x;
y -= posOffset.y;
posOffset.put();
} else
super.draw();
}
override function drawComplex(camera:FlxCamera):Void
{
#if (flixel < "6.1.0") final frame = this._frame; #end
final matrix = this._matrix; // TODO: Just use local?
frame.prepareMatrix(matrix, FlxFrameAngle.ANGLE_0, checkFlipX() != camera.flipX, checkFlipY() != camera.flipY);
override function prepareDrawMatrix(matrix:FlxMatrix, camera:FlxCamera):Void {
matrix.translate(-origin.x, -origin.y);
if (frameOffsetAngle != null && frameOffsetAngle != angle)
@@ -520,34 +402,24 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
var cos = Math.cos(angleOff);
var sin = Math.sin(angleOff);
// cos doesnt need to be negated
_matrix.rotateWithTrig(cos, -sin);
_matrix.translate(-frameOffset.x, -frameOffset.y);
_matrix.rotateWithTrig(cos, sin);
matrix.rotateWithTrig(cos, -sin);
matrix.translate(-frameOffset.x, -frameOffset.y);
matrix.rotateWithTrig(cos, sin);
}
else
_matrix.translate(-frameOffset.x, -frameOffset.y);
matrix.translate(-frameOffset.x, -frameOffset.y);
matrix.scale(scale.x, scale.y);
if (bakedRotationAngle <= 0)
{
updateTrig();
if (angle != 0)
matrix.rotateWithTrig(_cosAngle, _sinAngle);
}
if (skew.x != 0 || skew.y != 0)
{
updateSkew();
_matrix.concat(FlxAnimate._skewMatrix);
}
getScreenPosition(_point, camera);
_point.x += origin.x - offset.x;
_point.y += origin.y - offset.y;
matrix.translate(_point.x, _point.y);
if (isPixelPerfectRender(camera))
preparePixelPerfectMatrix(matrix);
matrix.translate(origin.x, origin.y);
super.prepareDrawMatrix(matrix, camera);
doAdditionalMatrixStuff(matrix, camera);
}
camera.drawPixels(frame, framePixels, matrix, colorTransform, blend, antialiasing, shader);
override function checkFlipX() {
return super.checkFlipX() != camera.flipX;
}
override function checkFlipY() {
return super.checkFlipY() != camera.flipY;
}
}
source/funkin/backend/utils/XMLUtil.hx
+17 -6
View File
@@ -229,7 +229,8 @@ final class XMLUtil {
animType: spr.spriteAnimType,
x: 0,
y: 0,
indices: [for(i in 0...spr.frames.frames.length) i]
indices: [for(i in 0...spr.frames.frames.length) i],
label: false
});
}
@@ -265,7 +266,8 @@ final class XMLUtil {
animType: animType,
x: 0,
y: 0,
indices: []
indices: [],
label: false
};
if (anim.has.name) animData.name = anim.att.name;
@@ -277,6 +279,7 @@ final class XMLUtil {
if (anim.has.loop) animData.loop = anim.att.loop == "true";
if (anim.has.forced) animData.forced = anim.att.forced == "true";
if (anim.has.indices) animData.indices = CoolUtil.parseNumberRange(anim.att.indices);
if (anim.has.label) animData.label = anim.att.label == "true";
return animData;
}
@@ -309,10 +312,17 @@ final class XMLUtil {
var animateAnim = cast(sprite, FunkinSprite).anim;
if (animData.indices != null && animData.indices.length > 0)
animateAnim.addBySymbolIndices(animData.name, animData.anim, animData.indices, animData.fps, animData.loop);
else
animateAnim.addBySymbol(animData.name, animData.anim, animData.fps, animData.loop);
if (animData.label) {
if (animData.indices != null && animData.indices.length > 0)
animateAnim.addByFrameLabelIndices(animData.name, animData.anim, animData.indices, animData.fps, animData.loop);
else
animateAnim.addByFrameLabel(animData.name, animData.anim, animData.fps, animData.loop);
} else {
if (animData.indices != null && animData.indices.length > 0)
animateAnim.addBySymbolIndices(animData.name, animData.anim, animData.indices, animData.fps, animData.loop);
else
animateAnim.addBySymbol(animData.name, animData.anim, animData.fps, animData.loop);
}
} else {
if (animData.indices != null && animData.indices.length > 0) {
if (animData.anim == null)
@@ -468,6 +478,7 @@ typedef AnimData = {
var y:Float;
var indices:Array<Int>;
var animType:XMLAnimType;
var label:Bool;
var ?forced:Bool;
}
source/funkin/editors/character/CharacterAnimsWindow.hx
+1 -2
View File
@@ -85,8 +85,6 @@ class CharacterAnimsWindow extends UIButtonList<CharacterAnimButton> {
var renderTex = character.generateRenderTextureForAnim(name);
var frame = renderTex.graphic.imageFrame.frame;
trace('Created anim display for ${name} with size ${frame.frame.width}, ${frame.frame.height} (${renderTex.graphic.width}, ${renderTex.graphic.height})');
displayAnimsFramesList.set(name, {
frame: frame,
scale: 104/Math.max(frame.frame.width, frame.frame.height),
@@ -156,6 +154,7 @@ class CharacterAnimsWindow extends UIButtonList<CharacterAnimButton> {
x: 0, y: 0,
indices: [],
animType: NONE,
label: false
};
addAnimation(animData);
}