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

wip.yyy

Browse Source
This commit is contained in:
Zemledelec 2025-09-07 17:29:59 +04:00
parent 64e880ff1e
commit 4427647388
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/control/MouseNavigation.ts
View File

@ -368,30 +368,28 @@ export class MouseNavigation extends Control {
if (!_targetZoomPoint)
return;
this._targetZoomPoint = _targetZoomPoint;
this._grabbedSphere.radius = this._targetZoomPoint.length();
let cam = this.planet.camera;
/*
this._grabbedDist = this.renderer!.getDistanceFromPixel(e.pos)!;
this._targetZoomPoint = _targetZoomPoint;
this._grabbedSphere.radius = this._targetZoomPoint.length();
if(cam.isOrthographic) {
let zoomDist = this.renderer!.getDistanceFromPixel(e.pos)!;
let dist = this._grabbedDist;
let p1 = new Vec3();
let dir = cam.unproject(e.x, e.y, dist, p1);
let dist = zoomDist;
let p1 = new Vec3();
let dir = cam.unproject(e.x, e.y, dist, p1);
const p0 = p1.sub(dir.scaleTo(dist));
const _targetDragPoint = new Ray(p0, dir).hitSphere(this._grabbedSphere);
const p0 = p1.sub(dir.scaleTo(dist));
const _targetZoomPoint = new Ray(p0, dir).hitSphere(this._grabbedSphere);
if (!_targetDragPoint) {
return;
if (!_targetZoomPoint) {
return;
}
this._targetZoomPoint = _targetZoomPoint;
}
this._targetZoomPoint = _targetDragPoint;
*/
this._curPitch = cam.getPitch();
this._curYaw = cam.getYaw();
this._curRoll = cam.getRoll();
@ -651,7 +649,7 @@ export class MouseNavigation extends Control {
cam.setPitchYawRoll(this._curPitch, this._curYaw, this._curRoll);
cam.update();
let dirCurr = cam.unproject2v(this._currScreenPos); //cam.eye.distance(this._targetZoomPoint)
let dirCurr = cam.unproject2v(this._currScreenPos, cam.eye.distance(this._targetZoomPoint));
let dirNew = a.sub(cam.eye).normalize();
let px0 = new Vec3();