diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 82a56f8acf..d10476b01e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: haxe-version: ["4.2.5", "4.3.6"] - target: [html5, hl, neko, flash, cpp] + target: [html5, hl, flash, cpp] fail-fast: false runs-on: ubuntu-latest steps: diff --git a/checkstyle.json b/checkstyle.json index a1f2045fd4..3a34a6d29a 100644 --- a/checkstyle.json +++ b/checkstyle.json @@ -12,7 +12,7 @@ ["FLX_GAMEINPUT_API"], ["flash", "web"], ["html5", "js", "web"], - ["neko", "desktop", "sys"], + ["desktop", "sys"], ["android", "cpp", "mobile"] ], "exclude": { diff --git a/flixel/FlxG.hx b/flixel/FlxG.hx index baad5bdbb7..42503cad4c 100644 --- a/flixel/FlxG.hx +++ b/flixel/FlxG.hx @@ -180,7 +180,7 @@ class FlxG public static var scaleMode(default, set):BaseScaleMode = new RatioScaleMode(); /** - * Use this to toggle between fullscreen and normal mode. Works on CPP, Neko and Flash. + * Use this to toggle between fullscreen and normal mode. Works on CPP and Flash. * You can easily toggle fullscreen with e.g.: `FlxG.fullscreen = !FlxG.fullscreen;` */ public static var fullscreen(get, set):Bool; @@ -344,7 +344,7 @@ class FlxG } /** - * Resizes the window. Only works on desktop targets (Neko, Windows, Linux, Mac). + * Resizes the window. Only works on desktop targets (Windows, Linux, Mac). */ public static function resizeWindow(width:Int, height:Int):Void { diff --git a/flixel/graphics/tile/FlxDrawTrianglesItem.hx b/flixel/graphics/tile/FlxDrawTrianglesItem.hx index b2f71ce51e..92fcc1b5e4 100644 --- a/flixel/graphics/tile/FlxDrawTrianglesItem.hx +++ b/flixel/graphics/tile/FlxDrawTrianglesItem.hx @@ -356,10 +356,7 @@ class FlxDrawTrianglesItem extends FlxDrawBaseItem red = transform.redMultiplier; green = transform.greenMultiplier; blue = transform.blueMultiplier; - - #if !neko alpha = transform.alphaMultiplier; - #end } var color = FlxColor.fromRGBFloat(red, green, blue, alpha); diff --git a/flixel/system/debug/interaction/Interaction.hx b/flixel/system/debug/interaction/Interaction.hx index feeea77f94..38a17118c3 100644 --- a/flixel/system/debug/interaction/Interaction.hx +++ b/flixel/system/debug/interaction/Interaction.hx @@ -121,7 +121,7 @@ class Interaction extends Window function updateMouse(event:MouseEvent):Void { - #if (neko || js) // openfl/openfl#1305 + #if js // openfl/openfl#1305 if (event.stageX == null || event.stageY == null) return; #end diff --git a/flixel/system/macros/FlxDefines.hx b/flixel/system/macros/FlxDefines.hx index 28baf35093..0ad94dd68c 100644 --- a/flixel/system/macros/FlxDefines.hx +++ b/flixel/system/macros/FlxDefines.hx @@ -251,7 +251,7 @@ class FlxDefines if (!defined("flash") || defined("flash11_8")) define(FLX_GAMEINPUT_API); - else if (!defined("openfl_next") && (defined("cpp") || defined("neko"))) + else if (!defined("openfl_next") && (defined("cpp"))) define(FLX_JOYSTICK_API); #if nme diff --git a/flixel/ui/FlxBar.hx b/flixel/ui/FlxBar.hx index dcc0ac13d1..09a49551a0 100644 --- a/flixel/ui/FlxBar.hx +++ b/flixel/ui/FlxBar.hx @@ -963,13 +963,6 @@ class FlxBar extends FlxSprite function get_value():Float { - #if neko - if (value == null) - { - value = min; - } - #end - return value; } diff --git a/flixel/util/FlxColor.hx b/flixel/util/FlxColor.hx index 8d36039370..af2a4fe29b 100644 --- a/flixel/util/FlxColor.hx +++ b/flixel/util/FlxColor.hx @@ -379,8 +379,7 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt */ public inline function toHexString(Alpha:Bool = true, Prefix:Bool = true):String { - return (Prefix ? "0x" : "") + (Alpha ? StringTools.hex(alpha, - 2) : "") + StringTools.hex(red, 2) + StringTools.hex(green, 2) + StringTools.hex(blue, 2); + return (Prefix ? "0x" : "") + (Alpha ? StringTools.hex(alpha, 2) : "") + StringTools.hex(red, 2) + StringTools.hex(green, 2) + StringTools.hex(blue, 2); } /** @@ -575,18 +574,7 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt inline function getThis():Int { - #if neko - return Std.int(this); - #else return this; - #end - } - - inline function validate():Void - { - #if neko - this = Std.int(this); - #end } inline function get_red():Int @@ -631,7 +619,6 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt inline function set_red(Value:Int):Int { - validate(); this &= 0xff00ffff; this |= boundChannel(Value) << 16; return Value; @@ -639,7 +626,6 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt inline function set_green(Value:Int):Int { - validate(); this &= 0xffff00ff; this |= boundChannel(Value) << 8; return Value; @@ -647,7 +633,6 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt inline function set_blue(Value:Int):Int { - validate(); this &= 0xffffff00; this |= boundChannel(Value); return Value; @@ -655,7 +640,6 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt inline function set_alpha(Value:Int):Int { - validate(); this &= 0x00ffffff; this |= boundChannel(Value) << 24; return Value; @@ -787,7 +771,6 @@ abstract FlxColor(Int) from Int from UInt to Int to UInt inline function set_rgb(value:FlxColor):FlxColor { - validate(); this = (this & 0xff000000) | (value & 0x00ffffff); return value; } diff --git a/flixel/util/FlxSignal.hx b/flixel/util/FlxSignal.hx index 22de953eed..7ee7f53e52 100644 --- a/flixel/util/FlxSignal.hx +++ b/flixel/util/FlxSignal.hx @@ -193,7 +193,7 @@ private class FlxBaseSignal implements IFlxSignal { for (handler in handlers) { - if (#if (neko || hl) // simply comparing the functions doesn't do the trick on these targets + if (#if hl // simply comparing the functions doesn't do the trick on this target Reflect.compareMethods(handler.listener, listener) #else handler.listener == listener #end) { return handler; // Listener was already registered. diff --git a/haxelib.json b/haxelib.json index 081932d9eb..ac54bd978c 100644 --- a/haxelib.json +++ b/haxelib.json @@ -2,7 +2,7 @@ "name": "flixel", "url" : "https://github.com/HaxeFlixel/flixel", "license": "MIT", - "tags": ["game", "openfl", "flash", "html5", "neko", "cpp", "android", "ios", "cross"], + "tags": ["game", "openfl", "flash", "html5", "cpp", "android", "ios", "cross"], "description": "HaxeFlixel is a 2D game engine based on OpenFL that delivers cross-platform games.", "version": "6.1.0", "releasenote": "Various improvements to debug tools", diff --git a/tests/coverage/test.bat b/tests/coverage/test.bat index 1ad805c04c..b4401d1945 100644 --- a/tests/coverage/test.bat +++ b/tests/coverage/test.bat @@ -4,8 +4,4 @@ haxelib run lime build flash -Dcoverage3 haxelib run lime build html5 -Dcoverage1 haxelib run lime build html5 -Dcoverage2 -haxelib run lime build html5 -Dcoverage3 - -haxelib run lime build neko -Dcoverage1 -haxelib run lime build neko -Dcoverage2 -haxelib run lime build neko -Dcoverage3 \ No newline at end of file +haxelib run lime build html5 -Dcoverage3 \ No newline at end of file diff --git a/tests/unit/.vscode/tasks.json b/tests/unit/.vscode/tasks.json index cb5ba85627..01d2194118 100644 --- a/tests/unit/.vscode/tasks.json +++ b/tests/unit/.vscode/tasks.json @@ -3,7 +3,7 @@ "tasks": [ { "type": "hxml", - "file": "test-neko.hxml", + "file": "test-cpp.hxml", "group": { "kind": "build", "isDefault": true diff --git a/tests/unit/README.md b/tests/unit/README.md index 33b770a22b..cae8ac3472 100644 --- a/tests/unit/README.md +++ b/tests/unit/README.md @@ -8,11 +8,10 @@ There's a 1:1 mapping between `.hx` files in Flixel and the unit test project - ### Building -Run one of the `test-*.hxml` files in this directory to run the tests on that specific target, e.g. `haxe test-neko.hxml`. Currently supported are: +Run one of the `test-*.hxml` files in this directory to run the tests on that specific target, e.g. `haxe test-cpp.hxml`. Currently supported are: - `web` (Flash + HTML5) - `cpp` -- `neko` Alternatively, this can be done from within Visual Studio Code - (`F1` -> `Tasks: Run Task` -> Choose the target to test). diff --git a/tests/unit/test-neko.hxml b/tests/unit/test-neko.hxml deleted file mode 100644 index 32ded7d7b7..0000000000 --- a/tests/unit/test-neko.hxml +++ /dev/null @@ -1,2 +0,0 @@ --cmd haxelib run munit gen --cmd haxelib run lime test neko \ No newline at end of file