@openglobus/openglobus-react 0.4.2 → 0.4.3

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,7 +12189,7 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
   }
 }, SimpleNavigation: class extends J {
   constructor(o = {}) {
-    super({ name: "SimpleNavigation", autoActivate: !0, ...o }), this._onMouseLeftButtonDown = (e) => {
+    super({ name: "SimpleNavigation", autoActivate: !0, ...o }), this._wheelDelta = 0, this._nx = 0, this._ny = 0, 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));
     }, this._onMouseLeftButtonUp = (e) => {
       this.renderer.handler.canvas.classList.remove("ogGrabbingPoiner"), e.x === e.prev_x && (e.y, e.prev_y);
@@ -12226,12 +12226,18 @@ Object.freeze(Object.defineProperty({ __proto__: null, AtmosphereConfig: class e
         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 r = new we(m.ZERO, m.UP);
+          new H(t.eye, e.direction).hitPlaneRes(r, i);
+        }
+        if (this._wheelPos.copy(i), t.isOrthographic) {
+          if (this._wheelDist = this.renderer.getDistanceFromPixel(e.pos) || 0, !this._wheelDist) return;
+          this._wheelDelta = e.wheelDelta, this._nx = e.nx, this._ny = e.ny;
+          let r = i.sub(t.eye).normalize(), s = 8 * t.eye.distance(i);
+          this.force.addA(r.scale(e.wheelDelta)).normalize().scale(s);
+        } else {
+          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 +12259,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,13 +12276,12 @@ 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));
-    }
+    let o = this.renderer.activeCamera;
+    if (o.isOrthographic) {
+      o.eye = this._wheelPos.add(o.getBackward().scale(this._wheelDist)), o.focusDistance -= o.focusDistance * this.vel.scaleTo(this.dt).length() * 5e-5 * this._wheelDelta;
+      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));
+    } else o.eye = o.eye.add(this.vel.scaleTo(this.dt));
     o.update();
   }
   onDraw() {