From 5bfb7754739b24f223ac14564c5e5fa965b4ef41 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Wed, 9 Nov 2022 18:15:16 +0100 Subject: [PATCH] Improve snapping --- src/controls/map/MapControls.js | 7 +++++-- src/map/lowres/LowresFragmentShader.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/controls/map/MapControls.js b/src/controls/map/MapControls.js index beb9afc..3911d82 100644 --- a/src/controls/map/MapControls.js +++ b/src/controls/map/MapControls.js @@ -177,9 +177,12 @@ export class MapControls { this.keyRotate.update(delta, map); this.touchRotate.update(delta, map); + const rotating = this.mouseRotate.moving || this.touchRotate.moving || + this.keyRotate.left || this.keyRotate.right + // snap rotation to north on orthographic view - if (this.manager.ortho !== 0 && Math.abs(this.manager.rotation) < 0.3) { - this.manager.rotation = softClamp(this.manager.rotation, 0, 0, 0.05); + if (this.manager.ortho !== 0 && Math.abs(this.manager.rotation) < (rotating ? 0.05 : 0.3)) { + this.manager.rotation = softClamp(this.manager.rotation, 0, 0, 0.1); } // tilt diff --git a/src/map/lowres/LowresFragmentShader.js b/src/map/lowres/LowresFragmentShader.js index cc7b731..fb30d56 100644 --- a/src/map/lowres/LowresFragmentShader.js +++ b/src/map/lowres/LowresFragmentShader.js @@ -94,7 +94,7 @@ void main() { float aoStrength = 0.0; if(lod == 1.0) { aoStrength = smoothstep(PI - 0.8, PI - 0.2, acos(-clamp(viewMatrix[1][2], 0.0, 1.0))); - aoStrength *= 1.0 - smoothstep(200.0, 500.0, vDistance); + aoStrength *= 1.0 - smoothstep(300.0, 500.0, vDistance); if (aoStrength > 0.0) { const float r = 3.0;