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

fix camera

Browse source
This commit is contained in:
RandomityGuy 2023-07-12 01:17:52 +05:30
parent 035a62dfc8
commit 4549647dc9
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/CameraController.hx
View file

@ -123,6 +123,17 @@ class CameraController extends Object {
var deltaposX = mouseX * scaleFactor; var deltaposX = mouseX * scaleFactor;
var deltaposY = mouseY * (Settings.controlsSettings.invertYAxis ? -1 : 1) * scaleFactor; var deltaposY = mouseY * (Settings.controlsSettings.invertYAxis ? -1 : 1) * scaleFactor;
if (deltaposX != 0 || deltaposY != 0) {
var absX = Math.abs(deltaposX);
var absY = Math.abs(deltaposY);
var len = Math.sqrt(deltaposX * deltaposX + deltaposY * deltaposY);
var max = Math.max(absX, absY);
if (max > 0.01) {
deltaposX *= len / max;
deltaposY *= len / max;
}
}
if (!Settings.controlsSettings.alwaysFreeLook && !Key.isDown(Settings.controlsSettings.freelook)) { if (!Settings.controlsSettings.alwaysFreeLook && !Key.isDown(Settings.controlsSettings.freelook)) {
deltaposY = 0; deltaposY = 0;
} }
@ -159,7 +170,7 @@ class CameraController extends Object {
// camera.position.add(cameraVerticalTranslation); // camera.position.add(cameraVerticalTranslation);
var camera = level.scene.camera; var camera = level.scene.camera;
var lerpt = hxd.Math.min(1, 1 - Math.pow(0.6, dt * 600)); var lerpt = Math.pow(0.5, dt / 0.032); // Math.min(1, 1 - Math.pow(0.6, dt / 0.032)); // hxd.Math.min(1, 1 - Math.pow(0.6, dt * 600));
var cameraPitchDelta = (Key.isDown(Settings.controlsSettings.camBackward) ? 1 : 0) var cameraPitchDelta = (Key.isDown(Settings.controlsSettings.camBackward) ? 1 : 0)
- (Key.isDown(Settings.controlsSettings.camForward) ? 1 : 0) - (Key.isDown(Settings.controlsSettings.camForward) ? 1 : 0)
@ -167,11 +178,10 @@ class CameraController extends Object {
if (Settings.gamepadSettings.invertYAxis) if (Settings.gamepadSettings.invertYAxis)
cameraPitchDelta = -cameraPitchDelta; cameraPitchDelta = -cameraPitchDelta;
nextCameraPitch += 0.75 * 5 * cameraPitchDelta * dt * Settings.gamepadSettings.cameraSensitivity; nextCameraPitch += 0.75 * 5 * cameraPitchDelta * dt * Settings.gamepadSettings.cameraSensitivity;
var cameraYawDelta = (Key.isDown(Settings.controlsSettings.camRight) ? 1 : 0) var cameraYawDelta = (Key.isDown(Settings.controlsSettings.camRight) ? 1 : 0) - (Key.isDown(Settings.controlsSettings.camLeft) ? 1 : 0)
- (Key.isDown(Settings.controlsSettings.camLeft) ? 1 : 0)
+ Gamepad.getAxis(Settings.gamepadSettings.cameraXAxis); + Gamepad.getAxis(Settings.gamepadSettings.cameraXAxis);
if (Settings.gamepadSettings.invertXAxis) if (Settings.gamepadSettings.invertXAxis)
cameraYawDelta = -cameraYawDelta; cameraYawDelta = -cameraYawDelta;
nextCameraYaw += 0.75 * 5 * cameraYawDelta * dt * Settings.gamepadSettings.cameraSensitivity; nextCameraYaw += 0.75 * 5 * cameraYawDelta * dt * Settings.gamepadSettings.cameraSensitivity;
nextCameraPitch = Math.max(-Math.PI / 2 + Math.PI / 4, Math.min(Math.PI / 2 - 0.0001, nextCameraPitch)); nextCameraPitch = Math.max(-Math.PI / 2 + Math.PI / 4, Math.min(Math.PI / 2 - 0.0001, nextCameraPitch));