diff --git a/Project.xml b/Project.xml
index 5520036..54240fe 100644
--- a/Project.xml
+++ b/Project.xml
@@ -37,8 +37,8 @@
-
-
+
+
diff --git a/assets/gfx/INFO.txt b/assets/gfx/INFO.txt
deleted file mode 100644
index ac3dd64..0000000
--- a/assets/gfx/INFO.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a special directory that the FlixelUI stuff looks in specificaly.
-Any files here are likely used in one of the assets/xml/*.xml files
\ No newline at end of file
diff --git a/assets/gfx/title_image.png b/assets/images/title_image.png
similarity index 100%
rename from assets/gfx/title_image.png
rename to assets/images/title_image.png
diff --git a/assets/xml/main_menu.xml b/assets/xml/main_menu.xml
index dc46982..7dd3162 100644
--- a/assets/xml/main_menu.xml
+++ b/assets/xml/main_menu.xml
@@ -1,27 +1,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/assets/xml/return_to_main.xml b/assets/xml/return_to_main.xml
new file mode 100644
index 0000000..06956dd
--- /dev/null
+++ b/assets/xml/return_to_main.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/haxelib.deps b/haxelib.deps
index 45a09c2..d07d5b8 100644
--- a/haxelib.deps
+++ b/haxelib.deps
@@ -4,6 +4,10 @@ flixel-addons 2.10.0
flixel-ui 2.3.3
openfl 9.1.0
+# UI deps
+haxeui-core 1.2.3
+haxeui-flixel 1.2.3
+
# bitDecayGames deps
bitdecaybtree git https://github.com/bitDecayGames/BehaviorTree.git
bitlytics git https://github.com/bitDecayGames/Bitlytics.git
diff --git a/source/entities/Player.hx b/source/entities/Player.hx
index 5d354e1..22345e2 100644
--- a/source/entities/Player.hx
+++ b/source/entities/Player.hx
@@ -5,6 +5,8 @@ import input.InputCalcuator;
import flixel.util.FlxColor;
import flixel.FlxSprite;
+using extensions.FlxObjectExt;
+
class Player extends FlxSprite {
var speed:Float = 30;
var playerNum = 0;
diff --git a/source/extensions/FlxObjectExt.hx b/source/extensions/FlxObjectExt.hx
index dc30473..cbd7112 100644
--- a/source/extensions/FlxObjectExt.hx
+++ b/source/extensions/FlxObjectExt.hx
@@ -1,5 +1,6 @@
package extensions;
+import flixel.math.FlxPoint;
import flixel.FlxObject;
/**
@@ -15,4 +16,13 @@ class FlxObjectExt {
static public function setPositionMidpoint(o:FlxObject, x:Float, y:Float) {
o.setPosition(x - o.width / 2, y - o.height / 2);
}
+
+ /**
+ * Sets the FlxObject position from the given point
+ *
+ * @param p The point for the new position
+ */
+ static public function setPositionPoint(o:FlxObject, p:FlxPoint) {
+ o.setPosition(p.x, p.y);
+ }
}
diff --git a/source/input/SimpleController.hx b/source/input/SimpleController.hx
index 8ad3795..3e0ae02 100644
--- a/source/input/SimpleController.hx
+++ b/source/input/SimpleController.hx
@@ -11,7 +11,6 @@ import flixel.input.gamepad.FlxGamepadInputID;
* Lovingly adapted from https://github.com/01010111/flixel-template
*/
class SimpleController {
-
static var key_bindings:Array>> = [
// PLAYER ONE
[
@@ -56,7 +55,8 @@ class SimpleController {
static function pressed_pad(button:Button, player:Int):Bool {
var gamepads = FlxG.gamepads.getActiveGamepads();
- if (gamepads.length < player || gamepads[player] == null) return false;
+ if (gamepads.length < player || gamepads[player] == null)
+ return false;
return gamepads[player].anyPressed(pad_bindings[button]);
}
@@ -70,7 +70,8 @@ class SimpleController {
static function just_pressed_pad(button:Button, player:Int):Bool {
var gamepads = FlxG.gamepads.getActiveGamepads();
- if (gamepads.length < player || gamepads[player] == null) return false;
+ if (gamepads.length < player || gamepads[player] == null)
+ return false;
return gamepads[player].anyJustPressed(pad_bindings[button]);
}
@@ -84,7 +85,8 @@ class SimpleController {
static function just_released_pad(button:Button, player:Int):Bool {
var gamepads = FlxG.gamepads.getActiveGamepads();
- if (gamepads.length < player || gamepads[player] == null) return false;
+ if (gamepads.length < player || gamepads[player] == null)
+ return false;
return gamepads[player].anyJustReleased(pad_bindings[button]);
}
}
diff --git a/source/states/CreditsState.hx b/source/states/CreditsState.hx
index 3539b24..4d55305 100644
--- a/source/states/CreditsState.hx
+++ b/source/states/CreditsState.hx
@@ -1,10 +1,12 @@
package states;
+import ui.ReturnToMain;
+import haxe.ui.focus.FocusManager;
+import flixel.FlxState;
import config.Configure;
import flixel.FlxG;
import flixel.FlxObject;
import flixel.FlxSprite;
-import flixel.addons.ui.FlxUIState;
import flixel.text.FlxText;
import flixel.ui.FlxButton;
import flixel.util.FlxColor;
@@ -14,10 +16,10 @@ import misc.FlxTextFactory;
using extensions.FlxStateExt;
-class CreditsState extends FlxUIState {
+class CreditsState extends FlxState {
var _allCreditElements:Array;
- var _btnMainMenu:FlxButton;
+ var menu:ReturnToMain;
var _txtCreditsTitle:FlxText;
var _txtThankYou:FlxText;
@@ -43,12 +45,10 @@ class CreditsState extends FlxUIState {
bgColor = backgroundColor;
camera.pixelPerfectRender = true;
- // Button
+ menu = new ReturnToMain(clickMainMenu);
+ add(menu);
- _btnMainMenu = UiHelpers.createMenuButton("Main Menu", clickMainMenu);
- _btnMainMenu.setPosition(FlxG.width - _btnMainMenu.width, FlxG.height - _btnMainMenu.height);
- _btnMainMenu.updateHitbox();
- add(_btnMainMenu);
+ FocusManager.instance.focus = menu.mainMenuButton;
// Credits
diff --git a/source/states/FailState.hx b/source/states/FailState.hx
index f3306cb..33b37ad 100644
--- a/source/states/FailState.hx
+++ b/source/states/FailState.hx
@@ -1,18 +1,19 @@
package states;
import flixel.FlxG;
-import flixel.addons.ui.FlxUIState;
+import flixel.FlxState;
import flixel.text.FlxText;
-import flixel.ui.FlxButton;
import flixel.util.FlxColor;
+import haxe.ui.focus.FocusManager;
import haxefmod.flixel.FmodFlxUtilities;
import helpers.UiHelpers;
import misc.FlxTextFactory;
+import ui.ReturnToMain;
using extensions.FlxStateExt;
-class VictoryState extends FlxUIState {
- var _btnDone:FlxButton;
+class FailState extends FlxState {
+ var menu:ReturnToMain;
var _txtTitle:FlxText;
@@ -24,10 +25,10 @@ class VictoryState extends FlxUIState {
add(_txtTitle);
- _btnDone = UiHelpers.CreateMenuButton("Main Menu", clickMainMenu);
- _btnDone.setPosition(FlxG.width / 2 - _btnDone.width / 2, FlxG.height - _btnDone.height - 40);
- _btnDone.updateHitbox();
- add(_btnDone);
+ menu = new ReturnToMain(clickMainMenu);
+ add(menu);
+
+ FocusManager.instance.focus = menu.mainMenuButton;
}
override public function update(elapsed:Float):Void {
diff --git a/source/states/MainMenuState.hx b/source/states/MainMenuState.hx
index 46f50d4..4d09c30 100644
--- a/source/states/MainMenuState.hx
+++ b/source/states/MainMenuState.hx
@@ -1,98 +1,94 @@
package states;
+import spacial.Cardinal;
+import config.Configure;
+import input.SimpleController;
+import ui.MenuCursor;
+import haxe.ui.core.Component;
+import haxe.ui.focus.FocusManager;
+import flixel.FlxSprite;
+import ui.MainMenu;
+import flixel.FlxState;
+import haxe.ui.Toolkit;
import states.transitions.Trans;
import states.transitions.SwirlTransition;
import com.bitdecay.analytics.Bitlytics;
-import config.Configure;
import flixel.FlxG;
-import flixel.addons.ui.FlxUICursor;
-import flixel.addons.ui.FlxUIState;
-import flixel.addons.ui.FlxUITypedButton;
-import flixel.text.FlxText;
-import flixel.ui.FlxButton;
import flixel.util.FlxColor;
import haxefmod.flixel.FmodFlxUtilities;
using extensions.FlxStateExt;
+using extensions.FlxObjectExt;
+using ui.ComponentExt;
#if windows
import lime.system.System;
#end
-class MainMenuState extends FlxUIState {
- var _btnPlay:FlxButton;
- var _btnCredits:FlxButton;
- var _btnExit:FlxButton;
-
- var _txtTitle:FlxText;
+class MainMenuState extends FlxState {
+ var cursor:MenuCursor;
+ var menu:MainMenu;
+ var menuFocus:Component;
override public function create():Void {
- _xml_id = "main_menu";
- if (Configure.config.menus.keyboardNavigation || Configure.config.menus.controllerNavigation) {
- _makeCursor = true;
- }
-
super.create();
- if (_makeCursor) {
- cursor.loadGraphic(AssetPaths.pointer__png, true, 32, 32);
- cursor.animation.add("pointing", [0, 1], 3);
- cursor.animation.play("pointing");
+ var bgImage = new FlxSprite(AssetPaths.title_image__png);
+ add(bgImage);
- var keys:Int = 0;
- if (Configure.config.menus.keyboardNavigation) {
- keys |= FlxUICursor.KEYS_ARROWS | FlxUICursor.KEYS_WASD;
- }
- if (Configure.config.menus.controllerNavigation) {
- keys |= FlxUICursor.GAMEPAD_DPAD;
- }
- cursor.setDefaultKeys(keys);
+ cursor = new MenuCursor();
+
+ if (Configure.config.menus.controllerNavigation || Configure.config.menus.keyboardNavigation) {
+ add(cursor);
+ } else {
+ cursor.visible = false;
}
+ Toolkit.init({container: this});
+ menu = new MainMenu(clickPlay, clickCredits);
+ add(menu);
+
+ FocusManager.instance.pushView(menu.menuItems);
+ menuFocus = FocusManager.instance.focusNext();
+
FmodManager.PlaySong(FmodSongs.LetsGo);
bgColor = FlxColor.TRANSPARENT;
FlxG.camera.pixelPerfectRender = true;
#if !windows
- // Hide exit button for non-windows targets
- var test = _ui.getAsset("exit_button");
- test.visible = false;
+ menu.quitButton.visible = false;
+ #else
+ menu.quitButton.onClick = _ -> {
+ System.exit(0);
+ };
#end
// Trigger our focus logic as we are just creating the scene
this.handleFocus();
-
- // we will handle transitions manually
- transOut = null;
}
- override public function getEvent(name:String, sender:Dynamic, data:Dynamic, ?params:Array):Void {
- if (name == FlxUITypedButton.CLICK_EVENT) {
- var button_action:String = params[0];
- trace('Action: "${button_action}"');
-
- if (button_action == "play") {
- clickPlay();
- }
+ override public function update(elapsed:Float):Void {
+ super.update(elapsed);
+ FmodManager.Update();
- if (button_action == "credits") {
- clickCredits();
+ if (SimpleController.just_pressed(Button.UP)) {
+ menuFocus = FocusManager.instance.focusPrev();
+ while (!menuFocus.visible) {
+ menuFocus = FocusManager.instance.focusPrev();
}
+ }
- #if windows
- if (button_action == "exit") {
- clickExit();
+ if (SimpleController.just_pressed(Button.DOWN)) {
+ menuFocus = FocusManager.instance.focusNext();
+ while (!menuFocus.visible) {
+ menuFocus = FocusManager.instance.focusNext();
}
- #end
}
- }
- override public function update(elapsed:Float):Void {
- super.update(elapsed);
- FmodManager.Update();
+ cursor.alignWith(menuFocus, Cardinal.E);
if (FlxG.keys.pressed.D && FlxG.keys.justPressed.M) {
- // Keys D.M. for Disable Metrics
+ // Keys D+M for Disable Metrics
Bitlytics.Instance().EndSession(false);
FmodManager.PlaySoundOneShot(FmodSFX.MenuSelect);
trace("---------- Bitlytics Stopped ----------");
@@ -101,6 +97,7 @@ class MainMenuState extends FlxUIState {
function clickPlay():Void {
FmodManager.StopSong();
+ FmodManager.PlaySoundOneShot(FmodSFX.MenuSelect);
var swirlOut = new SwirlTransition(Trans.OUT, () -> {
// make sure our music is stopped;
FmodManager.StopSongImmediately();
@@ -110,15 +107,10 @@ class MainMenuState extends FlxUIState {
}
function clickCredits():Void {
+ FmodManager.PlaySoundOneShot(FmodSFX.MenuSelect);
FmodFlxUtilities.TransitionToState(new CreditsState());
}
- #if windows
- function clickExit():Void {
- System.exit(0);
- }
- #end
-
override public function onFocusLost() {
super.onFocusLost();
this.handleFocusLost();
@@ -128,4 +120,9 @@ class MainMenuState extends FlxUIState {
super.onFocus();
this.handleFocus();
}
+
+ override function switchTo(nextState:FlxState):Bool {
+ FocusManager.instance.removeView(menu.menuItems);
+ return super.switchTo(nextState);
+ }
}
diff --git a/source/states/VictoryState.hx b/source/states/VictoryState.hx
index b387a6c..9ecc2de 100644
--- a/source/states/VictoryState.hx
+++ b/source/states/VictoryState.hx
@@ -1,17 +1,17 @@
package states;
import flixel.FlxG;
-import flixel.addons.ui.FlxUIState;
+import flixel.FlxState;
import flixel.text.FlxText;
-import flixel.ui.FlxButton;
import flixel.util.FlxColor;
+import haxe.ui.focus.FocusManager;
import haxefmod.flixel.FmodFlxUtilities;
-import helpers.UiHelpers;
+import ui.ReturnToMain;
using extensions.FlxStateExt;
-class VictoryState extends FlxUIState {
- var _btnDone:FlxButton;
+class VictoryState extends FlxState {
+ var menu:ReturnToMain;
var _txtTitle:FlxText;
@@ -27,10 +27,10 @@ class VictoryState extends FlxUIState {
add(_txtTitle);
- _btnDone = UiHelpers.createMenuButton("Main Menu", clickMainMenu);
- _btnDone.setPosition(FlxG.width / 2 - _btnDone.width / 2, FlxG.height - _btnDone.height - 40);
- _btnDone.updateHitbox();
- add(_btnDone);
+ menu = new ReturnToMain(clickMainMenu);
+ add(menu);
+
+ FocusManager.instance.focus = menu.mainMenuButton;
}
override public function update(elapsed:Float):Void {
diff --git a/source/states/transitions/SwirlTransition.hx b/source/states/transitions/SwirlTransition.hx
index e7332c4..6273504 100644
--- a/source/states/transitions/SwirlTransition.hx
+++ b/source/states/transitions/SwirlTransition.hx
@@ -6,10 +6,6 @@ import flixel.FlxSubState;
import flixel.math.FlxPoint;
import flixel.util.FlxSpriteUtil;
import flixel.util.FlxTimer;
-import openfl.display.BitmapData;
-import openfl.display.BitmapDataChannel;
-import openfl.geom.Point;
-import openfl.geom.Rectangle;
using Math;
using extensions.FlxPointExt;
@@ -71,9 +67,9 @@ class SwirlTransition extends FlxSubState {
var sinInput = 0.0;
var xOffset = 0;
var height = 0;
- for (i in 0...2*r) {
+ for (i in 0...2 * r) {
sinInput = i / r * Math.PI;
- height = Std.int(Math.sqrt(Math.pow(r, 2) - Math.pow(i-r, 2)));
+ height = Std.int(Math.sqrt(Math.pow(r, 2) - Math.pow(i - r, 2)));
xOffset = i - r;
for (j in -height...height) {
s.pixels.setPixel32(Std.int(p.x) + xOffset, Std.int(p.y) + j, drawColor);
diff --git a/source/ui/ComponentExt.hx b/source/ui/ComponentExt.hx
new file mode 100644
index 0000000..cab6b14
--- /dev/null
+++ b/source/ui/ComponentExt.hx
@@ -0,0 +1,17 @@
+package ui;
+
+import flixel.math.FlxPoint;
+import haxe.ui.core.Component;
+
+class ComponentExt {
+ public static function recursivePosition(c:Component):FlxPoint {
+ var absPos = FlxPoint.get();
+ var traceUp = c;
+ while (traceUp != null) {
+ absPos.x += traceUp.left;
+ absPos.y += traceUp.top;
+ traceUp = traceUp.parentComponent;
+ }
+ return absPos;
+ }
+}
diff --git a/source/ui/MainMenu.hx b/source/ui/MainMenu.hx
new file mode 100644
index 0000000..3c97653
--- /dev/null
+++ b/source/ui/MainMenu.hx
@@ -0,0 +1,17 @@
+package ui;
+
+import haxe.ui.containers.VBox;
+
+@:build(haxe.ui.macros.ComponentMacros.build("assets/xml/main_menu.xml"))
+class MainMenu extends VBox {
+ public function new(playClicked:Void->Void, creditsClicked:Void->Void) {
+ super();
+
+ playButton.onClick = _ -> {
+ playClicked();
+ }
+ creditsButton.onClick = _ -> {
+ creditsClicked();
+ }
+ }
+}
diff --git a/source/ui/MenuCursor.hx b/source/ui/MenuCursor.hx
new file mode 100644
index 0000000..a606b89
--- /dev/null
+++ b/source/ui/MenuCursor.hx
@@ -0,0 +1,40 @@
+package ui;
+
+import spacial.Cardinal;
+import haxe.ui.core.Component;
+import flixel.FlxSprite;
+
+using extensions.FlxObjectExt;
+using ui.ComponentExt;
+
+class MenuCursor extends FlxSprite {
+ public function new() {
+ super();
+ // TODO: Allow passing in of the sprite image
+ loadGraphic(AssetPaths.pointer__png, true, 32, 32);
+ animation.add("play", [0, 1], 3);
+ animation.play("play");
+ }
+
+ public function alignWith(c:Component, alignment:Cardinal) {
+ var cPos = c.recursivePosition();
+ switch (alignment) {
+ case NE | E | SE:
+ cPos.x -= width;
+ case NW | W | SW:
+ cPos.x += c.width;
+ default:
+ cPos.x += Math.abs(c.width / 2 - width / 2);
+ }
+ switch (alignment) {
+ case NE | N | NW:
+ cPos.y -= height;
+ case SE | S | SW:
+ cPos.y += c.height;
+ default:
+ cPos.y -= Math.abs(c.height / 2 - height / 2);
+ }
+ this.setPositionPoint(cPos);
+ cPos.put();
+ }
+}
diff --git a/source/ui/ReturnToMain.hx b/source/ui/ReturnToMain.hx
new file mode 100644
index 0000000..f68d63e
--- /dev/null
+++ b/source/ui/ReturnToMain.hx
@@ -0,0 +1,14 @@
+package ui;
+
+import haxe.ui.containers.VBox;
+
+@:build(haxe.ui.macros.ComponentMacros.build("assets/xml/return_to_main.xml"))
+class ReturnToMain extends VBox {
+ public function new(clicked:Void->Void) {
+ super();
+
+ mainMenuButton.onClick = _ -> {
+ clicked();
+ }
+ }
+}