thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-27 21:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accelerator key fixes and fix camera on unpause

Browse source
This commit is contained in:
RandomityGuy 2022-12-17 14:39:47 +05:30
parent 57175a413c
commit edf93f8edd
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/CameraController.hx
View file

@ -68,6 +68,8 @@ class CameraController extends Object {
public var oob:Bool = false; public var oob:Bool = false;
public var finish:Bool = false; public var finish:Bool = false;
var _ignoreCursor:Bool = false;
public function new(marble:Marble) { public function new(marble:Marble) {
super(); super();
this.marble = marble; this.marble = marble;
@ -88,6 +90,7 @@ class CameraController extends Object {
var pointercontainer = js.Browser.document.querySelector("#pointercontainer"); var pointercontainer = js.Browser.document.querySelector("#pointercontainer");
pointercontainer.hidden = true; pointercontainer.hidden = true;
#end #end
_ignoreCursor = true;
Window.getInstance().lockPointer((x, y) -> orbit(x, y)); Window.getInstance().lockPointer((x, y) -> orbit(x, y));
#if hl #if hl
Cursor.show(false); Cursor.show(false);
@ -108,6 +111,10 @@ class CameraController extends Object {
} }
public function orbit(mouseX:Float, mouseY:Float, isTouch:Bool = false) { public function orbit(mouseX:Float, mouseY:Float, isTouch:Bool = false) {
if (_ignoreCursor) {
_ignoreCursor = false;
return;
}
var scaleFactor = 1.0; var scaleFactor = 1.0;
#if js #if js
scaleFactor = 1 / js.Browser.window.devicePixelRatio; scaleFactor = 1 / js.Browser.window.devicePixelRatio;

1
src/gui/EnterNameDlg.hx
View file

@ -61,6 +61,7 @@ class EnterNameDlg extends GuiControl {
var okbutton = new GuiButton(loadButtonImages("data/ui/endgame/ok")); var okbutton = new GuiButton(loadButtonImages("data/ui/endgame/ok"));
okbutton.position = new Vector(151, 184); okbutton.position = new Vector(151, 184);
okbutton.extent = new Vector(110, 55); okbutton.extent = new Vector(110, 55);
okbutton.accelerator = hxd.Key.ENTER;
okbutton.pressedAction = (sender) -> { okbutton.pressedAction = (sender) -> {
MarbleGame.canvas.popDialog(this); MarbleGame.canvas.popDialog(this);
Settings.highscoreName = enterNameEdit.text.text; Settings.highscoreName = enterNameEdit.text.text;

1
src/gui/ExitGameDlg.hx
View file

@ -48,7 +48,6 @@ class ExitGameDlg extends GuiControl {
noButton.extent = new Vector(86, 40); noButton.extent = new Vector(86, 40);
noButton.vertSizing = Top; noButton.vertSizing = Top;
noButton.horizSizing = Right; noButton.horizSizing = Right;
noButton.accelerator = hxd.Key.ESCAPE;
noButton.pressedAction = (sender) -> noFunc(noButton); noButton.pressedAction = (sender) -> noFunc(noButton);
var restartButton = new GuiButton(loadButtonImages("data/ui/common/restart")); var restartButton = new GuiButton(loadButtonImages("data/ui/common/restart"));

2
src/gui/PlayMissionGui.hx
View file

@ -200,7 +200,6 @@ class PlayMissionGui extends GuiImage {
var pmPrev = new GuiButton(loadButtonImages("data/ui/play/prev")); var pmPrev = new GuiButton(loadButtonImages("data/ui/play/prev"));
pmPrev.position = new Vector(436, 325); pmPrev.position = new Vector(436, 325);
pmPrev.extent = new Vector(72, 43); pmPrev.extent = new Vector(72, 43);
pmPrev.accelerator = hxd.Key.LEFT;
pmPrev.pressedAction = (sender) -> { pmPrev.pressedAction = (sender) -> {
setSelectedFunc(currentSelection - 1); setSelectedFunc(currentSelection - 1);
} }
@ -222,7 +221,6 @@ class PlayMissionGui extends GuiImage {
var pmNext = new GuiButton(loadButtonImages("data/ui/play/next")); var pmNext = new GuiButton(loadButtonImages("data/ui/play/next"));
pmNext.position = new Vector(604, 325); pmNext.position = new Vector(604, 325);
pmNext.extent = new Vector(72, 43); pmNext.extent = new Vector(72, 43);
pmNext.accelerator = hxd.Key.RIGHT;
pmNext.pressedAction = (sender) -> { pmNext.pressedAction = (sender) -> {
setSelectedFunc(currentSelection + 1); setSelectedFunc(currentSelection + 1);
} }