archive-gh-me/openglobus
1
0
Fork 0
mirror of https://github.com/openglobus/openglobus.git synced 2025-12-08 19:25:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #924 from openglobus/870

Browse Source 
870
This commit is contained in:
Michael Gevlich 2025-09-09 21:43:00 +04:00 committed by GitHub
commit 192600efbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/camera/PlanetCamera.ts
View File

@ -551,10 +551,9 @@ class PlanetCamera extends Camera {
let eyeNorm = eye.getNormal(); let eyeNorm = eye.getNormal();
let slope = b.dot(eyeNorm); let slope = b.dot(eyeNorm);
if (u.dot(eyeNorm) <= 0) return;
if (minSlope) { if (minSlope) {
let dSlope = slope - this.slope; let dSlope = slope - this.slope;
if (slope < minSlope && dSlope < 0) return; if (slope < minSlope && dSlope < 0) return;
if ( if (

11
src/control/TouchNavigation.ts
View File

@ -165,7 +165,6 @@ export class TouchNavigation extends Control {
protected onTouchStart(e: ITouchState) { protected onTouchStart(e: ITouchState) {
const handler = this.renderer!.handler; const handler = this.renderer!.handler;
this._touching = true; this._touching = true;
if (e.sys!.touches.length === 2) { if (e.sys!.touches.length === 2) {
const t0 = this.touches[0]; const t0 = this.touches[0];
const t1 = this.touches[1]; const t1 = this.touches[1];
@ -303,7 +302,8 @@ export class TouchNavigation extends Control {
const zoomCur = t0.vec.sub(t1.vec); const zoomCur = t0.vec.sub(t1.vec);
const zoomPrev = t0.vecPrev.sub(t1.vecPrev); const zoomPrev = t0.vecPrev.sub(t1.vecPrev);
const scale = zoomCur.length() / zoomPrev.length(); let scale = zoomCur.length() / zoomPrev.length();
scale = scale > 1.08 ? 1.08 : scale < 0.92 ? 0.92 : scale;
let d = distanceToPointOnEarth * -(1 - scale); let d = distanceToPointOnEarth * -(1 - scale);
cam.eye.addA(cam.getForward().scale(d)); cam.eye.addA(cam.getForward().scale(d));
@ -315,7 +315,7 @@ export class TouchNavigation extends Control {
var l = 0.5 / distanceToPointOnEarth * cam._lonLat.height * math.RADIANS; var l = 0.5 / distanceToPointOnEarth * cam._lonLat.height * math.RADIANS;
if (l > 0.003) l = 0.003; if (l > 0.003) l = 0.003;
cam.rotateHorizontal(l * -panOffset.x, false, this.pointOnEarth, this.earthUp!); cam.rotateHorizontal(l * -panOffset.x, false, this.pointOnEarth, this.earthUp!);
cam.rotateVertical(l * -panOffset.y, this.pointOnEarth); cam.rotateVertical(l * -panOffset.y, this.pointOnEarth, 0.1);
cam.checkTerrainCollision(); cam.checkTerrainCollision();
cam.update(); cam.update();
@ -410,8 +410,11 @@ export class TouchNavigation extends Control {
cam.update(); cam.update();
this.events.dispatch(this.events.inertiamove, this); this.events.dispatch(this.events.inertiamove, this);
} }
this.setLock(cam.eye.distance(prevEye) / cam.getAltitude() > 0.01);
}
if (cam.eye.distance(prevEye) / cam.getAltitude() > 0.01) { private setLock(lock: boolean): void {
if (lock) {
this.planet!.layerLock.lock(this._keyLock); this.planet!.layerLock.lock(this._keyLock);
this.planet!.terrainLock.lock(this._keyLock); this.planet!.terrainLock.lock(this._keyLock);
this.planet!._normalMapCreator.lock(this._keyLock); this.planet!._normalMapCreator.lock(this._keyLock);