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

fix camera

Browse source
This commit is contained in:
RandomityGuy 2023-07-12 01:17:52 +05:30
parent 313ce01e66
commit 70f38e1e45
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/CameraController.hx
View file

@ -121,6 +121,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;
}
}
var factor = isTouch ? Util.lerp(1 / 250, 1 / 25, var factor = isTouch ? Util.lerp(1 / 250, 1 / 25,
Settings.controlsSettings.cameraSensitivity) : Util.lerp(1 / 2500, 1 / 100, Settings.controlsSettings.cameraSensitivity); Settings.controlsSettings.cameraSensitivity) : Util.lerp(1 / 2500, 1 / 100, Settings.controlsSettings.cameraSensitivity);
@ -186,7 +197,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 = dt / 0.032; // 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)

2
src/MarbleWorld.hx
View file

@ -593,7 +593,7 @@ class MarbleWorld extends Scheduler {
if ((this.timeState.currentAttemptTime >= 0.5) && (this.timeState.currentAttemptTime < 3.5)) { if ((this.timeState.currentAttemptTime >= 0.5) && (this.timeState.currentAttemptTime < 3.5)) {
this.marble.setMode(Start); this.marble.setMode(Start);
} }
if ((this.timeState.currentAttemptTime >= 3.5 && this.finishTime == null) || skipStartBug) { if ((this.timeState.currentAttemptTime >= 3.5 || skipStartBug) && this.finishTime == null) {
this.marble.setMode(Play); this.marble.setMode(Play);
} }
} }