@openglobus/og 0.10.5-rc → 0.10.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openglobus/og",
|
|
3
|
-
"version": "0.10.5
|
|
3
|
+
"version": "0.10.5",
|
|
4
4
|
"description": "[OpenGlobus](http://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
|
|
5
5
|
"directories": {
|
|
6
6
|
"example": "./sandbox"
|
|
@@ -71,36 +71,6 @@ class EarthNavigation extends Control {
|
|
|
71
71
|
var ll = this.renderer.activeCamera._lonLat;
|
|
72
72
|
|
|
73
73
|
globus.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[this.currState].h));
|
|
74
|
-
|
|
75
|
-
// if (!wheelDelta) {
|
|
76
|
-
// if (this.currState === 0) {
|
|
77
|
-
// this.planet.stopFlying();
|
|
78
|
-
// this.currState = 1;
|
|
79
|
-
// var ll = globus.planet.camera._lonLat;
|
|
80
|
-
// globus.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[1].h));
|
|
81
|
-
// } else {
|
|
82
|
-
// this.planet.stopFlying();
|
|
83
|
-
// this.currState = 0;
|
|
84
|
-
// var ll = this.renderer.activeCamera._lonLat;
|
|
85
|
-
// globus.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[0].h));
|
|
86
|
-
// }
|
|
87
|
-
// } else if (wheelDelta > 0) {
|
|
88
|
-
// this.currState++;
|
|
89
|
-
// if (this.currState === 0) {
|
|
90
|
-
// this.planet.stopFlying();
|
|
91
|
-
// this.currState = 1;
|
|
92
|
-
// var ll = globus.planet.camera._lonLat;
|
|
93
|
-
// globus.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[1].h));
|
|
94
|
-
// }
|
|
95
|
-
// } else {
|
|
96
|
-
// this.currState--;
|
|
97
|
-
// if (this.currState === 1) {
|
|
98
|
-
// this.planet.stopFlying();
|
|
99
|
-
// this.currState = 0;
|
|
100
|
-
// var ll = this.renderer.activeCamera._lonLat;
|
|
101
|
-
// globus.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[0].h));
|
|
102
|
-
// }
|
|
103
|
-
// }
|
|
104
74
|
}
|
|
105
75
|
|
|
106
76
|
onMouseWheel(event) {
|
|
@@ -225,10 +195,12 @@ class EarthNavigation extends Control {
|
|
|
225
195
|
|
|
226
196
|
if (this.renderer.events.mouseState.moving) {
|
|
227
197
|
var targetPoint = new Ray(cam.eye, e.direction).hitSphere(this.grabbedSpheroid);
|
|
198
|
+
|
|
228
199
|
if (targetPoint) {
|
|
229
200
|
this._a =
|
|
230
201
|
Math.acos(this.grabbedPoint.y / this.grabbedSpheroid.radius) -
|
|
231
202
|
Math.acos(targetPoint.y / this.grabbedSpheroid.radius);
|
|
203
|
+
|
|
232
204
|
this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
|
|
233
205
|
this._hRot = Quat.getRotationBetweenVectors(
|
|
234
206
|
new Vec3(targetPoint.x, 0.0, targetPoint.z).normal(),
|