Skip to content

Remove Neko Target #3437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion checkstyle.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
["FLX_GAMEINPUT_API"],
["flash", "web"],
["html5", "js", "web"],
["neko", "desktop", "sys"],
["desktop", "sys"],
["android", "cpp", "mobile"]
],
"exclude": {
Expand Down
4 changes: 2 additions & 2 deletions flixel/FlxG.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
{
Expand Down
3 changes: 0 additions & 3 deletions flixel/graphics/tile/FlxDrawTrianglesItem.hx
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,7 @@ class FlxDrawTrianglesItem extends FlxDrawBaseItem<FlxDrawTrianglesItem>
red = transform.redMultiplier;
green = transform.greenMultiplier;
blue = transform.blueMultiplier;

#if !neko
alpha = transform.alphaMultiplier;
#end
}

var color = FlxColor.fromRGBFloat(red, green, blue, alpha);
Expand Down
2 changes: 1 addition & 1 deletion flixel/system/debug/interaction/Interaction.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flixel/system/macros/FlxDefines.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions flixel/ui/FlxBar.hx
Original file line number Diff line number Diff line change
Expand Up @@ -963,13 +963,6 @@ class FlxBar extends FlxSprite

function get_value():Float
{
#if neko
if (value == null)
{
value = min;
}
#end

return value;
}

Expand Down
19 changes: 1 addition & 18 deletions flixel/util/FlxColor.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -631,31 +619,27 @@ 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;
}

inline function set_green(Value:Int):Int
{
validate();
this &= 0xffff00ff;
this |= boundChannel(Value) << 8;
return Value;
}

inline function set_blue(Value:Int):Int
{
validate();
this &= 0xffffff00;
this |= boundChannel(Value);
return Value;
}

inline function set_alpha(Value:Int):Int
{
validate();
this &= 0x00ffffff;
this |= boundChannel(Value) << 24;
return Value;
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion flixel/util/FlxSignal.hx
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ private class FlxBaseSignal<T> implements IFlxSignal<T>
{
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.
Expand Down
2 changes: 1 addition & 1 deletion haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 1 addition & 5 deletions tests/coverage/test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
haxelib run lime build html5 -Dcoverage3
2 changes: 1 addition & 1 deletion tests/unit/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"tasks": [
{
"type": "hxml",
"file": "test-neko.hxml",
"file": "test-cpp.hxml",
"group": {
"kind": "build",
"isDefault": true
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
2 changes: 0 additions & 2 deletions tests/unit/test-neko.hxml

This file was deleted.