globe.gl 2.45.2 → 2.46.0

package/dist/globe.gl.js

@@ -1,4 +1,4 @@
-// Version 2.45.2 globe.gl - https://github.com/vasturiano/globe.gl
+// Version 2.46.0 globe.gl - https://github.com/vasturiano/globe.gl
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -38099,138 +38099,6 @@
 
   }
 
-  /**
-   * Class for keeping track of time.
-   *
-   * @deprecated since r183.
-   */
-  class Clock {
-
-  	/**
-  	 * Constructs a new clock.
-  	 *
-  	 * @deprecated since 183.
-  	 * @param {boolean} [autoStart=true] - Whether to automatically start the clock when
-  	 * `getDelta()` is called for the first time.
-  	 */
-  	constructor( autoStart = true ) {
-
-  		/**
-  		 * If set to `true`, the clock starts automatically when `getDelta()` is called
-  		 * for the first time.
-  		 *
-  		 * @type {boolean}
-  		 * @default true
-  		 */
-  		this.autoStart = autoStart;
-
-  		/**
-  		 * Holds the time at which the clock's `start()` method was last called.
-  		 *
-  		 * @type {number}
-  		 * @default 0
-  		 */
-  		this.startTime = 0;
-
-  		/**
-  		 * Holds the time at which the clock's `start()`, `getElapsedTime()` or
-  		 * `getDelta()` methods were last called.
-  		 *
-  		 * @type {number}
-  		 * @default 0
-  		 */
-  		this.oldTime = 0;
-
-  		/**
-  		 * Keeps track of the total time that the clock has been running.
-  		 *
-  		 * @type {number}
-  		 * @default 0
-  		 */
-  		this.elapsedTime = 0;
-
-  		/**
-  		 * Whether the clock is running or not.
-  		 *
-  		 * @type {boolean}
-  		 * @default true
-  		 */
-  		this.running = false;
-
-  		warn( 'THREE.Clock: This module has been deprecated. Please use THREE.Timer instead.' ); // @deprecated, r183
-
-  	}
-
-  	/**
-  	 * Starts the clock. When `autoStart` is set to `true`, the method is automatically
-  	 * called by the class.
-  	 */
-  	start() {
-
-  		this.startTime = performance.now();
-
-  		this.oldTime = this.startTime;
-  		this.elapsedTime = 0;
-  		this.running = true;
-
-  	}
-
-  	/**
-  	 * Stops the clock.
-  	 */
-  	stop() {
-
-  		this.getElapsedTime();
-  		this.running = false;
-  		this.autoStart = false;
-
-  	}
-
-  	/**
-  	 * Returns the elapsed time in seconds.
-  	 *
-  	 * @return {number} The elapsed time.
-  	 */
-  	getElapsedTime() {
-
-  		this.getDelta();
-  		return this.elapsedTime;
-
-  	}
-
-  	/**
-  	 * Returns the delta time in seconds.
-  	 *
-  	 * @return {number} The delta time.
-  	 */
-  	getDelta() {
-
-  		let diff = 0;
-
-  		if ( this.autoStart && ! this.running ) {
-
-  			this.start();
-  			return 0;
-
-  		}
-
-  		if ( this.running ) {
-
-  			const newTime = performance.now();
-
-  			diff = ( newTime - this.oldTime ) / 1000;
-  			this.oldTime = newTime;
-
-  			this.elapsedTime += diff;
-
-  		}
-
-  		return diff;
-
-  	}
-
-  }
-
   /**
    * This class can be used to represent points in 3D space as
    * [Spherical coordinates](https://en.wikipedia.org/wiki/Spherical_coordinate_system).
@@ -65103,9 +64971,9 @@ void main() {
     }
   }
 
-  var _materialDispose$1 = function materialDispose(material) {
+  var _materialDispose$2 = function materialDispose(material) {
     if (material instanceof Array) {
-      material.forEach(_materialDispose$1);
+      material.forEach(_materialDispose$2);
     } else {
       if (material.map) {
         material.map.dispose();
@@ -65113,18 +64981,18 @@ void main() {
       material.dispose();
     }
   };
-  var _deallocate$1 = function deallocate(obj) {
+  var _deallocate$2 = function deallocate(obj) {
     if (obj.geometry) {
       obj.geometry.dispose();
     }
     if (obj.material) {
-      _materialDispose$1(obj.material);
+      _materialDispose$2(obj.material);
     }
     if (obj.texture) {
       obj.texture.dispose();
     }
     if (obj.children) {
-      obj.children.forEach(_deallocate$1);
+      obj.children.forEach(_deallocate$2);
     }
   };
 
@@ -65277,7 +65145,7 @@ void main() {
           l.forEach(function (d) {
             if (d.obj) {
               _this.remove(d.obj);
-              _deallocate$1(d.obj);
+              _deallocate$2(d.obj);
               delete d.obj;
             }
           });
@@ -65345,7 +65213,7 @@ void main() {
             _classPrivateFieldGet2$2(_tilesMeta, this)[l] && _classPrivateFieldGet2$2(_tilesMeta, this)[l].forEach(function (d) {
               if (d.obj) {
                 _this2.remove(d.obj);
-                _deallocate$1(d.obj);
+                _deallocate$2(d.obj);
                 delete d.obj;
               }
             });
@@ -169549,9 +169417,9 @@ var<${access}> ${ name } : ${ structName };`;
     }
   }
 
-  var _materialDispose = function materialDispose(material) {
+  var _materialDispose$1 = function materialDispose(material) {
     if (material instanceof Array) {
-      material.forEach(_materialDispose);
+      material.forEach(_materialDispose$1);
     } else {
       if (material.map) {
         material.map.dispose();
@@ -169559,25 +169427,25 @@ var<${access}> ${ name } : ${ structName };`;
       material.dispose();
     }
   };
-  var _deallocate = function deallocate(obj) {
+  var _deallocate$1 = function deallocate(obj) {
     if (obj.geometry) {
       obj.geometry.dispose();
     }
     if (obj.material) {
-      _materialDispose(obj.material);
+      _materialDispose$1(obj.material);
     }
     if (obj.texture) {
       obj.texture.dispose();
     }
     if (obj.children) {
-      obj.children.forEach(_deallocate);
+      obj.children.forEach(_deallocate$1);
     }
   };
-  var emptyObject = function emptyObject(obj) {
+  var emptyObject$1 = function emptyObject(obj) {
     if (obj && obj.children) while (obj.children.length) {
       var childObj = obj.children[0];
       obj.remove(childObj);
-      _deallocate(childObj);
+      _deallocate$1(childObj);
     }
   };
 
@@ -169805,9 +169673,9 @@ var<${access}> ${ name } : ${ structName };`;
         state.tileEngine.clearTiles();
       },
       _destructor: function _destructor(state) {
-        _deallocate(state.globeObj);
-        _deallocate(state.tileEngine);
-        _deallocate(state.graticulesObj);
+        _deallocate$1(state.globeObj);
+        _deallocate$1(state.tileEngine);
+        _deallocate$1(state.graticulesObj);
       }
     },
     stateInit: function stateInit() {
@@ -169843,7 +169711,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state) {
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -169899,7 +169767,7 @@ var<${access}> ${ name } : ${ structName };`;
         if (state.atmosphereObj) {
           // recycle previous atmosphere object
           state.scene.remove(state.atmosphereObj);
-          _deallocate(state.atmosphereObj);
+          _deallocate$1(state.atmosphereObj);
         }
         if (state.atmosphereColor && state.atmosphereAltitude) {
           var obj = state.atmosphereObj = new GlowMesh(state.globeObj.geometry, {
@@ -170034,7 +169902,7 @@ var<${access}> ${ name } : ${ structName };`;
           fn(obj, dId);
           var removeFn = function removeFn() {
             _this3.scene.remove(obj);
-            _deallocate(obj);
+            _deallocate$1(obj);
             delete d[_classPrivateFieldGet2(_objBindAttr, _this3)];
           };
           _classPrivateFieldGet2(_removeDelay, _this3) ? setTimeout(removeFn, _classPrivateFieldGet2(_removeDelay, _this3)) : removeFn();
@@ -170100,7 +169968,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -170125,7 +169993,7 @@ var<${access}> ${ name } : ${ structName };`;
       var pointMaterials = {}; // indexed by color
 
       if (!state.pointsMerge && changedProps.hasOwnProperty('pointsMerge')) {
-        emptyObject(state.scene); // Empty trailing merged objects
+        emptyObject$1(state.scene); // Empty trailing merged objects
       }
       state.dataMapper.scene = state.pointsMerge ? new THREE$f.Object3D() : state.scene; // use fake scene if merging points
 
@@ -170154,7 +170022,7 @@ var<${access}> ${ name } : ${ structName };`;
         points.__data = state.pointsData; // Attach obj data
 
         state.dataMapper.clear(); // Unbind merged points
-        emptyObject(state.scene);
+        emptyObject$1(state.scene);
         state.scene.add(points);
       }
 
@@ -170397,7 +170265,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state) {
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -170447,7 +170315,7 @@ var<${access}> ${ name } : ${ structName };`;
         var useTube = stroke !== null && stroke !== undefined;
         if (!group.children.length || useTube !== (group.children[0].type === 'Mesh')) {
           // create or swap object types
-          emptyObject(group);
+          emptyObject$1(group);
           var _obj = useTube ? new THREE$e.Mesh() : new THREE$e.Line(new THREE$e.BufferGeometry());
           _obj.material = state.sharedMaterial.clone(); // Separate material instance per object to have dedicated uniforms (but shared shaders)
 
@@ -170713,7 +170581,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref2) {
       var tweenGroup = _ref2.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -170751,7 +170619,7 @@ var<${access}> ${ name } : ${ structName };`;
       var hexMaterials = {}; // indexed by color
 
       if (!state.hexBinMerge && changedProps.hasOwnProperty('hexBinMerge')) {
-        emptyObject(state.scene); // Empty trailing merged objects
+        emptyObject$1(state.scene); // Empty trailing merged objects
       }
       state.dataMapper.scene = state.hexBinMerge ? new THREE$d.Object3D() : state.scene; // use fake scene if merging hex points
 
@@ -170794,7 +170662,7 @@ var<${access}> ${ name } : ${ structName };`;
         hexPoints.__data = hexBins; // Attach obj data
 
         state.dataMapper.clear(); // Unbind merged points
-        emptyObject(state.scene);
+        emptyObject$1(state.scene);
         state.scene.add(hexPoints);
       }
 
@@ -171174,7 +171042,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -171365,7 +171233,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -171607,7 +171475,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -171882,7 +171750,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state) {
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -171936,7 +171804,7 @@ var<${access}> ${ name } : ${ structName };`;
         var useFatLine = stroke !== null && stroke !== undefined;
         if (!group.children.length || useFatLine === (group.children[0].type === 'Line')) {
           // create or swap object types
-          emptyObject(group);
+          emptyObject$1(group);
           var _obj = useFatLine ? new Line2(new LineGeometry(), new LineMaterial()) : new THREE$8.Line(new THREE$8.BufferGeometry(), state.sharedMaterial.clone() // Separate material instance per object to have dedicated uniforms (but shared shaders)
           );
           group.add(_obj);
@@ -172237,7 +172105,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -172361,7 +172229,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state) {
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -172518,7 +172386,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -172607,7 +172475,7 @@ var<${access}> ${ name } : ${ structName };`;
               }).onComplete(function () {
                 state.tweenGroup.remove(this);
                 obj.remove(circleObj);
-                _deallocate(circleObj);
+                _deallocate$1(circleObj);
               }).start());
             }
           }
@@ -172714,7 +172582,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref) {
       var tweenGroup = _ref.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -172923,7 +172791,7 @@ var<${access}> ${ name } : ${ structName };`;
     init: function init(threeObj, state, _ref3) {
       var tweenGroup = _ref3.tweenGroup;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -173015,7 +172883,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state) {
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -173071,7 +172939,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state) {
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -173091,7 +172959,7 @@ var<${access}> ${ name } : ${ structName };`;
     },
     update: function update(state, changedProps) {
       if (!state.customThreeObjectUpdate) {
-        emptyObject(state.scene);
+        emptyObject$1(state.scene);
       } // Clear the existing objects to create all new, if there's no update method (brute-force)
 
       var customObjectUpdateAccessor = index$2(state.customThreeObjectUpdate);
@@ -173321,7 +173189,7 @@ var<${access}> ${ name } : ${ structName };`;
         _ref15$waitForGlobeRe = _ref15.waitForGlobeReady,
         waitForGlobeReady = _ref15$waitForGlobeRe === void 0 ? true : _ref15$waitForGlobeRe;
       // Clear the scene
-      emptyObject(threeObj);
+      emptyObject$1(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
@@ -180402,6 +180270,38 @@ var<${access}> ${ name } : ${ structName };`;
     }
   }
 
+  var _materialDispose = function materialDispose(material) {
+    if (material instanceof Array) {
+      material.forEach(_materialDispose);
+    } else {
+      if (material.map) {
+        material.map.dispose();
+      }
+      material.dispose();
+    }
+  };
+  var _deallocate = function deallocate(obj) {
+    if (obj.geometry) {
+      obj.geometry.dispose();
+    }
+    if (obj.material) {
+      _materialDispose(obj.material);
+    }
+    if (obj.texture) {
+      obj.texture.dispose();
+    }
+    if (obj.children) {
+      obj.children.forEach(_deallocate);
+    }
+  };
+  var emptyObject = function emptyObject(obj) {
+    while (obj.children.length) {
+      var childObj = obj.children[0];
+      obj.remove(childObj);
+      _deallocate(childObj);
+    }
+  };
+
   var three = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
     WebGLRenderer: WebGLRenderer,
@@ -180418,7 +180318,7 @@ var<${access}> ${ name } : ${ structName };`;
     SphereGeometry: SphereGeometry,
     MeshBasicMaterial: MeshBasicMaterial,
     BackSide: BackSide,
-    Clock: Clock
+    Timer: Timer
   };
   var threeRenderObjects = index$3({
     props: {
@@ -180512,7 +180412,7 @@ var<${access}> ${ name } : ${ structName };`;
     methods: {
       tick: function tick(state) {
         if (state.initialised) {
-          state.controls.enabled && state.controls.update && state.controls.update(Math.min(1, state.clock.getDelta())); // timedelta is required for fly controls
+          state.controls.enabled && state.controls.update && state.controls.update(Math.min(1, state.timer.update().getDelta())); // timedelta is required for fly controls
 
           state.postProcessingComposer ? state.postProcessingComposer.render() // if using postprocessing, switch the output to it
           : state.renderer.render(state.scene, state.camera);
@@ -180705,13 +180605,21 @@ var<${access}> ${ name } : ${ structName };`;
       },
       tbControls: function tbControls(state) {
         return state.controls;
-      } // to be deprecated
+      },
+      // to be deprecated
+      _destructor: function _destructor(state) {
+        var _state$controls, _state$renderer, _state$postProcessing;
+        emptyObject(state.scene);
+        (_state$controls = state.controls) === null || _state$controls === void 0 || _state$controls.dispose();
+        (_state$renderer = state.renderer) === null || _state$renderer === void 0 || _state$renderer.dispose();
+        (_state$postProcessing = state.postProcessingComposer) === null || _state$postProcessing === void 0 || _state$postProcessing.dispose();
+      }
     },
     stateInit: function stateInit() {
       return {
         scene: new three.Scene(),
         camera: new three.PerspectiveCamera(),
-        clock: new three.Clock(),
+        timer: new three.Timer(),
         tweenGroup: new Group(),
         lastRaycasterCheck: 0
       };
@@ -181248,6 +181156,11 @@ var<${access}> ${ name } : ${ structName };`;
             return finalGeoCoords[p] = +finalGeoCoords[p];
           }); // coerce coords to number
 
+          if (state.povTween) {
+            // cancel any ongoing pov animation
+            state.povTween.end();
+            state.povTween = undefined;
+          }
           if (!transitionDuration) {
             // no animation
             setCameraPos(finalGeoCoords);
@@ -181255,7 +181168,8 @@ var<${access}> ${ name } : ${ structName };`;
             // Avoid rotating more than 180deg longitude
             while (curGeoCoords.lng - finalGeoCoords.lng > 180) curGeoCoords.lng -= 360;
             while (curGeoCoords.lng - finalGeoCoords.lng < -180) curGeoCoords.lng += 360;
-            state.tweenGroup.add(new Tween(curGeoCoords).to(finalGeoCoords, transitionDuration).easing(Easing.Cubic.InOut).onUpdate(setCameraPos).onComplete(function () {
+            state.tweenGroup.add(state.povTween = new Tween(curGeoCoords).to(finalGeoCoords, transitionDuration).easing(Easing.Cubic.InOut).onUpdate(setCameraPos).onComplete(function () {
+              state.povTween = undefined;
               state.tweenGroup.remove(this);
             }).start());
           }
@@ -181314,7 +181228,6 @@ var<${access}> ${ name } : ${ structName };`;
       },
       // Expose controls
       _destructor: function _destructor(state) {
-        state.globe._destructor();
         this.pauseAnimation();
         this.pointsData([]);
         this.arcsData([]);
@@ -181329,6 +181242,8 @@ var<${access}> ${ name } : ${ structName };`;
         this.htmlElementsData([]);
         this.objectsData([]);
         this.customLayerData([]);
+        state.globe._destructor();
+        state.renderObjs._destructor();
       }
     }, linkedGlobeMethods), linkedRenderObjsMethods),
     stateInit: function stateInit(_ref6) {