thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

input fixes

Browse source
This commit is contained in:
RandomityGuy 2024-06-04 00:47:32 +05:30
parent 3c30599910
commit 923dab2c22
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CameraController.hx
View file

@ -135,7 +135,7 @@ class CameraController extends Object {
}
var factor = isTouch ? Util.lerp(1 / 25, 1 / 15,
Settings.controlsSettings.cameraSensitivity) : Util.lerp(1 / 2500, 1 / 100, Settings.controlsSettings.cameraSensitivity);
Settings.controlsSettings.cameraSensitivity) : Util.lerp(1 / 10000, 1 / 100, Settings.controlsSettings.cameraSensitivity);
if (!Settings.controlsSettings.alwaysFreeLook && !Key.isDown(Settings.controlsSettings.freelook) && !isTouch) {
deltaposY = 0;
@ -239,7 +239,7 @@ class CameraController extends Object {
var cameraPitchDelta = (Key.isDown(Settings.controlsSettings.camBackward) ? 1 : 0)
- (Key.isDown(Settings.controlsSettings.camForward) ? 1 : 0)
+ gamepadY;
if (Settings.gamepadSettings.invertYAxis)
if (Settings.gamepadSettings.invertYAxis || Settings.controlsSettings.invertYAxis)
cameraPitchDelta = -cameraPitchDelta;
var cameraYawDelta = (Key.isDown(Settings.controlsSettings.camRight) ? 1 : 0) - (Key.isDown(Settings.controlsSettings.camLeft) ? 1 : 0) + gamepadX;
if (Settings.gamepadSettings.invertXAxis)

4
src/gui/InputOptionsGui.hx
View file

@ -108,10 +108,10 @@ class InputOptionsGui extends GuiImage {
clOpt.setCurrentOption(Settings.controlsSettings.controllerVerticalCenter ? 1 : 0);
var msOpt = optionCollection.addOption(1, "Mouse Sensitivity", numberRange(10, 100, 5), (idx) -> {
Settings.controlsSettings.cameraSensitivity = cast(0.2 + (idx / 18.0) * (3 - 0.2));
Settings.controlsSettings.cameraSensitivity = cast(0.12 + (idx / 18.0) * (1.2 - 0.12));
return true;
}, 0.5, 118);
msOpt.setCurrentOption(Std.int(Util.clamp(Math.floor(((Settings.controlsSettings.cameraSensitivity - 0.2) / (3 - 0.2)) * 18), 0, 18)));
msOpt.setCurrentOption(Std.int(Util.clamp(Math.floor(((Settings.controlsSettings.cameraSensitivity - 0.12) / (1.2 - 0.12)) * 18), 0, 18)));
var bottomBar = new GuiControl();
bottomBar.position = new Vector(0, 590);

8
src/net/Net.hx
View file

@ -279,9 +279,11 @@ class Net {
var onDatachannelOpen = (idx:Int) -> {
openFlags |= idx;
if (openFlags == 3) {
var loadGui:MultiplayerLoadingGui = cast MarbleGame.canvas.content;
if (loadGui != null) {
loadGui.setLoadingStatus("Handshaking");
if (MarbleGame.canvas.content is MultiplayerLoadingGui) {
var loadGui:MultiplayerLoadingGui = cast MarbleGame.canvas.content;
if (loadGui != null) {
loadGui.setLoadingStatus("Handshaking");
}
}
Console.log("Successfully connected!");
clients.set(client, new ClientConnection(0, client, clientDatachannel, clientDatachannelUnreliable)); // host is always 0