u-space 0.0.21 → 0.0.23

package/dist/plugins/tiles/ArcgisTilesRenderer.d.ts

@@ -14,6 +14,7 @@ declare class ArcgisTilesRenderer extends Globe {
     private _ellipsoidPosition;
     constructor(viewer: Viewer);
     render: () => void;
+    private applyGisOrigin;
     beforeRenderHandler: () => void;
     enable(): this;
     disable(): this;

package/dist/plugins/tiles/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("three/webgpu"),P=require("3d-tiles-renderer"),a=require("3d-tiles-renderer/plugins"),T=require("3d-tiles-renderer/src/three/plugins/fade/FadeMaterialManager.js"),v=require("3d-tiles-renderer/src/three/plugins/fade/wrapFadeMaterial.js"),n=require("three/tsl"),o=require("@takram/three-geospatial"),c=require("@takram/three-geospatial/webgpu"),h=Symbol("FADE_PARAMS"),p=c.FnLayout({name:"bayerDither2x2",type:"float",inputs:[{name:"v",type:"vec2"}]})(([t])=>(o.reinterpretType(t),t.y.mul(3).add(t.x.mul(2)).mod(4))),f=c.FnLayout({name:"bayerDither4x4",type:"float",inputs:[{name:"v",type:"vec2"}]})(([t])=>{o.reinterpretType(t);const e=t.mod(2),i=t.mod(4).mul(.5).floor();return p(e).mul(4).add(p(i))}),y=n.uniform(0).onObjectUpdate(({material:t})=>t!=null?t?.params?.fadeIn.value??0:0),R=n.uniform(0).onObjectUpdate(({material:t})=>t!=null?t?.params?.fadeOut.value??0:0),w=n.Fn(()=>{const i=f(n.screenCoordinate.xy.mod(4).floor()).add(.5).div(16);return n.If(i.greaterThanEqual(y),()=>{n.Discard()}),n.If(i.lessThan(R),()=>{n.Discard()}),n.output})();function _(t){if(o.reinterpretType(t),t[h]!=null)return t[h];const e={fadeIn:{value:0},fadeOut:{value:0},fadeTexture:{value:null}};let i=0;return t.params=e,t.defines={get FEATURE_FADE(){return i},set FEATURE_FADE(s){s!==i&&(i=s,t.outputNode=s===1?w:null)}},e}class E extends T.FadeMaterialManager{prepareMaterial(e){const i=this._fadeParams;if(i.has(e))return;let s;e instanceof r.NodeMaterial?s=_(e):s=v.wrapFadeMaterial(e,e.onBeforeCompile),i.set(e,s)}}class x extends a.TilesFadePlugin{constructor(...e){super(...e),this._fadeMaterialManager=new E}}function g(t,e){const i=t.material;if(Array.isArray(i))throw new Error("Multiple materials are not supported yet.");const s=new e;"map"in i&&i.map!=null&&"map"in s&&(o.reinterpretType(i.map),o.reinterpretType(s.map),i.map.flipY=!1,s.map=i.map.clone()),t.material=s,i.dispose()}class F{tiles;overrideMaterial;constructor(e=r.MeshBasicNodeMaterial){this.overrideMaterial=e}init(e){this.tiles=e,e.group.traverse(i=>{i instanceof r.Mesh&&g(i,this.overrideMaterial)}),e.addEventListener("load-model",this.handleLoadModel),e.addEventListener("dispose-model",this.handleDisposeModel)}handleLoadModel=({scene:e})=>{e.traverse(i=>{i instanceof r.Mesh&&g(i,this.overrideMaterial)})};handleDisposeModel=({scene:e})=>{e.traverse(i=>{i instanceof r.Mesh&&i.material.dispose()})};dispose(){this.tiles?.removeEventListener("load-model",this.handleLoadModel),this.tiles?.removeEventListener("dispose-model",this.handleDisposeModel)}}class m{tiles;tileCompressionPlugin;updateOnChangePlugin;reorientationPlugin;xyzTilesPlugin;tilesFadePlugin;tileMaterialReplacementPlugin;constructor(){this.tiles=this._initTilesRenderer(),this.tileCompressionPlugin=this._initTileCompressionPlugin(),this.updateOnChangePlugin=this._initUpdateOnChangePlugin(),this.reorientationPlugin=this._initReorientationPlugin(),this.xyzTilesPlugin=this._initXYZTilesPlugin(),this.tilesFadePlugin=this._initTilesFadePlugin(),this.tileMaterialReplacementPlugin=this._initTileMaterialReplacementPlugin()}_initTilesRenderer(){const e=new P.TilesRenderer;return e.maxDepth=20,e.errorTarget=1,e}_initTileCompressionPlugin(){const e=new a.TileCompressionPlugin;return this.tiles.registerPlugin(e),e}_initUpdateOnChangePlugin(){const e=new a.UpdateOnChangePlugin;return this.tiles.registerPlugin(e),e}_initReorientationPlugin(){const e=new a.ReorientationPlugin;return this.tiles.registerPlugin(e),e}_initXYZTilesPlugin(){const e=new a.XYZTilesPlugin({center:!0,shape:"ellipsoid",url:"https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"});return this.tiles.registerPlugin(e),e}_initTilesFadePlugin(){const e=new x;return this.tiles.registerPlugin(e),e}_initTileMaterialReplacementPlugin(){const e=new F(r.MeshBasicNodeMaterial);return this.tiles.registerPlugin(e),e}}class b extends m{viewer;loedTilesSets=new Set;gisOrigin=null;_worldToEllipsoidMatrix=new r.Matrix4;_ellipsoidPosition=new r.Vector3;constructor(e){super(),this.viewer=e,this.tiles.addEventListener("needs-render",this.render),this.tiles.addEventListener("needs-update",this.render)}render=()=>{this.viewer.render()};beforeRenderHandler=()=>{this.viewer.camera.updateMatrixWorld(),this.tiles.setCamera(this.viewer.camera),this.tiles.setResolutionFromRenderer(this.viewer.camera,this.viewer.renderer),this.tiles.update()};enable(){return this.viewer.scene.add(this.tiles.group),this.viewer.addEventListener("beforeRender",this.beforeRenderHandler),this}disable(){return this.viewer.scene.remove(this.tiles.group),this.viewer.removeEventListener("beforeRender",this.beforeRenderHandler),this}invalidate(e,i,s){const l=()=>{const u=r.MathUtils.degToRad(i),M=r.MathUtils.degToRad(e);this.reorientationPlugin.transformLatLonHeightToOrigin(u,M,s),this.gisOrigin={lon:e,lat:i,height:s},this.render(),d()},d=()=>{this.tiles.removeEventListener("load-root-tileset",l),this.loedTilesSets.delete(l)};return this.tiles.addEventListener("load-root-tileset",l),this.loedTilesSets.add(l),this.tiles.root&&l(),d}lonLatHeightToPosition(e,i,s=0,l=new r.Vector3){const d=r.MathUtils.degToRad(i),u=r.MathUtils.degToRad(e);return this.tiles.ellipsoid.getCartographicToPosition(d,u,s,l),this.tiles.group.updateWorldMatrix(!0,!1),l.applyMatrix4(this.tiles.group.matrixWorld)}positionToLonLatHeight(e,i={lon:0,lat:0,height:0}){return this.tiles.group.updateWorldMatrix(!0,!1),this._worldToEllipsoidMatrix.copy(this.tiles.group.matrixWorld).invert(),this._ellipsoidPosition.copy(e).applyMatrix4(this._worldToEllipsoidMatrix),this.tiles.ellipsoid.getPositionToCartographic(this._ellipsoidPosition,i),i.lon=r.MathUtils.radToDeg(i.lon),i.lat=r.MathUtils.radToDeg(i.lat),i}dispose(){this.disable(),this.loedTilesSets.forEach(e=>this.tiles.removeEventListener("load-root-tileset",e)),this.loedTilesSets.clear(),this.tiles.removeEventListener("needs-render",this.render),this.tiles.removeEventListener("needs-update",this.render),this.tiles.dispose()}}exports.ArcgisTilesRenderer=b;exports.Globe=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("three/webgpu"),M=require("3d-tiles-renderer"),o=require("3d-tiles-renderer/plugins"),P=require("3d-tiles-renderer/src/three/plugins/fade/FadeMaterialManager.js"),T=require("3d-tiles-renderer/src/three/plugins/fade/wrapFadeMaterial.js"),l=require("three/tsl"),d=require("@takram/three-geospatial"),g=require("@takram/three-geospatial/webgpu"),u=Symbol("FADE_PARAMS"),h=g.FnLayout({name:"bayerDither2x2",type:"float",inputs:[{name:"v",type:"vec2"}]})(([t])=>(d.reinterpretType(t),t.y.mul(3).add(t.x.mul(2)).mod(4))),v=g.FnLayout({name:"bayerDither4x4",type:"float",inputs:[{name:"v",type:"vec2"}]})(([t])=>{d.reinterpretType(t);const e=t.mod(2),i=t.mod(4).mul(.5).floor();return h(e).mul(4).add(h(i))}),f=l.uniform(0).onObjectUpdate(({material:t})=>t!=null?t?.params?.fadeIn.value??0:0),y=l.uniform(0).onObjectUpdate(({material:t})=>t!=null?t?.params?.fadeOut.value??0:0),R=l.Fn(()=>{const i=v(l.screenCoordinate.xy.mod(4).floor()).add(.5).div(16);return l.If(i.greaterThanEqual(f),()=>{l.Discard()}),l.If(i.lessThan(y),()=>{l.Discard()}),l.output})();function w(t){if(d.reinterpretType(t),t[u]!=null)return t[u];const e={fadeIn:{value:0},fadeOut:{value:0},fadeTexture:{value:null}};let i=0;return t.params=e,t.defines={get FEATURE_FADE(){return i},set FEATURE_FADE(s){s!==i&&(i=s,t.outputNode=s===1?R:null)}},e}class _ extends P.FadeMaterialManager{prepareMaterial(e){const i=this._fadeParams;if(i.has(e))return;let s;e instanceof r.NodeMaterial?s=w(e):s=T.wrapFadeMaterial(e,e.onBeforeCompile),i.set(e,s)}}class E extends o.TilesFadePlugin{constructor(...e){super(...e),this._fadeMaterialManager=new _}}function p(t,e){const i=t.material;if(Array.isArray(i))throw new Error("Multiple materials are not supported yet.");const s=new e;"map"in i&&i.map!=null&&"map"in s&&(d.reinterpretType(i.map),d.reinterpretType(s.map),i.map.flipY=!1,s.map=i.map.clone()),t.material=s,i.dispose()}class x{tiles;overrideMaterial;constructor(e=r.MeshBasicNodeMaterial){this.overrideMaterial=e}init(e){this.tiles=e,e.group.traverse(i=>{i instanceof r.Mesh&&p(i,this.overrideMaterial)}),e.addEventListener("load-model",this.handleLoadModel),e.addEventListener("dispose-model",this.handleDisposeModel)}handleLoadModel=({scene:e})=>{e.traverse(i=>{i instanceof r.Mesh&&p(i,this.overrideMaterial)})};handleDisposeModel=({scene:e})=>{e.traverse(i=>{i instanceof r.Mesh&&i.material.dispose()})};dispose(){this.tiles?.removeEventListener("load-model",this.handleLoadModel),this.tiles?.removeEventListener("dispose-model",this.handleDisposeModel)}}class c{tiles;tileCompressionPlugin;updateOnChangePlugin;reorientationPlugin;xyzTilesPlugin;tilesFadePlugin;tileMaterialReplacementPlugin;constructor(){this.tiles=this._initTilesRenderer(),this.tileCompressionPlugin=this._initTileCompressionPlugin(),this.updateOnChangePlugin=this._initUpdateOnChangePlugin(),this.reorientationPlugin=this._initReorientationPlugin(),this.xyzTilesPlugin=this._initXYZTilesPlugin(),this.tilesFadePlugin=this._initTilesFadePlugin(),this.tileMaterialReplacementPlugin=this._initTileMaterialReplacementPlugin()}_initTilesRenderer(){const e=new M.TilesRenderer;return e.maxDepth=20,e.errorTarget=1,e}_initTileCompressionPlugin(){const e=new o.TileCompressionPlugin;return this.tiles.registerPlugin(e),e}_initUpdateOnChangePlugin(){const e=new o.UpdateOnChangePlugin;return this.tiles.registerPlugin(e),e}_initReorientationPlugin(){const e=new o.ReorientationPlugin;return this.tiles.registerPlugin(e),e}_initXYZTilesPlugin(){const e=new o.XYZTilesPlugin({center:!0,shape:"ellipsoid",url:"https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"});return this.tiles.registerPlugin(e),e}_initTilesFadePlugin(){const e=new E;return this.tiles.registerPlugin(e),e}_initTileMaterialReplacementPlugin(){const e=new x(r.MeshBasicNodeMaterial);return this.tiles.registerPlugin(e),e}}class F extends c{viewer;loedTilesSets=new Set;gisOrigin=null;_worldToEllipsoidMatrix=new r.Matrix4;_ellipsoidPosition=new r.Vector3;constructor(e){super(),this.viewer=e,this.tiles.addEventListener("needs-render",this.render),this.tiles.addEventListener("needs-update",this.render)}render=()=>{this.viewer.render()};applyGisOrigin(e,i,s){const n=r.MathUtils.degToRad(i),a=r.MathUtils.degToRad(e);this.reorientationPlugin.transformLatLonHeightToOrigin(n,a,s),this.gisOrigin={lon:e,lat:i,height:s},this.render()}beforeRenderHandler=()=>{this.viewer.camera.updateMatrixWorld(),this.tiles.setCamera(this.viewer.camera),this.tiles.setResolutionFromRenderer(this.viewer.camera,this.viewer.renderer),this.tiles.update()};enable(){return this.viewer.scene.add(this.tiles.group),this.viewer.addEventListener("beforeRender",this.beforeRenderHandler),this}disable(){return this.viewer.scene.remove(this.tiles.group),this.viewer.removeEventListener("beforeRender",this.beforeRenderHandler),this}invalidate(e,i,s){const n=()=>{this.applyGisOrigin(e,i,s),a()},a=()=>{this.tiles.removeEventListener("load-root-tileset",n),this.loedTilesSets.delete(n)};return this.tiles.root||(this.tiles.addEventListener("load-root-tileset",n),this.loedTilesSets.add(n)),this.applyGisOrigin(e,i,s),a}lonLatHeightToPosition(e,i,s=0,n=new r.Vector3){const a=r.MathUtils.degToRad(i),m=r.MathUtils.degToRad(e);return this.tiles.ellipsoid.getCartographicToPosition(a,m,s,n),this.tiles.group.updateWorldMatrix(!0,!1),n.applyMatrix4(this.tiles.group.matrixWorld)}positionToLonLatHeight(e,i={lon:0,lat:0,height:0}){return this.tiles.group.updateWorldMatrix(!0,!1),this._worldToEllipsoidMatrix.copy(this.tiles.group.matrixWorld).invert(),this._ellipsoidPosition.copy(e).applyMatrix4(this._worldToEllipsoidMatrix),this.tiles.ellipsoid.getPositionToCartographic(this._ellipsoidPosition,i),i.lon=r.MathUtils.radToDeg(i.lon),i.lat=r.MathUtils.radToDeg(i.lat),i}dispose(){this.disable(),this.loedTilesSets.forEach(e=>this.tiles.removeEventListener("load-root-tileset",e)),this.loedTilesSets.clear(),this.tiles.removeEventListener("needs-render",this.render),this.tiles.removeEventListener("needs-update",this.render),this.tiles.dispose()}}exports.ArcgisTilesRenderer=F;exports.Globe=c;

package/dist/plugins/tiles/index.js

@@ -1,38 +1,38 @@
-import { NodeMaterial as M, MeshBasicNodeMaterial as P, Mesh as d, Matrix4 as R, Vector3 as u, MathUtils as n } from "three/webgpu";
-import { TilesRenderer as w } from "3d-tiles-renderer";
-import { TilesFadePlugin as E, TileCompressionPlugin as y, UpdateOnChangePlugin as _, ReorientationPlugin as x, XYZTilesPlugin as F } from "3d-tiles-renderer/plugins";
-import { FadeMaterialManager as L } from "3d-tiles-renderer/src/three/plugins/fade/FadeMaterialManager.js";
-import { wrapFadeMaterial as b } from "3d-tiles-renderer/src/three/plugins/fade/wrapFadeMaterial.js";
-import { uniform as f, Fn as C, screenCoordinate as D, If as h, Discard as p, output as A } from "three/tsl";
-import { reinterpretType as l } from "@takram/three-geospatial";
-import { FnLayout as T } from "@takram/three-geospatial/webgpu";
-const g = /* @__PURE__ */ Symbol("FADE_PARAMS"), c = T({
+import { NodeMaterial as v, MeshBasicNodeMaterial as m, Mesh as o, Matrix4 as M, Vector3 as d, MathUtils as l } from "three/webgpu";
+import { TilesRenderer as R } from "3d-tiles-renderer";
+import { TilesFadePlugin as y, TileCompressionPlugin as w, UpdateOnChangePlugin as E, ReorientationPlugin as _, XYZTilesPlugin as x } from "3d-tiles-renderer/plugins";
+import { FadeMaterialManager as F } from "3d-tiles-renderer/src/three/plugins/fade/FadeMaterialManager.js";
+import { wrapFadeMaterial as L } from "3d-tiles-renderer/src/three/plugins/fade/wrapFadeMaterial.js";
+import { uniform as P, Fn as b, screenCoordinate as C, If as u, Discard as h, output as O } from "three/tsl";
+import { reinterpretType as a } from "@takram/three-geospatial";
+import { FnLayout as f } from "@takram/three-geospatial/webgpu";
+const p = /* @__PURE__ */ Symbol("FADE_PARAMS"), g = f({
   name: "bayerDither2x2",
   type: "float",
   inputs: [{ name: "v", type: "vec2" }]
-})(([t]) => (l(t), t.y.mul(3).add(t.x.mul(2)).mod(4))), O = T({
+})(([t]) => (a(t), t.y.mul(3).add(t.x.mul(2)).mod(4))), D = f({
   name: "bayerDither4x4",
   type: "float",
   inputs: [{ name: "v", type: "vec2" }]
 })(([t]) => {
-  l(t);
+  a(t);
   const e = t.mod(2), i = t.mod(4).mul(0.5).floor();
-  return c(e).mul(4).add(c(i));
-}), S = f(0).onObjectUpdate(
+  return g(e).mul(4).add(g(i));
+}), A = P(0).onObjectUpdate(
   ({ material: t }) => t != null ? t?.params?.fadeIn.value ?? 0 : 0
-), U = f(0).onObjectUpdate(
+), S = P(0).onObjectUpdate(
   ({ material: t }) => t != null ? t?.params?.fadeOut.value ?? 0 : 0
-), H = C(() => {
-  const i = O(D.xy.mod(4).floor()).add(0.5).div(16);
-  return h(i.greaterThanEqual(S), () => {
-    p();
-  }), h(i.lessThan(U), () => {
-    p();
-  }), A;
+), U = b(() => {
+  const i = D(C.xy.mod(4).floor()).add(0.5).div(16);
+  return u(i.greaterThanEqual(A), () => {
+    h();
+  }), u(i.lessThan(S), () => {
+    h();
+  }), O;
 })();
-function W(t) {
-  if (l(t), t[g] != null)
-    return t[g];
+function H(t) {
+  if (a(t), t[p] != null)
+    return t[p];
   const e = {
     fadeIn: { value: 0 },
     fadeOut: { value: 0 },
@@ -44,53 +44,53 @@ function W(t) {
       return i;
     },
     set FEATURE_FADE(s) {
-      s !== i && (i = s, t.outputNode = s === 1 ? H : null);
+      s !== i && (i = s, t.outputNode = s === 1 ? U : null);
     }
   }, e;
 }
-class I extends L {
+class W extends F {
   // HACK: Override "wrapFadeMaterial" to support NodeMaterial:
   prepareMaterial(e) {
     const i = this._fadeParams;
     if (i.has(e))
       return;
     let s;
-    e instanceof M ? s = W(e) : s = b(e, e.onBeforeCompile), i.set(e, s);
+    e instanceof v ? s = H(e) : s = L(e, e.onBeforeCompile), i.set(e, s);
   }
 }
-class N extends E {
+class I extends y {
   constructor(...e) {
-    super(...e), this._fadeMaterialManager = new I();
+    super(...e), this._fadeMaterialManager = new W();
   }
 }
-function m(t, e) {
+function c(t, e) {
   const i = t.material;
   if (Array.isArray(i))
     throw new Error("Multiple materials are not supported yet.");
   const s = new e();
-  "map" in i && i.map != null && "map" in s && (l(i.map), l(s.map), i.map.flipY = !1, s.map = i.map.clone()), t.material = s, i.dispose();
+  "map" in i && i.map != null && "map" in s && (a(i.map), a(s.map), i.map.flipY = !1, s.map = i.map.clone()), t.material = s, i.dispose();
 }
-class z {
+class N {
   tiles;
   overrideMaterial;
-  constructor(e = P) {
+  constructor(e = m) {
     this.overrideMaterial = e;
   }
   // Plugin method
   init(e) {
     this.tiles = e, e.group.traverse((i) => {
-      i instanceof d && m(i, this.overrideMaterial);
+      i instanceof o && c(i, this.overrideMaterial);
     }), e.addEventListener("load-model", this.handleLoadModel), e.addEventListener("dispose-model", this.handleDisposeModel);
   }
   handleLoadModel = ({ scene: e }) => {
     e.traverse((i) => {
-      i instanceof d && m(i, this.overrideMaterial);
+      i instanceof o && c(i, this.overrideMaterial);
     });
   };
   // eslint-disable-next-line @typescript-eslint/class-methods-use-this
   handleDisposeModel = ({ scene: e }) => {
     e.traverse((i) => {
-      i instanceof d && i.material.dispose();
+      i instanceof o && i.material.dispose();
     });
   };
   // Plugin method
@@ -98,7 +98,7 @@ class z {
     this.tiles?.removeEventListener("load-model", this.handleLoadModel), this.tiles?.removeEventListener("dispose-model", this.handleDisposeModel);
   }
 }
-class B {
+class z {
   tiles;
   tileCompressionPlugin;
   updateOnChangePlugin;
@@ -110,23 +110,23 @@ class B {
     this.tiles = this._initTilesRenderer(), this.tileCompressionPlugin = this._initTileCompressionPlugin(), this.updateOnChangePlugin = this._initUpdateOnChangePlugin(), this.reorientationPlugin = this._initReorientationPlugin(), this.xyzTilesPlugin = this._initXYZTilesPlugin(), this.tilesFadePlugin = this._initTilesFadePlugin(), this.tileMaterialReplacementPlugin = this._initTileMaterialReplacementPlugin();
   }
   _initTilesRenderer() {
-    const e = new w();
+    const e = new R();
     return e.maxDepth = 20, e.errorTarget = 1, e;
   }
   _initTileCompressionPlugin() {
-    const e = new y();
+    const e = new w();
     return this.tiles.registerPlugin(e), e;
   }
   _initUpdateOnChangePlugin() {
-    const e = new _();
+    const e = new E();
     return this.tiles.registerPlugin(e), e;
   }
   _initReorientationPlugin() {
-    const e = new x();
+    const e = new _();
     return this.tiles.registerPlugin(e), e;
   }
   _initXYZTilesPlugin() {
-    const e = new F({
+    const e = new x({
       center: !0,
       shape: "ellipsoid",
       url: "https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
@@ -134,26 +134,30 @@ class B {
     return this.tiles.registerPlugin(e), e;
   }
   _initTilesFadePlugin() {
-    const e = new N();
+    const e = new I();
     return this.tiles.registerPlugin(e), e;
   }
   _initTileMaterialReplacementPlugin() {
-    const e = new z(P);
+    const e = new N(m);
     return this.tiles.registerPlugin(e), e;
   }
 }
-class J extends B {
+class k extends z {
   viewer;
   loedTilesSets = /* @__PURE__ */ new Set();
   gisOrigin = null;
-  _worldToEllipsoidMatrix = new R();
-  _ellipsoidPosition = new u();
+  _worldToEllipsoidMatrix = new M();
+  _ellipsoidPosition = new d();
   constructor(e) {
     super(), this.viewer = e, this.tiles.addEventListener("needs-render", this.render), this.tiles.addEventListener("needs-update", this.render);
   }
   render = () => {
     this.viewer.render();
   };
+  applyGisOrigin(e, i, s) {
+    const r = l.degToRad(i), n = l.degToRad(e);
+    this.reorientationPlugin.transformLatLonHeightToOrigin(r, n, s), this.gisOrigin = { lon: e, lat: i, height: s }, this.render();
+  }
   beforeRenderHandler = () => {
     this.viewer.camera.updateMatrixWorld(), this.tiles.setCamera(this.viewer.camera), this.tiles.setResolutionFromRenderer(this.viewer.camera, this.viewer.renderer), this.tiles.update();
   };
@@ -165,25 +169,24 @@ class J extends B {
   }
   invalidate(e, i, s) {
     const r = () => {
-      const o = n.degToRad(i), v = n.degToRad(e);
-      this.reorientationPlugin.transformLatLonHeightToOrigin(o, v, s), this.gisOrigin = { lon: e, lat: i, height: s }, this.render(), a();
-    }, a = () => {
+      this.applyGisOrigin(e, i, s), n();
+    }, n = () => {
       this.tiles.removeEventListener("load-root-tileset", r), this.loedTilesSets.delete(r);
     };
-    return this.tiles.addEventListener("load-root-tileset", r), this.loedTilesSets.add(r), this.tiles.root && r(), a;
+    return this.tiles.root || (this.tiles.addEventListener("load-root-tileset", r), this.loedTilesSets.add(r)), this.applyGisOrigin(e, i, s), n;
   }
-  lonLatHeightToPosition(e, i, s = 0, r = new u()) {
-    const a = n.degToRad(i), o = n.degToRad(e);
-    return this.tiles.ellipsoid.getCartographicToPosition(a, o, s, r), this.tiles.group.updateWorldMatrix(!0, !1), r.applyMatrix4(this.tiles.group.matrixWorld);
+  lonLatHeightToPosition(e, i, s = 0, r = new d()) {
+    const n = l.degToRad(i), T = l.degToRad(e);
+    return this.tiles.ellipsoid.getCartographicToPosition(n, T, s, r), this.tiles.group.updateWorldMatrix(!0, !1), r.applyMatrix4(this.tiles.group.matrixWorld);
   }
   positionToLonLatHeight(e, i = { lon: 0, lat: 0, height: 0 }) {
-    return this.tiles.group.updateWorldMatrix(!0, !1), this._worldToEllipsoidMatrix.copy(this.tiles.group.matrixWorld).invert(), this._ellipsoidPosition.copy(e).applyMatrix4(this._worldToEllipsoidMatrix), this.tiles.ellipsoid.getPositionToCartographic(this._ellipsoidPosition, i), i.lon = n.radToDeg(i.lon), i.lat = n.radToDeg(i.lat), i;
+    return this.tiles.group.updateWorldMatrix(!0, !1), this._worldToEllipsoidMatrix.copy(this.tiles.group.matrixWorld).invert(), this._ellipsoidPosition.copy(e).applyMatrix4(this._worldToEllipsoidMatrix), this.tiles.ellipsoid.getPositionToCartographic(this._ellipsoidPosition, i), i.lon = l.radToDeg(i.lon), i.lat = l.radToDeg(i.lat), i;
   }
   dispose() {
     this.disable(), this.loedTilesSets.forEach((e) => this.tiles.removeEventListener("load-root-tileset", e)), this.loedTilesSets.clear(), this.tiles.removeEventListener("needs-render", this.render), this.tiles.removeEventListener("needs-update", this.render), this.tiles.dispose();
   }
 }
 export {
-  J as ArcgisTilesRenderer,
-  B as Globe
+  k as ArcgisTilesRenderer,
+  z as Globe
 };