@openglobus/openglobus-react 0.4.2 → 0.4.4

package/dist/index.js

@@ -10094,7 +10094,7 @@ const dc = ["viewchange", "moveend", "flystart", "flyend", "flystop"], Po = cc.C
       s.cameraFrustumIndex = this.frustums.length, this.frustums.push(s), this.frustumColors.push(s._pickingColorU[0], s._pickingColorU[1], s._pickingColorU[2]);
     }
     else {
-      let t = 0.1, i = 1e3, r = new an({ fov: this._viewAngle, aspect: this.getAspectRatio(), near: t, far: i });
+      let t = 1, i = 500, r = new an({ fov: this._viewAngle, aspect: this.getAspectRatio(), near: t, far: i });
       r.cameraFrustumIndex = this.frustums.length, this.frustums.push(r), this.frustumColors.push(r._pickingColorU[0], r._pickingColorU[1], r._pickingColorU[2]);
     }
     this.FARTHEST_FRUSTUM_INDEX = this.frustums.length - 1, this.currentFrustumIndex = 0, this.frustumColorIndex = 0, this.isFirstPass = !1, this._projSizeConst = 0, this.set(e.eye || new m(0, 0, 1), e.look || new m(), e.up || new m(0, 1, 0));
@@ -12189,8 +12189,8 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
   }
 }, SimpleNavigation: class extends J {
   constructor(o = {}) {
-    super({ name: "SimpleNavigation", autoActivate: !0, ...o }), this._onMouseLeftButtonDown = (e) => {
-      this._active && this.renderer && (this.renderer.handler.canvas.classList.add("ogGrabbingPoiner"), this._grabbedPoint = this.renderer.getCartesianFromPixel(e), this._grabbedScreenPoint.set(e.nx, e.ny), this._grabbedPoint && this._eye0.copy(this.renderer.activeCamera.eye));
+    super({ name: "SimpleNavigation", autoActivate: !0, ...o }), this.focusVel = 0, this.focusForce = 0, this._nx = 0, this._ny = 0, this._onMouseLeftButtonDown = (e) => {
+      this._active && this.renderer && (this.stop(), this.renderer.handler.canvas.classList.add("ogGrabbingPoiner"), this._grabbedPoint = this.renderer.getCartesianFromPixel(e), this._grabbedScreenPoint.set(e.nx, e.ny), this._grabbedPoint && this._eye0.copy(this.renderer.activeCamera.eye));
     }, this._onMouseLeftButtonUp = (e) => {
       this.renderer.handler.canvas.classList.remove("ogGrabbingPoiner"), e.x === e.prev_x && (e.y, e.prev_y);
     }, this._onMouseLeftButtonHold = (e) => {
@@ -12214,8 +12214,8 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
         let i = 0.5 / t.eye.distance(this._lookPos) * G;
         i > 7e-3 ? i = 7e-3 : i < 3e-3 && (i = 3e-3), t.rotateHorizontal(i * (e.x - e.prev_x), !1, this._lookPos, this._up), t.rotateVertical(i * (e.y - e.prev_y), this._lookPos), t.update();
       }
-    }, this._onRDown = (e) => {
-      if (this.renderer) if (this._lookPos = this.renderer.getCartesianFromPixel(e.pos), this._lookPos) this._up = m.UP;
+    }, this._onRDown = async (e) => {
+      if (this.renderer) if (this.stop(), this._lookPos = void 0, this._lookPos = await this.renderer.getCartesianFromPixelAsync(e.pos), this._lookPos) this._up = m.UP;
       else {
         const t = this.renderer.activeCamera;
         let i = new we(m.ZERO, m.UP), r = new H(t.eye, e.direction);
@@ -12223,15 +12223,20 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
       }
     }, this._onMouseWheel = (e) => {
       if (this.renderer) {
-        let t = this.renderer.activeCamera, i = this.renderer.getCartesianFromPixel(e);
-        if (!i) {
-          i = new m();
-          let n = new we(m.ZERO, m.UP);
-          new H(t.eye, e.direction).hitPlaneRes(n, i);
+        let t = this.renderer.activeCamera;
+        if (t.isOrthographic) {
+          let i = t.frustums[0], r = -(i.right - i.left) * (0.5 - e.nx), s = (i.top - i.bottom) * (0.5 - e.ny), n = t.getUp().scale(s), a = t.getRight().scale(r), l = t.eye.add(a.add(n));
+          this._wheelPos = l.add(t.getForward()), this._wheelDist = 1, this._nx = e.nx, this._ny = e.ny, this.focusForce = 0.05 * e.wheelDelta;
+        } else {
+          let i = this.renderer.getCartesianFromPixel(e);
+          if (!i) {
+            i = new m();
+            let n = new we(m.ZERO, m.UP);
+            new H(t.eye, e.direction).hitPlaneRes(n, i);
+          }
+          let r = i.sub(t.eye).normalize(), s = 8 * t.eye.distance(i);
+          this.force.addA(r.scale(e.wheelDelta)).normalize().scale(s);
         }
-        this._wheelPos.copy(i);
-        let r = i.sub(t.eye).normalize(), s = 8 * t.eye.distance(i);
-        this.force.addA(r.scale(e.wheelDelta)).normalize().scale(s);
       }
     }, this.onCameraMoveForward = () => {
       this.force.addA(this.renderer.activeCamera.getForward()).normalize();
@@ -12253,7 +12258,7 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
       this.renderer.activeCamera.update();
     }, this.onCameraRollRight = () => {
       this.renderer.activeCamera.update();
-    }, this.speed = o.speed || 1, this.force = new m(), this.vel = new m(), this.mass = 1, this._lookPos = void 0, this._grabbedPoint = void 0, this._grabbedScreenPoint = new N(), this._up = null, this._eye0 = new m(), this._wheelPos = new m();
+    }, this.speed = o.speed || 1, this.force = new m(), this.vel = new m(), this.mass = 1, this._lookPos = void 0, this._grabbedPoint = void 0, this._grabbedScreenPoint = new N(), this._up = null, this._eye0 = new m(), this._wheelDist = 0, this._wheelPos = new m();
   }
   oninit() {
   }
@@ -12270,24 +12275,25 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
     o.events.off("mousewheel", this._onMouseWheel), o.events.off("keypress", W.KEY_W, this.onCameraMoveForward), o.events.off("keypress", W.KEY_S, this.onCameraMoveBackward), o.events.off("keypress", W.KEY_A, this.onCameraStrifeLeft), o.events.off("keypress", W.KEY_D, this.onCameraStrifeRight), o.events.off("keypress", W.KEY_UP, this.onCameraLookUp), o.events.off("keypress", W.KEY_DOWN, this.onCameraLookDown), o.events.off("keypress", W.KEY_LEFT, this.onCameraTurnLeft), o.events.off("keypress", W.KEY_RIGHT, this.onCameraTurnRight), o.events.off("keypress", W.KEY_Q, this.onCameraRollLeft), o.events.off("keypress", W.KEY_E, this.onCameraRollRight), o.events.off("rhold", this._onRHold), o.events.off("rdown", this._onRDown), o.events.off("lhold", this._onMouseLeftButtonHold), o.events.off("ldown", this._onMouseLeftButtonDown), o.events.off("lup", this._onMouseLeftButtonUp), o.events.off("draw", this.onDraw);
   }
   _handleMouseWheel() {
-    let o = this.renderer.activeCamera, e = o.eye.clone();
-    if (o.eye = o.eye.add(this.vel.scaleTo(this.dt)), o.isOrthographic) {
-      let t = e.distance(this._wheelPos), i = o.eye.distance(this._wheelPos) / t, r = o.focusDistance;
-      o.focusDistance = o.focusDistance * i;
-      let s = o.focusDistance - r * i;
-      o.eye = o.eye.add(o.getForward().scale(s));
-    }
-    o.update();
+    let o = this.renderer.activeCamera;
+    if (o.isOrthographic && Math.abs(this.focusVel) > 0.01) {
+      o.eye = this._wheelPos.add(o.getBackward().scale(this._wheelDist)), o.focusDistance -= o.focusDistance * this.focusVel * this.dt;
+      let e = o.frustums[0], t = (e.right - e.left) * (0.5 - this._nx), i = -(e.top - e.bottom) * (0.5 - this._ny), r = o.getUp().scale(i), s = o.getRight().scale(t);
+      o.eye.addA(s.add(r)), o.update();
+    } else this.vel.length() > 0.01 && (o.eye = o.eye.add(this.vel.scaleTo(this.dt)), o.update());
   }
   onDraw() {
-    this._updateVel(), this.renderer && this.vel.length() > 0.01 && this._handleMouseWheel();
+    this._updateVel(), this._handleMouseWheel();
   }
   get dt() {
     return 1e-3 * this.renderer.handler.deltaTime;
   }
   _updateVel() {
     let o = this.force.scale(1 / this.mass);
-    this.vel.addA(o), this.vel.scale(0.77), this.force.set(0, 0, 0);
+    this.vel.addA(o), this.vel.scale(0.77), this.force.set(0, 0, 0), this.focusVel += this.focusForce, this.focusVel *= 0.77, this.focusForce = 0;
+  }
+  stop() {
+    this.focusVel = 0, this.vel.clear();
   }
 }, SimpleSkyBackground: wo, Sun: Vr, TimelineControl: class extends J {
   constructor(o = {}) {
@@ -16375,6 +16381,13 @@ vec3 Uncharted2ToneMapping(vec3 color){color*=exposure;return saturate(Uncharted
       return (e.direction || this.activeCamera.unproject(e.x, e.y)).scaleTo(t).addA(this.activeCamera.eye);
     }
   }
+  getCartesianFromPixelAsync(e) {
+    return new Promise((t, i) => {
+      this._readDepthBuffer(() => {
+        t(this.getCartesianFromPixel(e));
+      });
+    });
+  }
   getDepthMinDistance() {
     let e = this.handler.canvas, t = e.width, i = e.height, r = wr, s = i * t, n = new N();
     for (let a = 0; a < s; a++) {