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

Merge branch 'main' into translations-system

Browse Source
This commit is contained in:
NeeEoo
2024-04-11 14:30:58 +02:00
parent 375986dc81 75e35b30e1
commit 070db1c2bd
130 changed files with 387 additions and 1962 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/away3d/extrusions/PathExtrude.hx
-1372
View File
File diff suppressed because it is too large Load Diff
source/away3d/materials/methods/LightMapMethod.hx
-127
View File
@@ -1,127 +0,0 @@
package away3d.materials.methods;
import away3d.core.managers.Stage3DProxy;
import away3d.materials.compilation.ShaderRegisterCache;
import away3d.materials.compilation.ShaderRegisterElement;
import away3d.textures.Texture2DBase;
import openfl.display.BlendMode;
import openfl.errors.Error;
/**
* LightMapMethod provides a method that allows applying a light map texture to the calculated pixel colour.
* It is different from LightMapDiffuseMethod in that the latter only modulates the diffuse shading value rather
* than the whole pixel colour.
*/
class LightMapMethod extends EffectMethodBase
{
public var blendMode(get, set):BlendMode;
public var texture(get, set):Texture2DBase;
/**
* Indicates the light map should be multiplied with the calculated shading result.
*/
public static inline var MULTIPLY:BlendMode = BlendMode.MULTIPLY;
/**
* Indicates the light map should be added into the calculated shading result.
*/
public static var ADD:BlendMode = BlendMode.ADD;
private var _texture:Texture2DBase;
private var _blendMode:BlendMode;
private var _useSecondaryUV:Bool;
/**
* Creates a new LightMapMethod object.
* @param texture The texture containing the light map.
* @param blendMode The blend mode with which the light map should be applied to the lighting result.
* @param useSecondaryUV Indicates whether the secondary UV set should be used to map the light map.
*/
public function new(texture:Texture2DBase, blendMode:BlendMode = MULTIPLY, useSecondaryUV:Bool = false)
{
super();
_useSecondaryUV = useSecondaryUV;
_texture = texture;
this.blendMode = blendMode;
}
/**
* @inheritDoc
*/
override private function initVO(vo:MethodVO):Void
{
vo.needsUV = !_useSecondaryUV;
vo.needsSecondaryUV = _useSecondaryUV;
}
/**
* The blend mode with which the light map should be applied to the lighting result.
*
* @see LightMapMethod.ADD
* @see LightMapMethod.MULTIPLY
*/
private function get_blendMode():BlendMode
{
return _blendMode;
}
private function set_blendMode(value:BlendMode):BlendMode
{
if (value != ADD && value != MULTIPLY)
throw new Error("Unknown blendmode!");
if (_blendMode == value)
return value;
_blendMode = value;
invalidateShaderProgram();
return value;
}
/**
* The texture containing the light map.
*/
private function get_texture():Texture2DBase
{
return _texture;
}
private function set_texture(value:Texture2DBase):Texture2DBase
{
if (value.hasMipMaps != _texture.hasMipMaps || value.format != _texture.format)
invalidateShaderProgram();
_texture = value;
return value;
}
/**
* @inheritDoc
*/
override private function activate(vo:MethodVO, stage3DProxy:Stage3DProxy):Void
{
stage3DProxy._context3D.setTextureAt(vo.texturesIndex, _texture.getTextureForStage3D(stage3DProxy));
super.activate(vo, stage3DProxy);
}
/**
* @inheritDoc
*/
override private function getFragmentCode(vo:MethodVO, regCache:ShaderRegisterCache, targetReg:ShaderRegisterElement):String
{
var code:String;
var lightMapReg:ShaderRegisterElement = regCache.getFreeTextureReg();
var temp:ShaderRegisterElement = regCache.getFreeFragmentVectorTemp();
vo.texturesIndex = lightMapReg.index;
code = getTex2DSampleCode(vo, temp, lightMapReg, _texture, _useSecondaryUV? _sharedRegisters.secondaryUVVarying : _sharedRegisters.uvVarying);
switch (_blendMode) {
case BlendMode.MULTIPLY:
code += "mul " + targetReg + ", " + targetReg + ", " + temp + "\n";
case BlendMode.ADD:
code += "add " + targetReg + ", " + targetReg + ", " + temp + "\n";
default:
}
return code;
}
}
source/flx3d/Flx3DCamera.hx
+15 -18
View File
@@ -1,32 +1,29 @@
package flx3d;
#if THREE_D_SUPPORT
import away3d.entities.SegmentSet;
import away3d.cameras.Camera3D;
import away3d.entities.TextureProjector;
import away3d.primitives.SkyBox;
import away3d.lights.LightBase;
import away3d.containers.ObjectContainer3D;
import away3d.library.Asset3DLibraryBundle;
import away3d.containers.View3D;
import away3d.entities.Mesh;
import away3d.entities.SegmentSet;
import away3d.entities.TextureProjector;
import away3d.events.Asset3DEvent;
import away3d.events.LoaderEvent;
import away3d.loaders.AssetLoader;
import away3d.library.Asset3DLibrary;
import away3d.library.Asset3DLibraryBundle;
import away3d.library.assets.Asset3DType;
import away3d.lights.LightBase;
import away3d.loaders.misc.AssetLoaderContext;
import away3d.loaders.misc.AssetLoaderToken;
import funkin.backend.system.Logs;
import away3d.loaders.parsers.*;
import away3d.materials.TextureMaterial;
import away3d.primitives.SkyBox;
import away3d.utils.Cast;
import flixel.FlxG;
import flx3d.Flx3DUtil;
import away3d.library.assets.Asset3DType;
import away3d.library.Asset3DLibrary;
import away3d.events.Asset3DEvent;
import away3d.loaders.parsers.*;
import away3d.utils.Cast;
import away3d.materials.TextureMaterial;
import haxe.io.Path;
import away3d.loaders.misc.AssetLoaderContext;
import openfl.Assets;
import away3d.entities.Mesh;
import away3d.loaders.Loader3D;
import funkin.backend.utils.NativeAPI.ConsoleColor;
import away3d.containers.View3D;
#end
import flixel.FlxCamera;
source/flx3d/Flx3DView.hx
+17 -22
View File
@@ -1,31 +1,26 @@
package flx3d;
#if THREE_D_SUPPORT
import away3d.entities.SegmentSet;
import away3d.cameras.Camera3D;
import away3d.entities.TextureProjector;
import away3d.primitives.SkyBox;
import away3d.lights.LightBase;
import away3d.containers.ObjectContainer3D;
import away3d.library.Asset3DLibraryBundle;
import away3d.events.LoaderEvent;
import away3d.loaders.AssetLoader;
import away3d.loaders.misc.AssetLoaderToken;
import funkin.backend.system.Logs;
import flixel.FlxG;
import flx3d.Flx3DUtil;
import away3d.library.assets.Asset3DType;
import away3d.library.Asset3DLibrary;
import away3d.events.Asset3DEvent;
import away3d.loaders.parsers.*;
import away3d.utils.Cast;
import away3d.materials.TextureMaterial;
import haxe.io.Path;
import away3d.loaders.misc.AssetLoaderContext;
import openfl.Assets;
import away3d.entities.Mesh;
import away3d.loaders.Loader3D;
import funkin.backend.utils.NativeAPI.ConsoleColor;
import away3d.entities.SegmentSet;
import away3d.entities.TextureProjector;
import away3d.events.Asset3DEvent;
import away3d.events.LoaderEvent;
import away3d.library.Asset3DLibrary;
import away3d.library.Asset3DLibraryBundle;
import away3d.library.assets.Asset3DType;
import away3d.lights.LightBase;
import away3d.loaders.misc.AssetLoaderContext;
import away3d.loaders.misc.AssetLoaderToken;
import away3d.loaders.parsers.*;
import away3d.materials.TextureMaterial;
import away3d.primitives.SkyBox;
import away3d.utils.Cast;
import flx3d.Flx3DUtil;
import haxe.io.Path;
import openfl.Assets;
#end
// FlxView3D with helpers for easier updating
source/funkin/backend/FlxAnimate.hx
+3 -6
View File
@@ -1,12 +1,9 @@
package funkin.backend;
import flixel.graphics.frames.FlxFramesCollection;
import openfl.geom.ColorTransform;
import flixel.math.FlxMatrix;
import flixel.math.FlxAngle;
import flixel.math.FlxRect;
import flixel.graphics.frames.FlxFrame;
import flixel.math.FlxPoint;
import flixel.math.FlxAngle;
import flixel.math.FlxMatrix;
import openfl.geom.ColorTransform;
class FlxAnimate extends flxanimate.FlxAnimate {
static var rMatrix = new FlxMatrix();
source/funkin/backend/FunkinSprite.hx
+8 -8
View File
@@ -1,17 +1,17 @@
package funkin.backend;
import funkin.backend.utils.XMLUtil.BeatAnim;
import funkin.backend.utils.XMLUtil.AnimData;
import funkin.backend.utils.XMLUtil.IXMLEvents;
import flixel.system.FlxAssets.FlxGraphicAsset;
import flixel.addons.effects.FlxSkewedSprite;
import haxe.io.Path;
import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext;
import funkin.backend.system.interfaces.IOffsetCompatible;
import flixel.math.FlxMatrix;
import flixel.math.FlxRect;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import flixel.system.FlxAssets.FlxGraphicAsset;
import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.system.interfaces.IOffsetCompatible;
import funkin.backend.utils.XMLUtil.AnimData;
import funkin.backend.utils.XMLUtil.BeatAnim;
import funkin.backend.utils.XMLUtil.IXMLEvents;
import haxe.io.Path;
enum abstract XMLAnimType(Int)
{
source/funkin/backend/FunkinText.hx
+3 -2
View File
@@ -1,8 +1,9 @@
package funkin.backend;
import funkin.backend.utils.TranslationUtil.IFormatInfo;
import flixel.util.FlxColor;
import flixel.text.FlxText;
import flixel.util.FlxColor;
import flixel.util.FlxColor;
import funkin.backend.utils.TranslationUtil.IFormatInfo;
class FunkinText extends FlxText {
public var langStrID:String = null;
source/funkin/backend/MusicBeatState.hx
+6 -6
View File
@@ -1,16 +1,16 @@
package funkin.backend;
import funkin.backend.system.framerate.Framerate;
import funkin.backend.system.GraphicCacheSprite;
import funkin.backend.system.Controls;
import funkin.backend.scripting.DummyScript;
import flixel.FlxState;
import flixel.FlxSubState;
import funkin.backend.scripting.events.*;
import funkin.backend.scripting.DummyScript;
import funkin.backend.scripting.Script;
import funkin.backend.scripting.ScriptPack;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.scripting.events.*;
import funkin.backend.system.Conductor;
import funkin.backend.system.Controls;
import funkin.backend.system.GraphicCacheSprite;
import funkin.backend.system.framerate.Framerate;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.options.PlayerSettings;
class MusicBeatState extends FlxState implements IBeatReceiver
source/funkin/backend/MusicBeatSubstate.hx
+4 -4
View File
@@ -1,15 +1,15 @@
package funkin.backend;
import flixel.FlxState;
import funkin.backend.scripting.events.*;
import flixel.FlxSubState;
import funkin.backend.scripting.DummyScript;
import funkin.backend.scripting.Script;
import funkin.backend.scripting.ScriptPack;
import funkin.backend.scripting.DummyScript;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.scripting.events.*;
import funkin.backend.system.Conductor;
import funkin.backend.system.Controls;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.options.PlayerSettings;
import flixel.FlxSubState;
class MusicBeatSubstate extends FlxSubState implements IBeatReceiver
{
source/funkin/backend/MusicBeatTransition.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend;
import flixel.tweens.FlxTween;
import flixel.FlxState;
import flixel.tweens.FlxTween;
import funkin.backend.utils.FunkinParentDisabler;
class MusicBeatTransition extends MusicBeatSubstate {
source/funkin/backend/assets/ModsFolder.hx
+5 -7
View File
@@ -1,20 +1,18 @@
package funkin.backend.assets;
import funkin.backend.system.MainState;
import openfl.utils.AssetManifest;
import openfl.utils.AssetLibrary;
import flixel.util.FlxSignal.FlxTypedSignal;
import funkin.backend.system.MainState;
import haxe.io.Path;
import lime.text.Font;
import openfl.text.Font as OpenFLFont;
import openfl.utils.AssetLibrary;
import openfl.utils.AssetManifest;
using StringTools;
#if MOD_SUPPORT
import sys.FileSystem;
#end
import haxe.io.Path;
using StringTools;
class ModsFolder {
/**
source/funkin/backend/assets/MultiFramesCollection.hx
+1 -1
View File
@@ -1,10 +1,10 @@
package funkin.backend.assets;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.FlxG;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
import flixel.graphics.frames.FlxFrame.FlxFrameType;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.math.FlxMath;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
source/funkin/backend/assets/Paths.hx
+9 -9
View File
@@ -1,17 +1,17 @@
package funkin.backend.assets;
import lime.utils.AssetLibrary;
import flixel.graphics.frames.FlxFramesCollection;
import haxe.io.Path;
import funkin.backend.assets.LimeLibrarySymbol;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxAtlasFrames;
import openfl.utils.AssetType;
import openfl.utils.Assets as OpenFlAssets;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.system.FlxAssets.FlxGraphicAsset;
import funkin.backend.assets.LimeLibrarySymbol;
import funkin.backend.assets.ModsFolder;
import funkin.backend.scripting.Script;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.system.FlxAssets.FlxGraphicAsset;
import flixel.graphics.FlxGraphic;
import haxe.io.Path;
import lime.utils.AssetLibrary;
import openfl.utils.AssetType;
import openfl.utils.Assets as OpenFlAssets;
using StringTools;
source/funkin/backend/assets/ScriptedAssetLibrary.hx
+3 -4
View File
@@ -1,12 +1,11 @@
package funkin.backend.assets;
import funkin.backend.scripting.Script;
import lime.graphics.Image;
import lime.media.AudioBuffer;
import lime.text.Font;
import lime.utils.AssetLibrary;
import lime.utils.Assets as LimeAssets;
import lime.media.AudioBuffer;
import lime.graphics.Image;
import lime.text.Font;
import lime.utils.Bytes;
#if MOD_SUPPORT
source/funkin/backend/assets/ZipFolderLibrary.hx
+2 -4
View File
@@ -1,17 +1,15 @@
package funkin.backend.assets;
import haxe.io.Path;
import lime.media.AudioBuffer;
import lime.graphics.Image;
import lime.media.AudioBuffer;
import lime.text.Font;
import lime.utils.Bytes;
import openfl.utils.AssetLibrary;
#if MOD_SUPPORT
import funkin.backend.utils.SysZip;
import funkin.backend.utils.SysZip.SysZipEntry;
import funkin.backend.utils.SysZip;
class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
public var basePath:String;
source/funkin/backend/chart/Chart.hx
+2 -4
View File
@@ -1,13 +1,11 @@
package funkin.backend.chart;
import funkin.backend.system.Conductor;
import funkin.backend.chart.ChartData;
import flixel.util.FlxColor;
import haxe.io.Path;
import funkin.backend.chart.ChartData;
import haxe.Json;
import haxe.io.Path;
#if sys
import sys.io.File;
import sys.FileSystem;
#end
source/funkin/backend/chart/EventsData.hx
+5 -5
View File
@@ -1,11 +1,11 @@
package funkin.backend.chart;
import hscript.Parser;
import hscript.Interp;
import haxe.Json;
import openfl.Assets;
import haxe.io.Path;
import funkin.backend.assets.Paths;
import haxe.Json;
import haxe.io.Path;
import hscript.Interp;
import hscript.Parser;
import openfl.Assets;
using StringTools;
source/funkin/backend/chart/PsychParser.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.chart;
import funkin.backend.chart.FNFLegacyParser.SwagSection;
import funkin.backend.chart.ChartData.ChartEvent;
import funkin.backend.chart.FNFLegacyParser.SwagSection;
import funkin.backend.chart.FNFLegacyParser.SwagSong;
import funkin.backend.system.Conductor;
source/funkin/backend/scripting/GlobalScript.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.backend.scripting;
import funkin.backend.scripting.events.CancellableEvent;
import funkin.backend.system.Conductor;
import flixel.FlxState;
import funkin.backend.assets.ModsFolder;
import funkin.backend.scripting.events.CancellableEvent;
import funkin.backend.system.Conductor;
#if GLOBAL_SCRIPT
/**
* Class for THE Global Script, aka script that runs in the background at all times.
source/funkin/backend/scripting/HScript.hx
+1 -2
View File
@@ -1,10 +1,9 @@
package funkin.backend.scripting;
import haxe.io.Path;
import hscript.*;
import hscript.Expr.Error;
import hscript.Parser;
import openfl.Assets;
import hscript.*;
class HScript extends Script {
public var interp:Interp;
source/funkin/backend/scripting/Script.hx
+2 -3
View File
@@ -1,10 +1,9 @@
package funkin.backend.scripting;
import lime.app.Application;
import flixel.util.FlxDestroyUtil.IFlxDestroyable;
import haxe.io.Path;
import hscript.IHScriptCustomConstructor;
import flixel.util.FlxStringUtil;
import haxe.io.Path;
import lime.app.Application;
@:allow(funkin.backend.scripting.ScriptPack)
/**
source/funkin/backend/scripting/events/CamMoveEvent.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events;
import funkin.game.StrumLine;
import flixel.math.FlxPoint;
import funkin.game.StrumLine;
final class CamMoveEvent extends CancellableEvent {
/**
source/funkin/backend/scripting/events/CountdownEvent.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events;
import flixel.tweens.FlxTween;
import flixel.sound.FlxSound;
import flixel.tweens.FlxTween;
final class CountdownEvent extends CancellableEvent {
/**
source/funkin/backend/scripting/events/NoteHitEvent.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events;
import funkin.game.Note;
import funkin.game.Character;
import funkin.game.Note;
final class NoteHitEvent extends CancellableEvent {
@:dox(hide) public var animCancelled:Bool = false;
source/funkin/backend/scripting/events/NoteMissEvent.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events;
import funkin.game.Note;
import funkin.game.Character;
import funkin.game.Note;
final class NoteMissEvent extends CancellableEvent {
@:dox(hide) public var animCancelled:Bool = false;
source/funkin/backend/scripting/events/dialogue/DialogueBoxPlayBubbleEvent.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events.dialogue;
import funkin.backend.utils.XMLUtil.TextFormat;
import flixel.sound.FlxSound;
import funkin.backend.utils.XMLUtil.TextFormat;
final class DialogueBoxPlayBubbleEvent extends CancellableEvent
{
source/funkin/backend/scripting/events/dialogue/DialogueBoxSetTextEvent.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events.dialogue;
import funkin.backend.utils.XMLUtil.TextFormat;
import flixel.sound.FlxSound;
import funkin.backend.utils.XMLUtil.TextFormat;
final class DialogueBoxSetTextEvent extends CancellableEvent
{
source/funkin/backend/shaders/CustomShader.hx
-2
View File
@@ -1,8 +1,6 @@
package funkin.backend.shaders;
import haxe.Exception;
import openfl.Assets;
import hscript.IHScriptCustomBehaviour;
/**
* Class for custom shaders.
source/funkin/backend/shaders/FunkinShader.hx
+2 -8
View File
@@ -2,22 +2,16 @@ package funkin.backend.shaders;
import haxe.Exception;
import hscript.IHScriptCustomBehaviour;
import flixel.graphics.tile.FlxGraphicsShader;
import openfl.display3D.Program3D;
import flixel.system.FlxAssets.FlxShader;
import openfl.display.BitmapData;
import openfl.display.ShaderParameter;
import openfl.display.ShaderParameterType;
import openfl.display.ShaderInput;
import lime.utils.Float32Array;
using StringTools;
import openfl.display.ShaderParameterType;
import openfl.display.ShaderParameter;
import openfl.display.BitmapData;
import openfl.display.ShaderInput;
using StringTools;
@:access(openfl.display3D.Context3D)
@:access(openfl.display3D.Program3D)
@:access(openfl.display.ShaderInput)
source/funkin/backend/system/Conductor.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.backend.system;
import funkin.backend.chart.ChartData;
import flixel.FlxState;
import funkin.backend.system.interfaces.IBeatReceiver;
import flixel.util.FlxSignal.FlxTypedSignal;
import funkin.backend.chart.ChartData;
import funkin.backend.system.interfaces.IBeatReceiver;
typedef BPMChangeEvent =
{
source/funkin/backend/system/Controls.hx
-2
View File
@@ -3,10 +3,8 @@ package funkin.backend.system;
import flixel.input.FlxInput;
import flixel.input.actions.FlxAction;
import flixel.input.actions.FlxActionInput;
import flixel.input.actions.FlxActionInputDigital;
import flixel.input.actions.FlxActionManager;
import flixel.input.actions.FlxActionSet;
import flixel.input.gamepad.FlxGamepadButton;
import flixel.input.gamepad.FlxGamepadInputID;
import flixel.input.keyboard.FlxKey;
source/funkin/backend/system/Logs.hx
+2 -2
View File
@@ -2,9 +2,9 @@ package funkin.backend.system;
import flixel.system.debug.log.LogStyle;
import flixel.system.frontEnds.LogFrontEnd;
import haxe.Log;
import funkin.backend.utils.NativeAPI;
import funkin.backend.utils.NativeAPI.ConsoleColor;
import funkin.backend.utils.NativeAPI;
import haxe.Log;
class Logs {
private static var __showing:Bool = false;
source/funkin/backend/system/Main.hx
+16 -19
View File
@@ -1,29 +1,26 @@
package funkin.backend.system;
import funkin.editors.SaveWarning;
import funkin.backend.assets.AssetsLibraryList;
import funkin.backend.system.framerate.SystemInfo;
import openfl.utils.AssetLibrary;
import openfl.text.TextFormat;
import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
import flixel.addons.transition.FlxTransitionableState;
import flixel.addons.transition.TransitionData;
import flixel.graphics.FlxGraphic;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import flixel.system.ui.FlxSoundTray;
import funkin.backend.assets.AssetsLibraryList;
import funkin.backend.assets.ModsFolder;
import funkin.backend.system.framerate.SystemInfo;
import funkin.backend.system.modules.*;
import funkin.editors.SaveWarning;
import openfl.Assets;
import openfl.Lib;
import openfl.display.Sprite;
import flixel.graphics.FlxGraphic;
import flixel.addons.transition.FlxTransitionableState;
import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
import flixel.addons.transition.TransitionData;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import funkin.backend.system.modules.*;
import openfl.text.TextFormat;
import openfl.utils.AssetLibrary;
#if ALLOW_MULTITHREADING
import sys.thread.Thread;
#end
#if sys
import sys.io.File;
#end
import funkin.backend.assets.ModsFolder;
#if android
import android.content.Context;
import android.os.Build;
@@ -212,9 +209,9 @@ class Main extends Sprite
public static var noCwdFix:Bool = false;
public static function fixWorkingDirectory() {
#if windows
if (!noCwdFix && !sys.FileSystem.exists('manifest/default.json')) {
Sys.setCwd(haxe.io.Path.directory(Sys.programPath()));
}
if (!noCwdFix && !sys.FileSystem.exists('manifest/default.json')) {
Sys.setCwd(haxe.io.Path.directory(Sys.programPath()));
}
#elseif android
Sys.setCwd(Path.addTrailingSlash(VERSION.SDK_INT > 30 ? Context.getObbDir() : Context.getExternalFilesDir()));
#elseif (ios || switch)
source/funkin/backend/system/MainState.hx
+4 -4
View File
@@ -3,11 +3,11 @@ package funkin.backend.system;
#if MOD_SUPPORT
import sys.FileSystem;
#end
import funkin.backend.assets.ModsFolder;
import funkin.menus.TitleState;
import funkin.menus.BetaWarningState;
import funkin.backend.chart.EventsData;
import flixel.FlxState;
import funkin.backend.assets.ModsFolder;
import funkin.backend.chart.EventsData;
import funkin.menus.BetaWarningState;
import funkin.menus.TitleState;
/**
* Simple state used for loading the game
source/funkin/backend/system/OptimizedBitmapData.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.backend.system;
import lime.graphics.Image;
import openfl.geom.Rectangle;
import openfl.display.BitmapData;
import lime.graphics.cairo.CairoImageSurface;
import openfl.display.BitmapData;
import openfl.geom.Rectangle;
class OptimizedBitmapData extends BitmapData {
@SuppressWarnings("checkstyle:Dynamic")
source/funkin/backend/system/framerate/CodenameBuildField.hx
+1 -3
View File
@@ -1,9 +1,7 @@
package funkin.backend.system.framerate;
import openfl.text.TextFormat;
import openfl.display.Sprite;
import openfl.text.TextField;
import funkin.backend.system.macros.GitCommitMacro;
import openfl.text.TextField;
class CodenameBuildField extends TextField {
public function new() {
source/funkin/backend/system/framerate/ConductorInfo.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.backend.system.framerate;
class ConductorInfo extends FramerateCategory {
public function new() {
super("Conductor Info");
source/funkin/backend/system/framerate/Framerate.hx
+2 -3
View File
@@ -1,12 +1,11 @@
package funkin.backend.system.framerate;
import flixel.math.FlxPoint;
import openfl.display.Bitmap;
import openfl.display.BitmapData;
import flixel.math.FlxPoint;
import openfl.events.KeyboardEvent;
import openfl.display.DisplayObject;
import openfl.display.Sprite;
import openfl.text.TextField;
import openfl.events.KeyboardEvent;
import openfl.text.TextFormat;
import openfl.ui.Keyboard;
source/funkin/backend/system/framerate/FramerateCategory.hx
+1 -1
View File
@@ -1,9 +1,9 @@
package funkin.backend.system.framerate;
import openfl.display.Bitmap;
import openfl.text.TextFormat;
import openfl.display.Sprite;
import openfl.text.TextField;
import openfl.text.TextFormat;
class FramerateCategory extends Sprite {
public var title:TextField;
source/funkin/backend/system/framerate/FramerateCounter.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.backend.system.framerate;
import openfl.text.TextFormat;
import openfl.display.Sprite;
import openfl.text.TextField;
import openfl.text.TextFormat;
class FramerateCounter extends Sprite {
public var fpsNum:TextField;
source/funkin/backend/system/framerate/MemoryCounter.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.backend.system.framerate;
import openfl.text.TextFormat;
import openfl.display.Sprite;
import openfl.text.TextField;
import openfl.text.TextFormat;
class MemoryCounter extends Sprite {
public var memoryText:TextField;
source/funkin/backend/system/framerate/SystemInfo.hx
+2 -2
View File
@@ -1,8 +1,8 @@
package funkin.backend.system.framerate;
import funkin.backend.utils.native.HiddenProcess;
import funkin.backend.utils.MemoryUtil;
import funkin.backend.system.Logs;
import funkin.backend.utils.MemoryUtil;
import funkin.backend.utils.native.HiddenProcess;
using StringTools;
source/funkin/backend/system/github/GitHub.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.backend.system.github;
#if GITHUB_API
import haxe.Json;
import haxe.Exception;
import haxe.Json;
#end
// TODO: Document further and perhaps make this a Haxelib.
source/funkin/backend/system/github/GitHubUser.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.backend.system.github;
typedef GitHubUser = {
/**
* Username of the user.
source/funkin/backend/system/modules/AudioSwitchFix.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.backend.system.modules;
import lime.media.AudioManager;
import flixel.sound.FlxSound;
import flixel.FlxState;
import flixel.sound.FlxSound;
import funkin.backend.utils.NativeAPI;
import lime.media.AudioManager;
/**
* if youre stealing this keep this comment at least please lol
source/funkin/backend/system/modules/CrashHandler.hx
+4 -6
View File
@@ -1,13 +1,11 @@
package funkin.backend.system.modules;
import lime.system.System;
import funkin.backend.utils.NativeAPI;
import openfl.Lib;
import openfl.events.UncaughtErrorEvent;
import openfl.events.ErrorEvent;
import openfl.errors.Error;
import openfl.events.UncaughtErrorEvent;
import haxe.CallStack;
import openfl.Lib;
import openfl.errors.Error;
import openfl.events.ErrorEvent;
import openfl.events.UncaughtErrorEvent;
class CrashHandler {
public static function init() {
source/funkin/backend/system/modules/FunkinCache.hx
+1 -1
View File
@@ -1,9 +1,9 @@
package funkin.backend.system.modules;
import openfl.utils.AssetCache;
import openfl.display.BitmapData;
import openfl.media.Sound;
import openfl.text.Font;
import openfl.utils.AssetCache;
#if lime
import lime.utils.Assets as LimeAssets;
#end
source/funkin/backend/system/updating/AsyncUpdater.hx
+6 -8
View File
@@ -1,19 +1,17 @@
package funkin.backend.system.updating;
import openfl.Lib;
import sys.io.Process;
import haxe.zip.Reader;
import funkin.backend.system.github.GitHubRelease;
import funkin.backend.utils.ZipUtil;
import haxe.io.Path;
import openfl.utils.ByteArray;
import sys.io.File;
import sys.io.FileOutput;
import openfl.Lib;
import openfl.events.Event;
import openfl.events.ProgressEvent;
import openfl.net.URLRequest;
import openfl.net.URLLoader;
import openfl.net.URLRequest;
import openfl.utils.ByteArray;
import sys.FileSystem;
import funkin.backend.system.github.GitHubRelease;
import sys.io.File;
import sys.io.FileOutput;
class AsyncUpdater {
// NON ASYNC STUFF
source/funkin/backend/system/updating/UpdateAvailableScreen.hx
+4 -6
View File
@@ -1,13 +1,11 @@
package funkin.backend.system.updating;
import flixel.addons.transition.FlxTransitionableState;
import flixel.math.FlxPoint;
import funkin.backend.FunkinText;
import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback;
import funkin.backend.utils.MarkdownUtil;
import funkin.menus.MainMenuState;
import flixel.math.FlxPoint;
import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback;
import funkin.backend.FunkinText;
import flixel.text.FlxText;
import flixel.addons.transition.FlxTransitionableState;
import flixel.tweens.FlxTween;
class UpdateAvailableScreen extends MusicBeatState {
public var bg:FlxSprite;
source/funkin/backend/system/updating/UpdateScreen.hx
+3 -3
View File
@@ -1,12 +1,12 @@
package funkin.backend.system.updating;
import funkin.backend.shaders.CustomShader;
import funkin.backend.FunkinText;
import funkin.menus.TitleState;
import flixel.math.FlxRect;
import flixel.sound.FlxSound;
import flixel.ui.FlxBar;
import funkin.backend.FunkinText;
import funkin.backend.shaders.CustomShader;
import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback;
import funkin.menus.TitleState;
class UpdateScreen extends MusicBeatState {
public var updater:AsyncUpdater;
source/funkin/backend/system/updating/UpdateUtil.hx
+3 -3
View File
@@ -1,10 +1,10 @@
package funkin.backend.system.updating;
import sys.FileSystem;
import haxe.io.Path;
import funkin.backend.system.github.GitHubRelease;
import funkin.backend.system.github.GitHub;
import funkin.backend.system.github.GitHubRelease;
import haxe.io.Path;
import lime.app.Application;
import sys.FileSystem;
using funkin.backend.system.github.GitHub;
source/funkin/backend/utils/BitmapUtil.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.utils;
import openfl.display.BitmapData;
import flixel.util.FlxColor;
import openfl.display.BitmapData;
class BitmapUtil {
/**
source/funkin/backend/utils/CoolUtil.hx
+16 -16
View File
@@ -1,24 +1,24 @@
package funkin.backend.utils;
import flixel.text.FlxText;
import funkin.backend.utils.XMLUtil.TextFormat;
import flixel.util.typeLimit.OneOfTwo;
import flixel.tweens.FlxTween;
import flixel.system.frontEnds.SoundFrontEnd;
import flixel.sound.FlxSound;
import funkin.backend.system.Conductor;
import flixel.sound.FlxSoundGroup;
import haxe.Json;
import haxe.io.Path;
import haxe.io.Bytes;
import haxe.xml.Access;
import flixel.input.keyboard.FlxKey;
import lime.utils.Assets;
import flixel.animation.FlxAnimation;
import flixel.util.FlxColor;
import flixel.input.keyboard.FlxKey;
import flixel.sound.FlxSound;
import flixel.sound.FlxSoundGroup;
import flixel.system.frontEnds.SoundFrontEnd;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
import flixel.util.FlxAxes;
import openfl.geom.ColorTransform;
import flixel.util.FlxColor;
import flixel.util.typeLimit.OneOfTwo;
import funkin.backend.system.Conductor;
import funkin.backend.utils.XMLUtil.TextFormat;
import haxe.CallStack;
import haxe.Json;
import haxe.io.Bytes;
import haxe.io.Path;
import haxe.xml.Access;
import lime.utils.Assets;
import openfl.geom.ColorTransform;
using StringTools;
source/funkin/backend/utils/DiscordUtil.hx
+7 -7
View File
@@ -1,19 +1,19 @@
package funkin.backend.utils;
import funkin.backend.scripting.events.DiscordPresenceUpdateEvent;
import funkin.backend.scripting.events.CancellableEvent;
import funkin.backend.scripting.*; // lazy
import flixel.sound.FlxSound;
import flixel.util.typeLimit.OneOfTwo;
import openfl.display.BitmapData;
import funkin.backend.scripting.*; // lazy
import funkin.backend.scripting.events.CancellableEvent;
import funkin.backend.scripting.events.DiscordPresenceUpdateEvent;
import funkin.backend.system.macros.Utils;
import haxe.Json;
import flixel.sound.FlxSound;
import openfl.display.BitmapData;
#if DISCORD_RPC
import Sys;
import hxdiscord_rpc.Discord;
import hxdiscord_rpc.Types;
import sys.thread.Thread;
import Sys;
import lime.app.Application;
import sys.thread.Thread;
#end
class DiscordUtil
source/funkin/backend/utils/EngineUtil.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.utils;
import funkin.backend.scripting.Script;
import funkin.backend.scripting.MultiThreadedScript;
import funkin.backend.scripting.Script;
class EngineUtil {
/**
source/funkin/backend/utils/FunkinParentDisabler.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.backend.utils;
import flixel.sound.FlxSound;
import flixel.util.FlxTimer;
import flixel.tweens.FlxTween;
import flixel.util.FlxTimer;
/**
* FlxBasic allowing you to disable those elements from the parent state while this substate is opened
source/funkin/backend/utils/MarkdownUtil.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.backend.utils;
import flixel.util.FlxColor;
import flixel.text.FlxText;
import flixel.util.FlxColor;
class MarkdownUtil {
public static function applyMarkdownText(text:FlxText, str:String) {
source/funkin/backend/utils/NdllUtil.hx
-2
View File
@@ -1,7 +1,5 @@
package funkin.backend.utils;
import lime.app.Application;
/**
* Small util that allows you to load any function from ndlls via `getFunction`.
*
source/funkin/backend/utils/SysZip.hx
+1 -1
View File
@@ -3,10 +3,10 @@ package funkin.backend.utils;
#if sys
import haxe.io.Input;
import haxe.zip.Entry;
import haxe.zip.InflateImpl;
import haxe.zip.Reader;
import sys.io.File;
import sys.io.FileInput;
import haxe.zip.InflateImpl;
/**
* Class that extends Reader allowing you to load ZIP entries without blowing your RAM up!!
source/funkin/backend/utils/XMLUtil.hx
+4 -4
View File
@@ -1,12 +1,12 @@
package funkin.backend.utils;
import flixel.util.FlxColor;
import flixel.util.typeLimit.OneOfTwo;
import funkin.backend.FunkinSprite.XMLAnimType;
import funkin.backend.FunkinSprite;
import funkin.backend.system.ErrorCode;
import funkin.backend.FunkinSprite.XMLAnimType;
import flixel.util.FlxColor;
import haxe.xml.Access;
import flixel.util.typeLimit.OneOfTwo;
import funkin.backend.system.interfaces.IOffsetCompatible;
import haxe.xml.Access;
using StringTools;
source/funkin/backend/utils/ZipUtil.hx
+5 -5
View File
@@ -8,12 +8,12 @@ import openfl.display.BitmapData;
import haxe.Exception;
import haxe.Json;
import haxe.crypto.Crc32;
import haxe.zip.Writer;
import haxe.zip.Tools;
import haxe.zip.Entry;
import haxe.zip.Uncompress;
import haxe.zip.Reader;
import haxe.zip.Compress;
import haxe.zip.Entry;
import haxe.zip.Reader;
import haxe.zip.Tools;
import haxe.zip.Uncompress;
import haxe.zip.Writer;
import sys.FileSystem;
import sys.io.File;
import sys.thread.Thread;
source/funkin/editors/DebugOptions.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.editors;
import funkin.options.type.*;
import funkin.backend.utils.NativeAPI;
import funkin.options.OptionsScreen;
import funkin.options.TreeMenu;
import funkin.backend.utils.NativeAPI;
import funkin.options.type.*;
class DebugOptions extends TreeMenu {
public override function create() {
source/funkin/editors/EditorPicker.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors;
import flixel.math.FlxPoint;
import flixel.effects.FlxFlicker;
import flixel.math.FlxPoint;
class EditorPicker extends MusicBeatSubstate {
public var bg:FlxSprite;
source/funkin/editors/EditorTreeMenu.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors;
import funkin.menus.MainMenuState;
import flixel.addons.display.FlxBackdrop;
import funkin.menus.MainMenuState;
import funkin.options.*;
class EditorTreeMenu extends TreeMenu {
source/funkin/editors/UIDebugState.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors;
import funkin.editors.ui.*;
import flixel.tweens.FlxTween;
import funkin.editors.ui.*;
class UIDebugState extends UIState {
public override function create() {
source/funkin/editors/character/CharacterAnimButtons.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.character;
import flixel.util.FlxColor;
import flixel.math.FlxPoint;
import flixel.util.FlxColor;
class CharacterAnimButtons extends UIButton {
public var anim:String = "";
source/funkin/editors/character/CharacterAnimScreen.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.character;
import flixel.math.FlxPoint;
import flixel.animation.FlxAnimation;
import flixel.math.FlxPoint;
import funkin.backend.utils.XMLUtil.AnimData;
class CharacterAnimScreen extends UISubstateWindow {
source/funkin/editors/character/CharacterEditor.hx
+4 -4
View File
@@ -1,12 +1,12 @@
package funkin.editors.character;
import funkin.backend.system.framerate.Framerate;
import haxe.xml.Printer;
import haxe.xml.Access;
import funkin.backend.utils.XMLUtil.AnimData;
import flixel.math.FlxPoint;
import funkin.backend.system.framerate.Framerate;
import funkin.backend.utils.XMLUtil.AnimData;
import funkin.editors.ui.UIContextMenu.UIContextMenuOption;
import funkin.game.Character;
import haxe.xml.Access;
import haxe.xml.Printer;
class CharacterEditor extends UIState {
static var __character:String;
source/funkin/editors/character/CharacterGhostsHandler.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.editors.character;
import haxe.xml.Access;
import flixel.math.FlxPoint;
import funkin.game.Character;
import haxe.xml.Access;
class CharacterGhostsHandler extends FlxTypedGroup<Character> {
public var character:Character;
source/funkin/editors/character/CharacterInfoScreen.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.editors.character;
import flixel.math.FlxPoint;
import haxe.xml.Access;
import funkin.game.Character;
import funkin.editors.extra.PropertyButton;
import funkin.game.Character;
import haxe.xml.Access;
class CharacterInfoScreen extends UISubstateWindow {
public var character:Character;
source/funkin/editors/character/CharacterSelection.hx
+3 -6
View File
@@ -1,13 +1,10 @@
package funkin.editors.character;
import funkin.options.type.OptionType;
import funkin.options.type.NewOption;
import flixel.util.FlxColor;
import funkin.game.Character;
import funkin.backend.chart.Chart;
import funkin.options.type.TextOption;
import funkin.options.type.IconOption;
import funkin.options.OptionsScreen;
import funkin.options.type.IconOption;
import funkin.options.type.NewOption;
import funkin.options.type.OptionType;
class CharacterSelection extends EditorTreeMenu
{
source/funkin/editors/charter/ChartCreationScreen.hx
+2 -3
View File
@@ -2,12 +2,11 @@ package funkin.editors.charter;
import flixel.text.FlxText.FlxTextFormat;
import flixel.text.FlxText.FlxTextFormatMarkerPair;
import funkin.backend.chart.ChartData;
import funkin.backend.shaders.CustomShader;
import funkin.game.Character;
import funkin.game.Stage;
import funkin.game.HealthIcon;
import funkin.backend.chart.ChartData;
import haxe.io.Bytes;
import funkin.game.Stage;
class ChartCreationScreen extends UISubstateWindow {
private var onSave:(String, ChartData) -> Void = null;
source/funkin/editors/charter/ChartDataScreen.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.editors.charter;
import funkin.game.Stage;
import funkin.backend.chart.ChartData;
import flixel.math.FlxPoint;
import funkin.backend.chart.ChartData.ChartMetaData;
import funkin.backend.chart.ChartData;
import funkin.game.Stage;
using StringTools;
source/funkin/editors/charter/Charter.hx
+9 -18
View File
@@ -1,30 +1,21 @@
package funkin.editors.charter;
// ! FUCK YOU CHUF (your biggest fan -lunar) <3
import flixel.input.FlxPointer;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.graphics.FlxGraphic;
import flixel.addons.display.FlxTiledSprite;
import funkin.editors.ui.UIContextMenu.UIContextMenuOptionSpr;
import funkin.editors.ui.UITopMenu.UITopMenuButton;
import funkin.editors.charter.CharterStrumline;
import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
import funkin.backend.system.framerate.Framerate;
import haxe.Json;
import flixel.input.keyboard.FlxKey;
import flixel.sound.FlxSound;
import flixel.math.FlxPoint;
import funkin.editors.charter.CharterBackdropGroup.CharterBackdropDummy;
import funkin.backend.system.Conductor;
import flixel.sound.FlxSound;
import funkin.backend.chart.*;
import funkin.backend.chart.ChartData;
import flixel.addons.display.FlxBackdrop;
import funkin.backend.system.Conductor;
import funkin.backend.system.framerate.Framerate;
import funkin.editors.charter.CharterBackdropGroup.CharterBackdropDummy;
import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
import funkin.editors.charter.CharterStrumline;
import funkin.editors.ui.UIContextMenu.UIContextMenuOption;
import funkin.editors.ui.UIContextMenu.UIContextMenuOptionSpr;
import funkin.editors.ui.UIState;
import flixel.util.FlxColor;
import openfl.display.BitmapData;
import funkin.backend.shaders.CustomShader;
import funkin.editors.ui.UITopMenu.UITopMenuButton;
import haxe.Json;
class Charter extends UIState {
public static var __song:String;
source/funkin/editors/charter/CharterAutoSaveUI.hx
+2 -2
View File
@@ -1,8 +1,8 @@
package funkin.editors.charter;
import flixel.util.FlxTimer;
import flixel.tweens.FlxTween;
import flixel.math.FlxRect;
import flixel.tweens.FlxTween;
import flixel.util.FlxTimer;
using flixel.util.FlxSpriteUtil;
source/funkin/editors/charter/CharterBackdropGroup.hx
+1 -1
View File
@@ -1,9 +1,9 @@
package funkin.editors.charter;
import flixel.addons.display.FlxBackdrop;
import flixel.graphics.FlxGraphic;
import funkin.backend.system.Conductor;
import openfl.geom.Rectangle;
import flixel.addons.display.FlxBackdrop;
class CharterBackdropGroup extends FlxTypedGroup<CharterBackdrop> {
public var strumLineGroup:CharterStrumLineGroup;
source/funkin/editors/charter/CharterEvent.hx
+3 -3
View File
@@ -1,11 +1,11 @@
package funkin.editors.charter;
import funkin.editors.charter.Charter.ICharterSelectable;
import flixel.math.FlxPoint;
import funkin.backend.chart.ChartData.ChartEvent;
import funkin.editors.charter.Charter.ICharterSelectable;
import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
import funkin.game.Character;
import funkin.game.HealthIcon;
import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
import funkin.backend.chart.ChartData.ChartEvent;
class CharterEvent extends UISliceSprite implements ICharterSelectable {
public var events:Array<ChartEvent>;
source/funkin/editors/charter/CharterEventGroup.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.charter;
import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
import flixel.util.FlxSort;
import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
class CharterEventGroup extends FlxTypedGroup<CharterEvent> {
public var eventsBackdrop:EventBackdrop;
source/funkin/editors/charter/CharterEventScreen.hx
+3 -3
View File
@@ -1,10 +1,10 @@
package funkin.editors.charter;
import funkin.backend.chart.ChartData.ChartEvent;
import funkin.backend.system.Conductor;
import flixel.group.FlxGroup;
import funkin.backend.chart.EventsData;
import flixel.util.FlxColor;
import funkin.backend.chart.ChartData.ChartEvent;
import funkin.backend.chart.EventsData;
import funkin.backend.system.Conductor;
using StringTools;
source/funkin/editors/charter/CharterNote.hx
+2 -3
View File
@@ -1,11 +1,10 @@
package funkin.editors.charter;
import flixel.math.FlxPoint;
import funkin.editors.charter.Charter.ICharterSelectable;
import funkin.backend.system.Conductor;
import flixel.tweens.FlxTween;
import funkin.backend.shaders.CustomShader;
import flixel.util.FlxColor;
import funkin.backend.system.Conductor;
import funkin.editors.charter.Charter.ICharterSelectable;
class CharterNote extends UISprite implements ICharterSelectable {
var angleTween:FlxTween;
source/funkin/editors/charter/CharterSelection.hx
+5 -5
View File
@@ -1,15 +1,15 @@
package funkin.editors.charter;
import funkin.backend.chart.ChartData;
import funkin.backend.chart.ChartData.ChartMetaData;
import haxe.Json;
import funkin.editors.charter.SongCreationScreen.SongCreationData;
import funkin.options.type.NewOption;
import funkin.backend.chart.ChartData;
import funkin.backend.system.framerate.Framerate;
import funkin.menus.FreeplayState.FreeplaySonglist;
import funkin.editors.EditorTreeMenu;
import funkin.editors.charter.SongCreationScreen.SongCreationData;
import funkin.menus.FreeplayState.FreeplaySonglist;
import funkin.options.*;
import funkin.options.type.*;
import funkin.options.type.NewOption;
import haxe.Json;
using StringTools;
source/funkin/editors/charter/CharterStrumLineGroup.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.charter;
import funkin.backend.chart.EventsData;
import flixel.util.FlxSort;
import funkin.backend.chart.EventsData;
class CharterStrumLineGroup extends FlxTypedGroup<CharterStrumline> {
var __pastStrumlines:Array<CharterStrumline>;
source/funkin/editors/charter/CharterStrumline.hx
+4 -4
View File
@@ -1,12 +1,12 @@
package funkin.editors.charter;
import flixel.group.FlxSpriteGroup;
import funkin.game.Character;
import funkin.editors.ui.UITopMenu.UITopMenuButton;
import funkin.game.HealthIcon;
import flixel.sound.FlxSound;
import funkin.backend.chart.ChartData.ChartStrumLine;
import funkin.backend.shaders.CustomShader;
import flixel.sound.FlxSound;
import funkin.editors.ui.UITopMenu.UITopMenuButton;
import funkin.game.Character;
import funkin.game.HealthIcon;
class CharterStrumline extends UISprite {
public var strumLine:ChartStrumLine;
source/funkin/editors/charter/CharterStrumlineButton.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.charter;
import flixel.tweens.FlxTween;
import flixel.math.FlxPoint;
import flixel.tweens.FlxTween;
class CharterStrumlineButton extends UISprite {
public var button:UISprite;
source/funkin/editors/charter/CharterStrumlineScreen.hx
+1 -2
View File
@@ -1,10 +1,9 @@
package funkin.editors.charter;
import flixel.math.FlxPoint;
import funkin.game.Note;
import funkin.backend.chart.ChartData.ChartStrumLine;
import funkin.game.Character;
import funkin.game.HealthIcon;
import funkin.backend.chart.ChartData.ChartStrumLine;
class CharterStrumlineScreen extends UISubstateWindow {
public var strumLineID:Int = -1;
source/funkin/editors/charter/CharterWaveformHandler.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.editors.charter;
import flixel.util.FlxColor;
import funkin.backend.system.Conductor;
import flixel.sound.FlxSound;
import flixel.util.FlxColor;
import funkin.backend.shaders.CustomShader;
import funkin.backend.system.Conductor;
import openfl.display.BitmapData;
class CharterWaveformHandler extends FlxBasic {
source/funkin/editors/charter/SongCreationScreen.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.editors.charter;
import flixel.group.FlxGroup;
import flixel.text.FlxText.FlxTextFormat;
import flixel.text.FlxText.FlxTextFormatMarkerPair;
import flixel.group.FlxGroup;
import funkin.backend.chart.ChartData.ChartMetaData;
import haxe.io.Bytes;
source/funkin/editors/import.hx
+1 -1
View File
@@ -1,8 +1,8 @@
#if !macro
package funkin.editors;
import funkin.editors.ui.*;
import flixel.math.FlxPoint;
import funkin.editors.ui.*;
using funkin.editors.ui.UIUtil;
#end
source/funkin/editors/ui/IUIFocusable.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.ui;
import lime.ui.KeyModifier;
import lime.ui.KeyCode;
import lime.ui.KeyModifier;
interface IUIFocusable {
public function onKeyDown(e:KeyCode, modifier:KeyModifier):Void;
source/funkin/editors/ui/UIAudioPlayer.hx
+3 -3
View File
@@ -1,13 +1,13 @@
package funkin.editors.ui;
import flixel.math.FlxRect;
import flixel.util.FlxColor;
import flixel.ui.FlxBar;
import flixel.sound.FlxSound;
import flixel.ui.FlxBar;
import flixel.util.FlxColor;
import flixel.util.FlxStringUtil;
import haxe.io.Bytes;
import lime.media.AudioBuffer;
import openfl.media.Sound;
import flixel.util.FlxStringUtil;
using flixel.util.FlxSpriteUtil;
source/funkin/editors/ui/UIAutoCompleteTextBox.hx
+1 -1
View File
@@ -1,7 +1,7 @@
package funkin.editors.ui;
import lime.ui.KeyModifier;
import lime.ui.KeyCode;
import lime.ui.KeyModifier;
class UIAutoCompleteTextBox extends UITextBox {
public var suggestionText:UIText;
source/funkin/editors/ui/UIButtonList.hx
+1 -1
View File
@@ -1,9 +1,9 @@
package funkin.editors.ui;
import flixel.FlxCamera;
import flixel.math.FlxMath;
import flixel.math.FlxPoint;
import flixel.util.FlxSort;
import flixel.math.FlxMath;
class UIButtonList<T:UIButton> extends UIWindow {
public var buttons:FlxTypedGroup<T> = new FlxTypedGroup<T>();
source/funkin/editors/ui/UIColorwheel.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.editors.ui;
import flixel.math.FlxPoint;
import funkin.backend.shaders.CustomShader;
import flixel.util.FlxColor;
import funkin.backend.shaders.CustomShader;
using flixel.util.FlxSpriteUtil;
source/funkin/editors/ui/UIContextMenu.hx
+1 -2
View File
@@ -1,8 +1,7 @@
package funkin.editors.ui;
import flixel.util.FlxColor;
import flixel.util.typeLimit.OneOfTwo;
import flixel.input.keyboard.FlxKey;
import flixel.util.FlxColor;
class UIContextMenu extends MusicBeatSubstate {
public var options:Array<UIContextMenuOption>;
source/funkin/editors/ui/UISlider.hx
+2 -1
View File
@@ -1,8 +1,9 @@
package funkin.editors.ui;
import flixel.util.FlxColor;
using flixel.util.FlxSpriteUtil;
using StringTools;
using flixel.util.FlxSpriteUtil;
typedef SliderSegement = {
var start:Float;
source/funkin/editors/ui/UIState.hx
+5 -5
View File
@@ -1,14 +1,14 @@
package funkin.editors.ui;
import lime.ui.KeyModifier;
import lime.ui.KeyCode;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import funkin.backend.system.framerate.Framerate;
import funkin.editors.ui.UIContextMenu.UIContextMenuCallback;
import openfl.ui.Mouse;
import funkin.editors.ui.UIContextMenu.UIContextMenuOption;
import flixel.math.FlxPoint;
import lime.ui.KeyCode;
import lime.ui.KeyModifier;
import openfl.ui.Mouse;
import openfl.ui.MouseCursor;
import flixel.math.FlxRect;
class UIState extends MusicBeatState {
public var curContextMenu:UIContextMenu = null;
source/funkin/editors/ui/UISubstateWindow.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.editors.ui;
import openfl.filters.ShaderFilter;
import flixel.tweens.FlxTween;
import funkin.backend.shaders.CustomShader;
import openfl.filters.ShaderFilter;
// TODO: make UIWarningSubstate extend this
class UISubstateWindow extends MusicBeatSubstate {
source/funkin/editors/ui/UITextBox.hx
+1 -1
View File
@@ -1,8 +1,8 @@
package funkin.editors.ui;
import flixel.math.FlxPoint;
import lime.ui.KeyModifier;
import lime.ui.KeyCode;
import lime.ui.KeyModifier;
import openfl.desktop.Clipboard;
import openfl.geom.Rectangle;
source/funkin/editors/ui/UIWarningSubstate.hx
+2 -2
View File
@@ -1,9 +1,9 @@
package funkin.editors.ui;
import openfl.filters.ShaderFilter;
import flixel.tweens.FlxTween;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import funkin.backend.shaders.CustomShader;
import openfl.filters.ShaderFilter;
class UIWarningSubstate extends MusicBeatSubstate {
var camShaders:Array<FlxCamera> = [];
source/funkin/game/Character.hx
+10 -10
View File
@@ -1,22 +1,22 @@
package funkin.game;
import flixel.util.FlxColor;
import funkin.backend.FunkinSprite;
import flixel.graphics.frames.FlxFrame;
import flixel.math.FlxPoint;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.system.interfaces.IOffsetCompatible;
import funkin.backend.utils.XMLUtil;
import flixel.math.FlxRect;
import haxe.xml.Access;
import haxe.Exception;
import haxe.io.Path;
import funkin.backend.system.Conductor;
import openfl.geom.ColorTransform;
import flixel.util.FlxColor;
import funkin.backend.FunkinSprite;
import funkin.backend.scripting.DummyScript;
import funkin.backend.scripting.Script;
import funkin.backend.scripting.events.*;
import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext;
import funkin.backend.system.Conductor;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.system.interfaces.IOffsetCompatible;
import funkin.backend.utils.XMLUtil;
import haxe.Exception;
import haxe.io.Path;
import haxe.xml.Access;
import openfl.geom.ColorTransform;
using StringTools;

Some files were not shown because too many files have changed in this diff Show More