thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-12-22 16:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

slighlty better camera lerping

Browse source
This commit is contained in:
RandomityGuy 2025-11-18 16:41:27 +00:00
parent 77a31c1852
commit 8422fea462
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/CameraController.hx
View file

@ -207,7 +207,10 @@ class CameraController extends Object {
public function updateFixed() {
var dt = (1 / 60.0);
var lerpt = 1 - Math.pow(0.5, dt / 0.016); // Math.min(1, 1 - Math.pow(0.6, dt / 0.032)); // hxd.Math.min(1, 1 - Math.pow(0.6, dt * 600));
// Math.min(1, 1 - Math.pow(0.6, dt / 0.032)); // hxd.Math.min(1, 1 - Math.pow(0.6, dt * 600));
CameraPitch = nextCameraPitch;
CameraYaw = nextCameraYaw;
var gamepadX = applyNonlinearScale(rescaleDeadZone(Gamepad.getAxis(Settings.gamepadSettings.cameraXAxis), Settings.gamepadSettings.axisDeadzone));
var gamepadY = rescaleDeadZone(Gamepad.getAxis(Settings.gamepadSettings.cameraYAxis), Settings.gamepadSettings.axisDeadzone);
@ -289,9 +292,6 @@ class CameraController extends Object {
nextCameraYaw += deltaX;
nextCameraPitch += deltaY;
nextCameraPitch = Math.max(-Math.PI / 2 + Math.PI / 4, Math.min(Math.PI / 2 - 0.0001, nextCameraPitch));
CameraYaw = Util.lerp(CameraYaw, nextCameraYaw, lerpt);
CameraPitch = Util.lerp(CameraPitch, nextCameraPitch, lerpt);
}
var accumulatedTime:Float = 0.0;
@ -310,6 +310,9 @@ class CameraController extends Object {
CameraPitch = Util.clamp(CameraPitch, -0.35, 1.5); // Util.clamp(CameraPitch, -Math.PI / 12, Math.PI / 2);
var cameraYaw = Util.lerp(CameraYaw, nextCameraYaw, accumulatedTime / (1 / 60.0));
var cameraPitch = Util.lerp(CameraPitch, nextCameraPitch, accumulatedTime / (1 / 60.0));
function getRotQuat(v1:Vector, v2:Vector) {
function orthogonal(v:Vector) {
var x = Math.abs(v.x);
@ -361,8 +364,8 @@ class CameraController extends Object {
this.level.replay.recordCameraState(CameraPitch, CameraYaw);
}
} else {
CameraPitch = this.level.replay.currentPlaybackFrame.cameraPitch;
CameraYaw = this.level.replay.currentPlaybackFrame.cameraYaw;
cameraPitch = this.level.replay.currentPlaybackFrame.cameraPitch;
cameraYaw = this.level.replay.currentPlaybackFrame.cameraYaw;
}
var marblePosition = this.finish ? level.marble.collider.transform.getPosition() : level.marble.getAbsPos().getPosition();
@ -386,10 +389,10 @@ class CameraController extends Object {
var cameraVerticalTranslation = new Vector(0, 0, 0.55);
var q1 = new Quat();
q1.initRotateAxis(0, 1, 0, CameraPitch);
q1.initRotateAxis(0, 1, 0, cameraPitch);
directionVector.transform(q1.toMatrix());
// cameraVerticalTranslation.transform(q1.toMatrix());
q1.initRotateAxis(0, 0, 1, CameraYaw);
q1.initRotateAxis(0, 0, 1, cameraYaw);
directionVector.transform(q1.toMatrix());
// cameraVerticalTranslation.transform(q1.toMatrix());
directionVector.transform(orientationQuat.toMatrix());