Skip to content

Commit 035c3b1

Browse files
Stage class rewrite & Stage Editor Overhaul (WORK IN PROGRESS) (#1097)
* Stage Rewrite (WIP) only this for now. I'm going to rest... * Streamlined XML data parsing * Insert ordering thing * Update Stage.hx discarded render texture until I find a better way to do it :'3 * bunch of new stage stuff :3 * better bounds hitbox handling * are you kidding me? made a small optimization as well :3 * Update Stage.hx
1 parent 04c94cc commit 035c3b1

5 files changed

Lines changed: 1046 additions & 1 deletion

File tree

source/funkin/backend/utils/CoolUtil.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ final class CoolUtil
704704
* @param xml XML to get the attribute from
705705
* @param name Name of the attribute
706706
*/
707-
public static inline function getAtt(xml:Access, name:String) {
707+
public static function getAtt(xml:Access, name:String):Null<String> {
708708
/*if (!xml.has.resolve(name)) return null;
709709
return xml.att.resolve(name);*/
710710
// Reason for change:

source/funkin/game/Character.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import funkin.backend.scripting.Script;
1414
import funkin.backend.scripting.ScriptPack;
1515
import funkin.backend.scripting.events.CancellableEvent;
1616
import funkin.backend.scripting.events.character.*;
17+
import funkin.backend.scripting.events.sprite.PlayAnimContext;
1718
import funkin.backend.scripting.events.sprite.*;
1819
import funkin.backend.scripting.events.PointEvent;
1920
import funkin.backend.scripting.events.DrawEvent;

source/funkin/game/PlayState.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ using StringTools;
4242
@:access(funkin.game.StrumLine)
4343
class PlayState extends MusicBeatState
4444
{
45+
public static final __instanceFields = Type.getInstanceFields(PlayState);
4546
/**
4647
* Current PlayState instance.
4748
*/

source/funkin/game/Stage.hx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import haxe.xml.Access;
1616

1717
using StringTools;
1818

19+
//@:deprecated typedef Stage = funkin.game.stage.Stage;
1920
/**
2021
* A class that handles loading a stage and putting the sprites into the state.
2122
**/
@@ -421,6 +422,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
421422
}
422423
}
423424

425+
//@:deprecated typedef StageCharPos = funkin.game.stage.Stage.StageCharPos;
424426
class StageCharPos extends FlxObject {
425427
public var extra:Map<String, Dynamic> = [];
426428

@@ -496,13 +498,15 @@ class StageCharPos extends FlxObject {
496498
oldInfo = null;
497499
}
498500
}
501+
//@:deprecated typedef StageCharPosInfo = funkin.game.stage.Stage.StageCharPosInfo;
499502
typedef StageCharPosInfo = {
500503
var x:Float;
501504
var y:Float;
502505
var flip:Bool;
503506
var scroll:Float;
504507
}
505508

509+
//@:deprecated typedef OldCharInfo = funkin.game.stage.Stage.OldCharInfo;
506510
typedef OldCharInfo = {
507511
var x:Float;
508512
var y:Float;

0 commit comments

Comments
 (0)