From adad87db8b0bbb86eb547676f62fd390b0f54574 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Fri, 7 Apr 2023 19:51:01 +0200
Subject: [PATCH] new flixel fork and stuff
---
Project.xml | 9 ++--
hmm.json | 29 ++++++++++---
source/funkin/cutscenes/DialogueCutscene.hx | 2 +-
source/funkin/editors/charter/Charter.hx | 2 +-
source/funkin/game/Character.hx | 6 +--
source/funkin/game/GameOverSubstate.hx | 2 +-
source/funkin/game/Note.hx | 12 +++---
source/funkin/game/PlayState.hx | 2 +-
source/funkin/macros/ScriptsMacro.hx | 16 ++++++-
source/funkin/menus/PauseSubState.hx | 2 +-
source/funkin/menus/TitleState.hx | 2 +-
source/funkin/options/Options.hx | 2 +-
source/funkin/scripting/Script.hx | 2 +-
.../funkin/scripting/events/CountdownEvent.hx | 2 +-
source/funkin/system/FlxAnimate.hx | 14 ++----
source/funkin/system/FunkinSprite.hx | 4 +-
source/funkin/system/Main.hx | 43 +------------------
source/funkin/system/MusicBeatState.hx | 1 -
source/funkin/system/OptimizedBitmapData.hx | 6 +--
.../funkin/system/modules/AudioSwitchFix.hx | 2 +-
source/funkin/updating/UpdateScreen.hx | 2 +-
source/funkin/utils/CoolUtil.hx | 6 +--
source/funkin/utils/DiscordUtil.hx | 2 +-
source/funkin/utils/FunkinParentDisabler.hx | 8 ++--
source/funkin/utils/native/HiddenProcess.hx | 2 +-
25 files changed, 80 insertions(+), 100 deletions(-)
diff --git a/Project.xml b/Project.xml
index cee2e980..d460a376 100644
--- a/Project.xml
+++ b/Project.xml
@@ -139,7 +139,6 @@
-
@@ -149,13 +148,13 @@
-
-
+
+
@@ -165,13 +164,13 @@
-
-
+
+
diff --git a/hmm.json b/hmm.json
index 06defb1c..868f3ca4 100644
--- a/hmm.json
+++ b/hmm.json
@@ -11,18 +11,33 @@
"version": null
},
{
- "name": "flixel-yc29",
+ "name": "flixel-addons",
+ "type": "haxelib",
+ "version": null
+ },
+ {
+ "name": "spinehaxe",
+ "type": "haxelib",
+ "version": null
+ },
+ {
+ "name": "flixel",
"type": "git",
- "dir": "flixel",
- "ref": "master",
- "url": "https://www.github.com/YoshiCrafter29/flixel"
+ "ref": "dev",
+ "url": "https://www.github.com/FNF-CNE-Devs/flixel"
+ },
+ {
+ "name": "flixel-addons",
+ "type": "git",
+ "ref": "dev",
+ "url": "https://www.github.com/FNF-CNE-Devs/flixel-addons"
},
{
"name": "flxanimate",
"type": "git",
"dir": "flxanimate",
"ref": "master",
- "url": "https://github.com/YoshiCrafter29/flxanimate/"
+ "url": "https://github.com/FNF-CNE-Devs/flxanimate/"
},
{
"name": "format",
@@ -33,8 +48,8 @@
"name": "hscript-improved",
"type": "git",
"dir": "hscript-improved",
- "ref": "master",
- "url": "https://www.github.com/YoshiCrafter29/hscript-improved"
+ "ref": "custom-classes",
+ "url": "https://www.github.com/FNF-CNE-Devs/hscript-improved"
},
{
"name": "hxCodec",
diff --git a/source/funkin/cutscenes/DialogueCutscene.hx b/source/funkin/cutscenes/DialogueCutscene.hx
index 87fb2ce6..28900e4f 100644
--- a/source/funkin/cutscenes/DialogueCutscene.hx
+++ b/source/funkin/cutscenes/DialogueCutscene.hx
@@ -1,6 +1,6 @@
package funkin.cutscenes;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import funkin.cutscenes.dialogue.*;
import haxe.xml.Access;
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 17191883..d75fc7a2 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1,7 +1,7 @@
package funkin.editors.charter;
import flixel.input.keyboard.FlxKey;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.util.FlxSort;
import flixel.math.FlxPoint;
import funkin.editors.charter.CharterBackdrop.CharterBackdropDummy;
diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx
index be8435a4..69be7961 100644
--- a/source/funkin/game/Character.hx
+++ b/source/funkin/game/Character.hx
@@ -292,7 +292,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
__drawingShadowFrame = true;
var oldFrame = _frame;
- var oldPos = FlxPoint.get(rotOffset.x, rotOffset.y);
+ var oldPos = FlxPoint.get(frameOffset.x, frameOffset.y);
__oldColorTransform.copyColorTransform(colorTransform);
@@ -307,11 +307,11 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
_frame = shadowFrame.frame;
var o = getAnimOffset(shadowFrame.anim);
- rotOffset.set(o.x, o.y);
+ frameOffset.set(o.x, o.y);
super.draw();
_frame = oldFrame;
- rotOffset.set(oldPos.x, oldPos.y);
+ frameOffset.set(oldPos.x, oldPos.y);
colorTransform.copyColorTransform(__oldColorTransform);
diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx
index 66107319..1a8428bc 100644
--- a/source/funkin/game/GameOverSubstate.hx
+++ b/source/funkin/game/GameOverSubstate.hx
@@ -1,7 +1,7 @@
package funkin.game;
import flixel.addons.transition.FlxTransitionableState;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.FlxSubState;
import flixel.math.FlxPoint;
import flixel.util.FlxColor;
diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx
index 70597696..ad442c20 100644
--- a/source/funkin/game/Note.hx
+++ b/source/funkin/game/Note.hx
@@ -208,17 +208,17 @@ class Note extends FlxSprite
setPosition(__strum.x, __strum.y);
- rotOffset.x -= pos.x / scale.x;
- rotOffset.y -= pos.y / scale.y;
+ frameOffset.x -= pos.x / scale.x;
+ frameOffset.y -= pos.y / scale.y;
- this.rotOffsetAngle = __noteAngle;
+ this.frameOffsetAngle = __noteAngle;
super.draw();
- this.rotOffsetAngle = 0;
+ this.frameOffsetAngle = 0;
- rotOffset.x += pos.x / scale.x;
- rotOffset.y += pos.y / scale.y;
+ frameOffset.x += pos.x / scale.x;
+ frameOffset.y += pos.y / scale.y;
setPosition(pos.x, pos.y);
pos.put();
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 22db28b9..4e16e66a 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -13,7 +13,7 @@ import funkin.scripting.ScriptPack;
import flixel.FlxSubState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.math.FlxPoint;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
import flixel.ui.FlxBar;
diff --git a/source/funkin/macros/ScriptsMacro.hx b/source/funkin/macros/ScriptsMacro.hx
index af4a94bf..e8e199b6 100644
--- a/source/funkin/macros/ScriptsMacro.hx
+++ b/source/funkin/macros/ScriptsMacro.hx
@@ -10,9 +10,21 @@ import haxe.macro.Expr;
*/
class ScriptsMacro {
public static function addAdditionalClasses() {
- for(inc in ["flixel", "away3d", "flx3d", "sys", "DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting"]) {
+ for(inc in [
+ // FLIXEL
+ "flixel.util", "flixel.ui", "flixel.tweens", "flixel.tile", "flixel.text",
+ "flixel.system", "flixel.sound", "flixel.path", "flixel.math", "flixel.input",
+ "flixel.group", "flixel.graphics", "flixel.effects", "flixel.animation",
+ // FLIXEL ADDONS
+ "flixel.addons.api", "flixel.addons.display", "flixel.addons.effects", "flixel.addons.ui",
+ "flixel.addons.plugin", "flixel.addons.text", "flixel.addons.tile", "flixel.addons.transition",
+ "flixel.addons.util",
+ // OTHER LIBRARIES & STUFF
+ "away3d", "flx3d", #if sys "sys", #end
+ // BASE HAXE
+ "DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting"
+ ])
Compiler.include(inc);
- }
// FOR ABSTRACTS
Compiler.addGlobalMetadata('haxe.xml', '@:build(hscript.UsingHandler.build())');
diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx
index ac5d5f3c..e6958eaf 100644
--- a/source/funkin/menus/PauseSubState.hx
+++ b/source/funkin/menus/PauseSubState.hx
@@ -7,7 +7,7 @@ import funkin.scripting.Script;
import flixel.FlxSubState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.input.keyboard.FlxKey;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx
index 6b43c02b..20c71ab3 100644
--- a/source/funkin/menus/TitleState.hx
+++ b/source/funkin/menus/TitleState.hx
@@ -15,7 +15,7 @@ import flixel.group.FlxGroup;
import flixel.input.gamepad.FlxGamepad;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.system.ui.FlxSoundTray;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index c97b25d5..dd34c47c 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -123,7 +123,7 @@ class Options
public static function applySettings() {
applyKeybinds();
- FlxG.game.stage.quality = (FlxG.forceNoAntialiasing = !antialiasing) ? LOW : BEST;
+ FlxG.game.stage.quality = (FlxG.enableAntialiasing = antialiasing) ? LOW : BEST;
FlxG.autoPause = autoPause;
FlxG.drawFramerate = FlxG.updateFramerate = framerate;
}
diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx
index b9b3cb17..f2823958 100644
--- a/source/funkin/scripting/Script.hx
+++ b/source/funkin/scripting/Script.hx
@@ -37,7 +37,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
"state" => flixel.FlxG.state,
"FlxEase" => flixel.tweens.FlxEase,
"FlxTween" => flixel.tweens.FlxTween,
- "FlxSound" => flixel.system.FlxSound,
+ "FlxSound" => flixel.sound.FlxSound,
"FlxAssets" => flixel.system.FlxAssets,
"FlxMath" => flixel.math.FlxMath,
"FlxGroup" => flixel.group.FlxGroup,
diff --git a/source/funkin/scripting/events/CountdownEvent.hx b/source/funkin/scripting/events/CountdownEvent.hx
index 7e3e3eb2..b8c1f77a 100644
--- a/source/funkin/scripting/events/CountdownEvent.hx
+++ b/source/funkin/scripting/events/CountdownEvent.hx
@@ -1,7 +1,7 @@
package funkin.scripting.events;
import flixel.tweens.FlxTween;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
final class CountdownEvent extends CancellableEvent {
/**
diff --git a/source/funkin/system/FlxAnimate.hx b/source/funkin/system/FlxAnimate.hx
index aca7a645..176ec3b0 100644
--- a/source/funkin/system/FlxAnimate.hx
+++ b/source/funkin/system/FlxAnimate.hx
@@ -26,22 +26,16 @@ class FlxAnimate extends flxanimate.FlxAnimate {
getScreenPosition(_point, camera).subtractPoint(offset);
rMatrix.translate(-origin.x, -origin.y);
if (!showPivot && limb.name != "pivot") {
- if (rotOffsetAngle != null && rotOffsetAngle != angle)
+ if (frameOffsetAngle != null && frameOffsetAngle != angle)
{
- var angleOff = (-angle + rotOffsetAngle) * FlxAngle.TO_RAD;
+ var angleOff = (-angle + frameOffsetAngle) * FlxAngle.TO_RAD;
rMatrix.rotate(-angleOff);
- if (useOffsetAsRotOffset)
- rMatrix.translate(-offset.x, -offset.y);
- else
- rMatrix.translate(-rotOffset.x, -rotOffset.y);
+ rMatrix.translate(-frameOffset.x, -frameOffset.y);
rMatrix.rotate(angleOff);
}
else
{
- if (useOffsetAsRotOffset)
- rMatrix.translate(-offset.x, -offset.y);
- else
- rMatrix.translate(-rotOffset.x, -rotOffset.y);
+ rMatrix.translate(-frameOffset.x, -frameOffset.y);
}
rMatrix.scale(scale.x, scale.y);
diff --git a/source/funkin/system/FunkinSprite.hx b/source/funkin/system/FunkinSprite.hx
index c34a5653..26e96861 100644
--- a/source/funkin/system/FunkinSprite.hx
+++ b/source/funkin/system/FunkinSprite.hx
@@ -184,7 +184,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
animateAtlas.scrollFactor = scrollFactor;
animateAtlas.scale = scale;
animateAtlas.offset = offset;
- animateAtlas.rotOffset = rotOffset;
+ animateAtlas.frameOffset = frameOffset;
animateAtlas.x = x;
animateAtlas.y = y;
animateAtlas.angle = angle;
@@ -277,7 +277,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
}
var daOffset = getAnimOffset(AnimName);
- rotOffset.set(daOffset.x, daOffset.y);
+ frameOffset.set(daOffset.x, daOffset.y);
daOffset.putWeak();
lastAnimContext = Context;
diff --git a/source/funkin/system/Main.hx b/source/funkin/system/Main.hx
index 372a9eba..619e7c1e 100644
--- a/source/funkin/system/Main.hx
+++ b/source/funkin/system/Main.hx
@@ -62,51 +62,12 @@ class Main extends Sprite
public static var gameThreads:Array = [];
#end
- public static function main():Void
- {
- #if windows NativeAPI.setDarkMode(true); #end
- Lib.current.addChild(instance = new Main());
- }
-
public function new()
{
super();
+ #if windows NativeAPI.setDarkMode(true); #end
- if (stage != null)
- {
- init();
- }
- else
- {
- addEventListener(Event.ADDED_TO_STAGE, init);
- }
- }
-
- private function init(?E:Event):Void
- {
- if (hasEventListener(Event.ADDED_TO_STAGE))
- {
- removeEventListener(Event.ADDED_TO_STAGE, init);
- }
-
- setupGame();
- }
-
- private function setupGame():Void
- {
- var stageWidth:Int = Lib.current.stage.stageWidth;
- var stageHeight:Int = Lib.current.stage.stageHeight;
-
- if (zoom == -1)
- {
- var ratioX:Float = stageWidth / gameWidth;
- var ratioY:Float = stageHeight / gameHeight;
- zoom = Math.min(ratioX, ratioY);
- gameWidth = Math.ceil(stageWidth / zoom);
- gameHeight = Math.ceil(stageHeight / zoom);
- }
-
- addChild(game = new FunkinGame(gameWidth, gameHeight, MainState, zoom, framerate, framerate, skipSplash, startFullscreen));
+ addChild(game = new FunkinGame(gameWidth, gameHeight, MainState, framerate, framerate, skipSplash, startFullscreen));
#if !mobile
addChild(framerateSprite = new funkin.system.framerate.Framerate());
diff --git a/source/funkin/system/MusicBeatState.hx b/source/funkin/system/MusicBeatState.hx
index 22e84309..c8040821 100644
--- a/source/funkin/system/MusicBeatState.hx
+++ b/source/funkin/system/MusicBeatState.hx
@@ -9,7 +9,6 @@ import funkin.scripting.events.*;
import funkin.scripting.Script;
import funkin.interfaces.IBeatReceiver;
import funkin.system.Conductor;
-import flixel.addons.ui.FlxUIState;
import funkin.options.PlayerSettings;
class MusicBeatState extends FlxTransitionableState implements IBeatReceiver
diff --git a/source/funkin/system/OptimizedBitmapData.hx b/source/funkin/system/OptimizedBitmapData.hx
index a846fe04..052189eb 100644
--- a/source/funkin/system/OptimizedBitmapData.hx
+++ b/source/funkin/system/OptimizedBitmapData.hx
@@ -36,9 +36,9 @@ class OptimizedBitmapData extends BitmapData {
readable = true;
this.image = null;
- @:privateAccess
- if (FlxG.bitmap.__doNotDelete)
- MemoryUtil.clearMinor();
+ // @:privateAccess
+ // if (FlxG.bitmap.__doNotDelete)
+ // MemoryUtil.clearMinor();
}
#end
}
diff --git a/source/funkin/system/modules/AudioSwitchFix.hx b/source/funkin/system/modules/AudioSwitchFix.hx
index 4ceae947..5fc832d1 100644
--- a/source/funkin/system/modules/AudioSwitchFix.hx
+++ b/source/funkin/system/modules/AudioSwitchFix.hx
@@ -1,7 +1,7 @@
package funkin.system.modules;
import lime.media.AudioManager;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.FlxState;
import funkin.utils.NativeAPI;
diff --git a/source/funkin/updating/UpdateScreen.hx b/source/funkin/updating/UpdateScreen.hx
index 502ee771..3ebe4b75 100644
--- a/source/funkin/updating/UpdateScreen.hx
+++ b/source/funkin/updating/UpdateScreen.hx
@@ -4,7 +4,7 @@ import funkin.shaders.CustomShader;
import funkin.ui.FunkinText;
import funkin.menus.TitleState;
import flixel.math.FlxRect;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.ui.FlxBar;
import funkin.updating.UpdateUtil.UpdateCheckCallback;
diff --git a/source/funkin/utils/CoolUtil.hx b/source/funkin/utils/CoolUtil.hx
index df22ad82..8658ca87 100644
--- a/source/funkin/utils/CoolUtil.hx
+++ b/source/funkin/utils/CoolUtil.hx
@@ -2,9 +2,9 @@ package funkin.utils;
import flixel.tweens.FlxTween;
import flixel.system.frontEnds.SoundFrontEnd;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import funkin.system.Conductor;
-import flixel.system.FlxSoundGroup;
+import flixel.sound.FlxSoundGroup;
import animateatlas.AtlasFrameMaker;
import haxe.Json;
import funkin.menus.StoryMenuState.WeekData;
@@ -571,7 +571,7 @@ class CoolUtil
spr.acceleration.set();
spr.drag.set();
spr.antialiasing = FlxSprite.defaultAntialiasing;
- spr.rotOffset.set();
+ spr.frameOffset.set();
FlxTween.cancelTweensOf(spr);
}
diff --git a/source/funkin/utils/DiscordUtil.hx b/source/funkin/utils/DiscordUtil.hx
index e884f17d..d1ab858f 100644
--- a/source/funkin/utils/DiscordUtil.hx
+++ b/source/funkin/utils/DiscordUtil.hx
@@ -2,7 +2,7 @@ package funkin.utils;
import funkin.scripting.events.DiscordPresenceUpdateEvent;
import haxe.Json;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
#if DISCORD_RPC
import discord_rpc.DiscordRpc;
import sys.thread.Thread;
diff --git a/source/funkin/utils/FunkinParentDisabler.hx b/source/funkin/utils/FunkinParentDisabler.hx
index 1b54655b..1ed58ba3 100644
--- a/source/funkin/utils/FunkinParentDisabler.hx
+++ b/source/funkin/utils/FunkinParentDisabler.hx
@@ -1,6 +1,6 @@
package funkin.utils;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.util.FlxTimer;
import flixel.tweens.FlxTween;
@@ -32,8 +32,8 @@ class FunkinParentDisabler extends FlxBasic {
FlxTimer.globalManager._timers = [];
// cameras
- __cameras = [for(c in FlxG.cameras.list) if (c.followActive) c];
- for(c in __cameras) c.followActive = false;
+ __cameras = [for(c in FlxG.cameras.list) if (c.followEnabled) c];
+ for(c in __cameras) c.followEnabled = false;
// sounds
__sounds = [for(s in FlxG.sound.list) if (s.playing) s];
@@ -54,7 +54,7 @@ class FunkinParentDisabler extends FlxBasic {
for(t in __tweens) FlxTween.globalManager._tweens.push(t);
for(t in __timers) FlxTimer.globalManager._timers.push(t);
}
- for(c in __cameras) c.followActive = true;
+ for(c in __cameras) c.followEnabled = true;
for(s in __sounds) s.play();
}
}
diff --git a/source/funkin/utils/native/HiddenProcess.hx b/source/funkin/utils/native/HiddenProcess.hx
index 701f9e7f..cccac7f9 100644
--- a/source/funkin/utils/native/HiddenProcess.hx
+++ b/source/funkin/utils/native/HiddenProcess.hx
@@ -105,7 +105,7 @@ class HiddenProcess {
}
public function exitCode(block:Bool = true):Null {
- return NativeProcess.process_exit(p);
+ return NativeProcess.process_exit(p #if (haxe >= "4.3.0"), block #end);
}
public function close():Void {