Moved externals + small fix
This commit is contained in:
@@ -33,7 +33,7 @@ function create() {
|
||||
WindowUtils.onClosing = function() {
|
||||
if(!FlxG.keys.pressed.ALT) {
|
||||
Lib.application.window.onClose.cancel();
|
||||
FlxG.switchState(new StageEditor("test"));
|
||||
FlxG.switchState(new StageEditor(StageEditor.__stage));
|
||||
trace("you dont need to close doofus goofus");
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@ function create() {
|
||||
function update() {
|
||||
if(FlxG.keys.justPressed.R) {
|
||||
trace("reloading");
|
||||
FlxG.switchState(new StageEditor("test"));
|
||||
FlxG.switchState(new StageEditor(StageEditor.__stage));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+11
-4
@@ -49,7 +49,8 @@ class Main {
|
||||
"If you want a full build which contains all assets, run \"cne release\" or \"cne test-release\"",
|
||||
"Additional arguments will be sent to the lime compiler.",
|
||||
"",
|
||||
"-debug : Builds a debug build."
|
||||
"-debug : Builds a debug build.",
|
||||
"-clean : Compiled files will be deleted before compiling."
|
||||
].join("\n")
|
||||
},
|
||||
{
|
||||
@@ -67,7 +68,8 @@ class Main {
|
||||
"If you want a full build which contains all assets, run \"cne release\" or \"cne test-release\"",
|
||||
"Additional arguments will be sent to the lime compiler.",
|
||||
"",
|
||||
"-debug : Builds a debug build."
|
||||
"-debug : Builds a debug build.",
|
||||
"-clean : Compiled files will be deleted before compiling."
|
||||
].join("\n")
|
||||
},
|
||||
{
|
||||
@@ -78,6 +80,7 @@ class Main {
|
||||
"Usage: run <optional arguments>",
|
||||
"",
|
||||
"This will run the last build that was created.",
|
||||
"If the last build was a debug build, you need to pass the -debug argument to run it.",
|
||||
"Additional arguments will be sent to the lime compiler."
|
||||
].join("\n")
|
||||
},
|
||||
@@ -90,7 +93,9 @@ class Main {
|
||||
"",
|
||||
"This will create and run a final ready-for-release build,",
|
||||
"which means this build will be able to be release on websites such as GameBanana without worrying about source-dependant stuff.",
|
||||
"Additional arguments will be sent to the lime compiler."
|
||||
"Additional arguments will be sent to the lime compiler.",
|
||||
"",
|
||||
"-clean : Compiled files will be deleted before compiling."
|
||||
].join("\n")
|
||||
},
|
||||
{
|
||||
@@ -102,7 +107,9 @@ class Main {
|
||||
"",
|
||||
"This will create and run a final ready-for-release build,",
|
||||
"which means this build will be able to be release on websites such as GameBanana without worrying about source-dependant stuff.",
|
||||
"Additional arguments will be sent to the lime compiler."
|
||||
"Additional arguments will be sent to the lime compiler.",
|
||||
"",
|
||||
"-clean : Compiled files will be deleted before compiling."
|
||||
].join("\n")
|
||||
},
|
||||
{
|
||||
|
||||
Vendored
+11
@@ -0,0 +1,11 @@
|
||||
package external;
|
||||
|
||||
#if mac
|
||||
@:build(external.LinkerMacro.xml('external_code.xml'))
|
||||
@:native("ExternalMac")
|
||||
@:include('Mac.h')
|
||||
extern class ExternalMac {
|
||||
@:native("ExternalMac::setCursorIcon")
|
||||
public static function setCursorIcon(icon:Int):Bool;
|
||||
}
|
||||
#end
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package funkin.backend.system.macros;
|
||||
package external;
|
||||
|
||||
import haxe.io.Path;
|
||||
import haxe.macro.Expr;
|
||||
Vendored
Vendored
Vendored
@@ -4,7 +4,6 @@ package funkin.backend.utils.native;
|
||||
import funkin.backend.utils.NativeAPI.CodeCursor;
|
||||
import openfl.ui.Mouse;
|
||||
|
||||
@:build(funkin.backend.system.macros.LinkerMacro.xml('external/external_code.xml'))
|
||||
@:headerInclude('sys/sysctl.h')
|
||||
class Mac {
|
||||
@:functionCode('
|
||||
@@ -24,20 +23,12 @@ class Mac {
|
||||
|
||||
public static function setMouseCursorIcon(icon:CodeCursor):Void
|
||||
{
|
||||
final valid:Bool = ExternalMac.setCursorIcon(icon.toInt());
|
||||
final valid:Bool = external.ExternalMac.setCursorIcon(icon.toInt());
|
||||
if(!valid) {
|
||||
Mouse.cursor = icon.toOpenFL();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@:build(funkin.backend.system.macros.LinkerMacro.xml('external/external_code.xml'))
|
||||
@:native("ExternalMac")
|
||||
@:include('Mac.h')
|
||||
extern class ExternalMac {
|
||||
@:native("ExternalMac::setCursorIcon")
|
||||
public static function setCursorIcon(icon:Int):Bool;
|
||||
}
|
||||
#end
|
||||
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@ class StageElementButton extends UIButton {
|
||||
|
||||
public function getInfoText():String {
|
||||
var pos = getPos();
|
||||
var text = '${getName()} (${CoolUtil.quantize(pos.x, 100)}x${CoolUtil.quantize(pos.y, 100)})';
|
||||
var text = '${getName()} (${CoolUtil.quantize(pos.x, 100)}, ${CoolUtil.quantize(pos.y, 100)})';
|
||||
pos.put();
|
||||
return text;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user