diff --git a/assets/images/burns.png b/assets/images/dumb/burns.png similarity index 100% rename from assets/images/burns.png rename to assets/images/dumb/burns.png diff --git a/assets/images/dumb/dumb.png b/assets/images/dumb/dumb.png new file mode 100644 index 00000000..c3ef3649 Binary files /dev/null and b/assets/images/dumb/dumb.png differ diff --git a/assets/images/lol.png b/assets/images/dumb/lol.png similarity index 100% rename from assets/images/lol.png rename to assets/images/dumb/lol.png diff --git a/assets/images/screencapTierImage.png b/assets/images/dumb/screencapTierImage.png similarity index 100% rename from assets/images/screencapTierImage.png rename to assets/images/dumb/screencapTierImage.png diff --git a/assets/images/unknown.png b/assets/images/dumb/unknown.png similarity index 100% rename from assets/images/unknown.png rename to assets/images/dumb/unknown.png diff --git a/assets/images/week54prototype.png b/assets/images/dumb/week54prototype.png similarity index 100% rename from assets/images/week54prototype.png rename to assets/images/dumb/week54prototype.png diff --git a/assets/images/zzzzzzzz.png b/assets/images/dumb/zzzzzzzz.png similarity index 100% rename from assets/images/zzzzzzzz.png rename to assets/images/dumb/zzzzzzzz.png diff --git a/source/flx3d/Flx3DCamera.hx b/source/flx3d/Flx3DCamera.hx index de56b09e..4594e91e 100644 --- a/source/flx3d/Flx3DCamera.hx +++ b/source/flx3d/Flx3DCamera.hx @@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; -import funkin.windows.WindowsAPI.ConsoleColor; +import funkin.native.NativeAPI.ConsoleColor; import flixel.FlxCamera; import away3d.containers.View3D; diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx index 9910135a..547cf45d 100644 --- a/source/flx3d/Flx3DView.hx +++ b/source/flx3d/Flx3DView.hx @@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; -import funkin.windows.WindowsAPI.ConsoleColor; +import funkin.native.NativeAPI.ConsoleColor; // FlxView3D with helpers for easier updating diff --git a/source/funkin/editors/DebugOptions.hx b/source/funkin/editors/DebugOptions.hx index dc766c81..3ce4861c 100644 --- a/source/funkin/editors/DebugOptions.hx +++ b/source/funkin/editors/DebugOptions.hx @@ -3,7 +3,7 @@ package funkin.editors; import funkin.options.type.*; import funkin.options.OptionsScreen; import funkin.options.TreeMenu; -import funkin.windows.WindowsAPI; +import funkin.utils.NativeAPI; class DebugOptions extends TreeMenu { public override function create() { @@ -33,8 +33,9 @@ class DebugOptionsScreen extends OptionsScreen { "Show Console", "Select this to show the debug console, which contains log information about the game.", function() { - WindowsAPI.allocConsole(); + NativeAPI.allocConsole(); })); + #end add(new Checkbox( "Enable Editor SFXs", "If checked, will play sound effects when working on editors (ex: will play sfxs when checking checkboxes...)", @@ -43,6 +44,5 @@ class DebugOptionsScreen extends OptionsScreen { "Resizable Editors", "If checked, editors will be resizable and extensible like other programs instead of zooming in upon maximization.", "resizableEditors")); - #end } } \ No newline at end of file diff --git a/source/funkin/system/Logs.hx b/source/funkin/system/Logs.hx index b04c824e..17b1cb36 100644 --- a/source/funkin/system/Logs.hx +++ b/source/funkin/system/Logs.hx @@ -3,8 +3,8 @@ package funkin.system; import flixel.system.debug.log.LogStyle; import flixel.system.frontEnds.LogFrontEnd; import haxe.Log; -import funkin.windows.WindowsAPI; -import funkin.windows.WindowsAPI.ConsoleColor; +import funkin.utils.NativeAPI; +import funkin.utils.NativeAPI.ConsoleColor; class Logs { private static var __showing:Bool = false; @@ -83,10 +83,10 @@ class Logs { } __showing = true; for(t in text) { - WindowsAPI.setConsoleColors(t.color); + NativeAPI.setConsoleColors(t.color); Sys.print(t.text); } - WindowsAPI.setConsoleColors(); + NativeAPI.setConsoleColors(); Sys.print("\r\n"); __showing = false; #else diff --git a/source/funkin/system/Main.hx b/source/funkin/system/Main.hx index d6432c6e..37f84647 100644 --- a/source/funkin/system/Main.hx +++ b/source/funkin/system/Main.hx @@ -5,7 +5,7 @@ import openfl.utils.AssetLibrary; import openfl.utils.AssetCache; import openfl.text.TextFormat; import flixel.system.ui.FlxSoundTray; -import funkin.windows.WindowsAPI; +import funkin.utils.NativeAPI; import funkin.menus.BetaWarningState; import funkin.menus.TitleState; import funkin.game.Highscore; @@ -59,7 +59,7 @@ class Main extends Sprite public static function main():Void { - #if windows WindowsAPI.setDarkMode(true); #end + #if windows NativeAPI.setDarkMode(true); #end Lib.current.addChild(instance = new Main()); } diff --git a/source/funkin/system/framerate/SystemInfo.hx b/source/funkin/system/framerate/SystemInfo.hx index c4f304a8..2eff8a87 100644 --- a/source/funkin/system/framerate/SystemInfo.hx +++ b/source/funkin/system/framerate/SystemInfo.hx @@ -1,6 +1,6 @@ package funkin.system.framerate; -import funkin.native.HiddenProcess; +import funkin.utils.native.HiddenProcess; import funkin.utils.MemoryUtil; using StringTools; diff --git a/source/funkin/system/modules/AudioSwitchFix.hx b/source/funkin/system/modules/AudioSwitchFix.hx index 5494f63e..4ceae947 100644 --- a/source/funkin/system/modules/AudioSwitchFix.hx +++ b/source/funkin/system/modules/AudioSwitchFix.hx @@ -3,7 +3,7 @@ package funkin.system.modules; import lime.media.AudioManager; import flixel.system.FlxSound; import flixel.FlxState; -import funkin.windows.WindowsAPI; +import funkin.utils.NativeAPI; /** * if youre stealing this keep this comment at least please lol @@ -56,7 +56,7 @@ class AudioSwitchFix { public static function init() { #if windows - WindowsAPI.registerAudio(); + NativeAPI.registerAudio(); FlxG.signals.preStateCreate.add(onStateSwitch); #end } diff --git a/source/funkin/system/modules/CrashHandler.hx b/source/funkin/system/modules/CrashHandler.hx index 7236e80f..1359f2a3 100644 --- a/source/funkin/system/modules/CrashHandler.hx +++ b/source/funkin/system/modules/CrashHandler.hx @@ -1,7 +1,7 @@ package funkin.system.modules; import lime.system.System; -import funkin.windows.WindowsAPI; +import funkin.utils.NativeAPI; import openfl.Lib; import openfl.events.UncaughtErrorEvent; import openfl.events.ErrorEvent; @@ -48,7 +48,7 @@ class CrashHandler { e.stopPropagation(); e.stopImmediatePropagation(); - WindowsAPI.showMessageBox("Codename Engine Crash Handler", 'Uncaught Error:$m\n\n$stackLabel', MSG_ERROR); + NativeAPI.showMessageBox("Codename Engine Crash Handler", 'Uncaught Error:$m\n\n$stackLabel', MSG_ERROR); #if sys Sys.exit(1); #end diff --git a/source/funkin/utils/MemoryUtil.hx b/source/funkin/utils/MemoryUtil.hx index d56d60f3..b58fca7e 100644 --- a/source/funkin/utils/MemoryUtil.hx +++ b/source/funkin/utils/MemoryUtil.hx @@ -1,6 +1,6 @@ package funkin.utils; -import funkin.native.HiddenProcess; +import funkin.utils.native.HiddenProcess; #if cpp import cpp.vm.Gc; #elseif hl @@ -66,11 +66,11 @@ class MemoryUtil { public static function getTotalMem():Float { #if windows - return funkin.native.Windows.getTotalRam(); + return funkin.utils.native.Windows.getTotalRam(); #elseif mac - return funkin.native.Mac.getTotalRam(); + return funkin.utils.native.Mac.getTotalRam(); #elseif linux - return funkin.native.Linux.getTotalRam(); + return funkin.utils.native.Linux.getTotalRam(); #else return 0; #end diff --git a/source/funkin/windows/WindowsAPI.hx b/source/funkin/utils/NativeAPI.hx similarity index 97% rename from source/funkin/windows/WindowsAPI.hx rename to source/funkin/utils/NativeAPI.hx index 204e57c9..a14dc24c 100644 --- a/source/funkin/windows/WindowsAPI.hx +++ b/source/funkin/utils/NativeAPI.hx @@ -1,14 +1,14 @@ -package funkin.windows; +package funkin.utils; -import funkin.native.*; +import funkin.utils.native.*; /** * Class for Windows-only functions, such as transparent windows, message boxes, and more. * Does not have any effect on other platforms. */ -class WindowsAPI { +class NativeAPI { @:dox(hide) public static function registerAudio() { #if windows Windows.registerAudio(); diff --git a/source/funkin/native/HiddenProcess.hx b/source/funkin/utils/native/HiddenProcess.hx similarity index 99% rename from source/funkin/native/HiddenProcess.hx rename to source/funkin/utils/native/HiddenProcess.hx index 8496ee56..e47ceb7a 100644 --- a/source/funkin/native/HiddenProcess.hx +++ b/source/funkin/utils/native/HiddenProcess.hx @@ -1,4 +1,4 @@ -package funkin.native; +package funkin.utils.native; #if cpp /* diff --git a/source/funkin/native/Linux.hx b/source/funkin/utils/native/Linux.hx similarity index 94% rename from source/funkin/native/Linux.hx rename to source/funkin/utils/native/Linux.hx index 0f79b306..a723a840 100644 --- a/source/funkin/native/Linux.hx +++ b/source/funkin/utils/native/Linux.hx @@ -1,4 +1,4 @@ -package funkin.native; +package funkin.utils.native; #if linux @:cppFileCode("#include ") diff --git a/source/funkin/native/Mac.hx b/source/funkin/utils/native/Mac.hx similarity index 92% rename from source/funkin/native/Mac.hx rename to source/funkin/utils/native/Mac.hx index e290ac05..c0a49c2d 100644 --- a/source/funkin/native/Mac.hx +++ b/source/funkin/utils/native/Mac.hx @@ -1,4 +1,4 @@ -package funkin.native; +package funkin.utils.native; #if mac @:cppFileCode("#include ") diff --git a/source/funkin/native/Windows.hx b/source/funkin/utils/native/Windows.hx similarity index 98% rename from source/funkin/native/Windows.hx rename to source/funkin/utils/native/Windows.hx index 308911cc..ce842e42 100644 --- a/source/funkin/native/Windows.hx +++ b/source/funkin/utils/native/Windows.hx @@ -1,6 +1,6 @@ -package funkin.native; +package funkin.utils.native; -import funkin.windows.WindowsAPI.MessageBoxIcon; +import funkin.utils.NativeAPI.MessageBoxIcon; #if windows @:buildXml(' diff --git a/source/lime/system/System.hx b/source/lime/system/System.hx index d2608830..46e5acf7 100644 --- a/source/lime/system/System.hx +++ b/source/lime/system/System.hx @@ -529,7 +529,7 @@ class System // executes first!! #if sys - funkin.windows.WindowsAPI.registerAsDPICompatible(); + funkin.native.NativeAPI.registerAsDPICompatible(); funkin.system.CommandLineHandler.parseCommandLine(Sys.args()); #end