Remove needless 2nd arg in setPointOfView

vasturiano · Dec 28, 2024 · 730b498 · 730b498
1 parent b8f8f7d
commit 730b498
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/example/html-markers/index.html b/example/html-markers/index.html
@@ -77,8 +77,8 @@
     tbControls.zoomSpeed = 0.8;
 
     // Update pov when camera moves
-    Globe.setPointOfView(camera.position, Globe.position);
-    tbControls.addEventListener('change', () => Globe.setPointOfView(camera.position, Globe.position));
+    Globe.setPointOfView(camera.position);
+    tbControls.addEventListener('change', () => Globe.setPointOfView(camera.position));
 
     // Kick-off renderers
     (function animate() { // IIFE

diff --git a/src/globe-kapsule.js b/src/globe-kapsule.js
@@ -283,10 +283,12 @@ export default Kapsule({
     getGlobeRadius,
     getCoords: (state, ...args) => polar2Cartesian(...args),
     toGeoCoords: (state, ...args) => cartesian2Polar(...args),
-    setPointOfView: (state, globalPov, globePos) => {
+    setPointOfView: (state, globalPov) => {
       let isBehindGlobe = undefined;
-      if (globalPov) {
+      if (state.scene && globalPov) {
         const globeRadius = getGlobeRadius();
+        const globePos = new THREE.Vector3();
+        state.scene.getWorldPosition(globePos);
         const pov = globePos ? globalPov.clone().sub(globePos) : globalPov; // convert to local vector
 
         let povDist, povEdgeDist, povEdgeAngle, maxSurfacePosAngle;

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -337,7 +337,7 @@ export declare class ThreeGlobeGeneric<ChainableInstance> extends Object3D {
   getGlobeRadius(): number;
   getCoords(lat: number, lng: number, altitude?: number): { x: number, y: number, z: number };
   toGeoCoords(coords: { x: number, y: number, z: number }): { lat: number, lng: number, altitude: number };
-  setPointOfView(pov: Vector3, globePos?: Vector3): void;
+  setPointOfView(pov: Vector3): void;
 
   // Render options
   rendererSize(): Vector2;