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

slowly chippin away

Browse source
This commit is contained in:
Cameron Taylor 2021-08-21 13:19:56 -04:00
parent 0a0a1c4e2f
commit d4e955ce79
1 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
source/animate/FlxSymbol.hx
View file

@ -20,6 +20,9 @@ class FlxSymbol extends FlxSprite
public static inline var PLAY_ONCE:String = 'PO'; public static inline var PLAY_ONCE:String = 'PO';
public static inline var SINGLE_FRAME:String = 'SF'; public static inline var SINGLE_FRAME:String = 'SF';
/**
* This gets set in some nest animation bullshit in animation render code
*/
public var firstFrame:Int = 0; public var firstFrame:Int = 0;
public var daLoopType:String = 'LP'; // LP by default, is set below!!! public var daLoopType:String = 'LP'; // LP by default, is set below!!!
@ -62,6 +65,27 @@ class FlxSymbol extends FlxSprite
// for (frame in layer.FR) // for (frame in layer.FR)
// { // {
var keyFrames:Array<Int> = [];
var keyFrameMap:Map<Int, Frame> = new Map();
// probably dumb to generate this every single frame for every layer?
// prob want to generate it first when loading
for (frm in layer.FR)
{
keyFrameMap[frm.I] = frm;
keyFrames.push(frm.I);
for (thing in 0...frm.DU - 1)
keyFrames.push(frm.I);
}
if (FlxG.keys.justPressed.THREE)
{
trace(layer.LN);
trace(keyFrames);
}
var newFrameNum:Int = daFrame; var newFrameNum:Int = daFrame;
switch (daLoopType) switch (daLoopType)
@ -72,11 +96,26 @@ class FlxSymbol extends FlxSprite
// newFrameNum += firstFrame; // newFrameNum += firstFrame;
// newFrameNum = newFrameNum % (tempFrame.I + tempFrame.DU); // newFrameNum = newFrameNum % (tempFrame.I + tempFrame.DU);
// newFrameNum = FlxMath.wrap(newFrameNum, tempFrame.I, tempFrame.I + tempFrame.DU); // newFrameNum = FlxMath.wrap(newFrameNum, tempFrame.I, tempFrame.I + tempFrame.DU);
newFrameNum += 0; // temp, fix later for good looping
trace(newFrameNum % keyFrames.length);
trace(newFrameNum);
trace(keyFrames);
newFrameNum = keyFrames[newFrameNum % keyFrames.length]; // temp, fix later for good looping
case PLAY_ONCE: case PLAY_ONCE:
newFrameNum += 0; trace(newFrameNum);
trace(keyFrames.length - 1);
trace(keyFrameMap.get(newFrameNum + firstFrame));
trace(keyFrameMap.get(keyFrames[keyFrames.length - 1]));
trace(layer.LN);
trace(keyFrames);
newFrameNum = Std.int(Math.min(newFrameNum + firstFrame, keyFrames.length - 1));
case SINGLE_FRAME: case SINGLE_FRAME:
newFrameNum = firstFrame; trace(layer);
trace(firstFrame);
trace(newFrameNum);
trace(layer.LN);
trace(keyFrames);
newFrameNum = keyFrames[firstFrame];
} }
// trace(daLoopType); // trace(daLoopType);
@ -85,10 +124,15 @@ class FlxSymbol extends FlxSprite
// trace(newFrameNum % layer.FR.length); // trace(newFrameNum % layer.FR.length);
var swagFrame:Frame = layer.FR[newFrameNum % layer.FR.length]; // has modulo just in case???? // var swagFrame:Frame = layer.FR[newFrameNum % layer.FR.length]; // has modulo just in case????
// doesnt actually use position in the array?3
var swagFrame:Frame = keyFrameMap.get(newFrameNum);
// get frame by going through
// if (newFrameNum >= frame.I && newFrameNum < frame.I + frame.DU) // if (newFrameNum >= frame.I && newFrameNum < frame.I + frame.DU)
// { // {
trace(daLoopType);
for (element in swagFrame.E) for (element in swagFrame.E)
{ {
if (Reflect.hasField(element, 'ASI')) if (Reflect.hasField(element, 'ASI'))
@ -205,6 +249,8 @@ class FlxSymbol extends FlxSprite
return awesomeMap; return awesomeMap;
} }
function getFrame() {}
override function drawComplex(camera:FlxCamera):Void override function drawComplex(camera:FlxCamera):Void
{ {
_frame.prepareMatrix(_matrix, FlxFrameAngle.ANGLE_0, checkFlipX(), checkFlipY()); _frame.prepareMatrix(_matrix, FlxFrameAngle.ANGLE_0, checkFlipX(), checkFlipY());