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.yy

Browse Source
This commit is contained in:
Zemledelec 2025-09-07 17:12:15 +04:00
parent 80bb957f23
commit 64e880ff1e
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/camera/Camera.ts
View File

@ -862,8 +862,8 @@ class Camera {
* @param {Vec2} pos - Screen X coordinate
* @returns {Vec3} - Direction vector
*/
public unproject2v(pos: Vec2) {
return this.unproject(pos.x, pos.y);
public unproject2v(pos: Vec2, dist?: number, outPos?: Vec3) {
return this.unproject(pos.x, pos.y, dist, outPos);
}
/**

36
src/control/MouseNavigation.ts
View File

@ -374,6 +374,24 @@ export class MouseNavigation extends Control {
let cam = this.planet.camera;
/*
this._grabbedDist = this.renderer!.getDistanceFromPixel(e.pos)!;
let dist = this._grabbedDist;
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);
if (!_targetDragPoint) {
return;
}
this._targetZoomPoint = _targetDragPoint;
*/
this._curPitch = cam.getPitch();
this._curYaw = cam.getYaw();
this._curRoll = cam.getRoll();
@ -596,22 +614,6 @@ export class MouseNavigation extends Control {
cam.focusDistance = cam.getAltitude();
//let dist = a.distance(eye);
// let mult = 50;
//
// if (dist <= 1 || cam.getAltitude() < 2) {
// mult = 1;
// } else if (dist < 10) {
// mult = 5;
// } else if (dist < 20) {
// mult = 10;
// }
// let maxVel = dist * mult;
// if (this.vel.length() > maxVel) {
// this.vel = vel_normal.scaleTo(maxVel);
// }
let d_v = this.vel.scaleTo(this.dt);
// if camera eye position under the dome of the grabbed sphere
@ -649,7 +651,7 @@ export class MouseNavigation extends Control {
cam.setPitchYawRoll(this._curPitch, this._curYaw, this._curRoll);
cam.update();
let dirCurr = cam.unproject2v(this._currScreenPos);
let dirCurr = cam.unproject2v(this._currScreenPos); //cam.eye.distance(this._targetZoomPoint)
let dirNew = a.sub(cam.eye).normalize();
let px0 = new Vec3();