@terra.gl/core 0.0.1-alpha.44 → 0.0.1-alpha.45

package/dist/index.d.ts

@@ -5614,6 +5614,8 @@ declare class Map extends Map_base {
         private _createCamera;
         /**
          * 创建地图控制器
+         * @param minDistance 最小缩放距离
+         * @param maxDistance 最大缩放距离
          * @returns 控制器对象
          */
         private _createControls;
@@ -5827,6 +5829,10 @@ declare class Map extends Map_base {
             /** 触发辉光的亮度阈值，对应 UnrealBloomPass 的 threshold */
             threshold?: number;
         };
+        /** 控制器最小缩放距离（相机能靠多近），默认为 100 */
+        minDistance?: number;
+        /** 控制器最大缩放距离（相机能拉多远），默认为 60000 */
+        maxDistance?: number;
     };
 
     export declare function waitFor(condition: boolean, delay?: number): Promise<void>;

package/dist/index.js

@@ -1,6 +1,6 @@
 import * as pt from "three";
 import { REVISION as qd, TrianglesDrawMode as k_, TriangleFanDrawMode as Kl, TriangleStripDrawMode as ef, Mesh as Ie, Vector3 as O, Color as ce, FrontSide as jo, Plane as tf, Matrix4 as Me, Vector4 as yn, PerspectiveCamera as jr, WebGLRenderTarget as xi, UniformsUtils as $r, UniformsLib as No, ShaderMaterial as Zn, MOUSE as cr, TOUCH as ur, Spherical as Bh, Quaternion as fn, OrthographicCamera as Ti, Vector2 as de, Ray as U_, PlaneGeometry as Jr, HalfFloatType as Ur, AdditiveBlending as oc, MeshBasicMaterial as pn, RGBAFormat as nf, LinearFilter as vr, NoBlending as N_, Clock as Jo, Loader as ac, LoaderUtils as Si, FileLoader as wr, MeshPhysicalMaterial as Gn, SpotLight as rf, PointLight as kl, DirectionalLight as Yo, InstancedMesh as lc, InstancedBufferAttribute as Ul, Object3D as mn, TextureLoader as Qo, ImageBitmapLoader as Y_, BufferAttribute as xt, InterleavedBuffer as H_, InterleavedBufferAttribute as Nr, LinearMipmapLinearFilter as bs, NearestMipmapLinearFilter as B_, LinearMipmapNearestFilter as j_, NearestMipmapNearestFilter as J_, NearestFilter as sf, RepeatWrapping as vn, MirroredRepeatWrapping as Q_, ClampToEdgeWrapping as Nl, PointsMaterial as $o, Material as yl, LineBasicMaterial as of, MeshStandardMaterial as xs, DoubleSide as Wi, PropertyBinding as ws, BufferGeometry as en, SkinnedMesh as af, LineSegments as $_, Line as lf, LineLoop as q_, Points as Gi, Group as gn, MathUtils as yt, Skeleton as cf, AnimationClip as uf, Bone as Yl, InterpolateDiscrete as eb, InterpolateLinear as hf, Texture as Zi, VectorKeyframeTrack as Hl, NumberKeyframeTrack as Bl, QuaternionKeyframeTrack as jl, Interpolant as tb, Box3 as qr, Sphere as cc, Curve as nb, MeshPhongMaterial as gs, MeshLambertMaterial as df, EquirectangularReflectionMapping as rb, AmbientLight as ff, Float32BufferAttribute as hr, Uint16BufferAttribute as ib, Matrix3 as sb, Euler as us, DataTextureLoader as ob, FloatType as Ko, DataUtils as _o, InstancedBufferGeometry as pf, InstancedInterleavedBuffer as Jl, WireframeGeometry as ab, Line3 as lb, EventDispatcher as mf, Scene as cb, FogExp2 as jh, CubeTextureLoader as ub, WebGLRenderer as hb, PCFSoftShadowMap as db, ACESFilmicToneMapping as fb, SRGBColorSpace as qo, CameraHelper as pb, CubicBezierCurve3 as mb, Frustum as gb, Raycaster as uc, CanvasTexture as Ts, SpriteMaterial as Ss, Sprite as ei, DynamicDrawUsage as Jh, NormalBlending as gf, CurvePath as yf, LineCurve3 as Li, QuadraticBezierCurve3 as vf, TubeGeometry as yb, BackSide as vb, Shape as wb, ShapeGeometry as _b, CylinderGeometry as bb, AnimationMixer as xb, LoopRepeat as Tb, LoopOnce as Sb, LoadingManager as Lb, Box2 as Mb, ImageLoader as wf } from "three";
-const Pb = "0.0.1-alpha.44", vl = {
+const Pb = "0.0.1-alpha.45", vl = {
   name: "Criska"
 };
 var ys = function() {
@@ -6199,33 +6199,33 @@ class P1 extends mf {
    * @param options 配置选项
    */
   constructor(e, t = {}) {
-    super(), Fe(this, "scene"), Fe(this, "renderer"), Fe(this, "camera"), Fe(this, "controls"), Fe(this, "ambLight"), Fe(this, "dirLight"), Fe(this, "auxDirLight"), Fe(this, "clouds", null), Fe(this, "container"), Fe(this, "_clock", new Jo()), Fe(this, "stats"), Fe(this, "_animationCallbacks", /* @__PURE__ */ new Set()), Fe(this, "_fogFactor", 1), Fe(this, "_sceneSize", 5e4 * 2), Fe(this, "gorund"), Fe(this, "map"), Fe(this, "centerPostion"), Fe(this, "_isInteracting", !1), Fe(this, "debug", !1), Fe(this, "flyTween", null), Fe(this, "composer"), Fe(this, "renderPass"), Fe(this, "bloomPass"), Fe(this, "calculateCameraPosition", (d, p, f, g) => {
-      const y = new O(
+    super(), Fe(this, "scene"), Fe(this, "renderer"), Fe(this, "camera"), Fe(this, "controls"), Fe(this, "ambLight"), Fe(this, "dirLight"), Fe(this, "auxDirLight"), Fe(this, "clouds", null), Fe(this, "container"), Fe(this, "_clock", new Jo()), Fe(this, "stats"), Fe(this, "_animationCallbacks", /* @__PURE__ */ new Set()), Fe(this, "_fogFactor", 1), Fe(this, "_sceneSize", 5e4 * 2), Fe(this, "gorund"), Fe(this, "map"), Fe(this, "centerPostion"), Fe(this, "_isInteracting", !1), Fe(this, "debug", !1), Fe(this, "flyTween", null), Fe(this, "composer"), Fe(this, "renderPass"), Fe(this, "bloomPass"), Fe(this, "calculateCameraPosition", (f, g, y, w) => {
+      const _ = new O(
         0,
         // X分量
-        p * Math.cos(f),
+        g * Math.cos(y),
         // Y分量
-        p * Math.sin(f)
+        g * Math.sin(y)
         // Z分量  <-- 这里改成正号
       );
-      return y.applyAxisAngle(new O(0, 1, 0), g), new O(
-        d.x + y.x,
-        d.y + y.y,
-        d.z + y.z
+      return _.applyAxisAngle(new O(0, 1, 0), w), new O(
+        f.x + _.x,
+        f.y + _.y,
+        f.z + _.z
       );
     });
-    const { antialias: n = !1, stencil: r = !0, logarithmicDepthBuffer: o = !0, skybox: l, map: c, bloom: u } = t;
-    if (this.map = c, this.centerPostion = this.map.geo2world(new O(this.map.center[0], this.map.center[1], 0)), this.renderer = this._createRenderer(n, r, o), this.scene = this._createScene(l), this.camera = this._createCamera(), e && this.addTo(e), this.controls = this._createControls(), this.ambLight = this._createAmbLight(), this.scene.add(this.ambLight), this.dirLight = this._createDirLight(), this.scene.add(this.dirLight), this.scene.add(this.dirLight.target), this.auxDirLight = this._createAuxDirLight(), this.gorund = this._createGorund(), this.scene.add(this.gorund), u && u.enabled) {
-      const d = this.renderer.getPixelRatio(), p = this.container ? this.width : window.innerWidth, f = this.container ? this.height : window.innerHeight, g = p * d, y = f * d, w = new xi(g, y, {
+    const { antialias: n = !1, stencil: r = !0, logarithmicDepthBuffer: o = !0, skybox: l, map: c, bloom: u, minDistance: d, maxDistance: p } = t;
+    if (this.map = c, this.centerPostion = this.map.geo2world(new O(this.map.center[0], this.map.center[1], 0)), this.renderer = this._createRenderer(n, r, o), this.scene = this._createScene(l), this.camera = this._createCamera(), e && this.addTo(e), this.controls = this._createControls(d, p), this.ambLight = this._createAmbLight(), this.scene.add(this.ambLight), this.dirLight = this._createDirLight(), this.scene.add(this.dirLight), this.scene.add(this.dirLight.target), this.auxDirLight = this._createAuxDirLight(), this.gorund = this._createGorund(), this.scene.add(this.gorund), u && u.enabled) {
+      const f = this.renderer.getPixelRatio(), g = this.container ? this.width : window.innerWidth, y = this.container ? this.height : window.innerHeight, w = g * f, _ = y * f, b = new xi(w, _, {
         format: nf
       });
-      w.samples = 4, this.composer = new hx(this.renderer, w), this.renderPass = new px(this.scene, this.camera), this.composer.addPass(this.renderPass);
-      const _ = u?.strength ?? 1.5, b = u?.radius ?? 1, S = u?.threshold ?? 0.7;
+      b.samples = 4, this.composer = new hx(this.renderer, b), this.renderPass = new px(this.scene, this.camera), this.composer.addPass(this.renderPass);
+      const S = u?.strength ?? 1.5, x = u?.radius ?? 1, M = u?.threshold ?? 0.7;
       this.bloomPass = new sx(
-        new de(g, y),
-        _,
-        b,
-        S
+        new de(w, _),
+        S,
+        x,
+        M
       ), this.composer.addPass(this.bloomPass);
     }
     this.renderer.setAnimationLoop(this.animate.bind(this)), this.debug = t.debug || !1, this.flyTween = null, this.debug && (this.stats = new ys(), document.body.appendChild(this.stats.dom));
@@ -6379,37 +6379,39 @@ class P1 extends mf {
   }
   /**
    * 创建地图控制器
+   * @param minDistance 最小缩放距离
+   * @param maxDistance 最大缩放距离
    * @returns 控制器对象
    */
-  _createControls() {
-    const e = new Qb(this.camera, this.renderer.domElement), t = Math.PI / 2.1;
-    return e.screenSpacePanning = !1, e.minDistance = 0.1, e.maxDistance = 3e4 * 2, e.maxPolarAngle = t, e.enableDamping = !0, e.dampingFactor = 0.08, e.keyPanSpeed = 1, e.listenToKeyEvents(this.renderer.domElement), e.addEventListener("change", () => {
-      const n = Math.max(e.getPolarAngle(), 0.1), r = Math.max(e.getDistance(), 100);
-      e.zoomSpeed = Math.max(Math.log(r / 1e3), 1) + 3;
-      const o = 3e5 * 2;
-      e.maxDistance > o * 0.95 && (e.maxDistance = o * 0.95), this.camera.far = yt.clamp(r / n * 8, 100, o), this.camera.near = yt.clamp(this.camera.far / 1e3, 1e-3, 1), this.camera.updateProjectionMatrix(), this.scene.fog instanceof jh && (this.scene.fog.density = n / (r + 5) * this.fogFactor * 0.1);
-      const c = r > 6e4;
-      e.minAzimuthAngle = c ? 0 : -1 / 0, e.maxAzimuthAngle = c ? 0 : 1 / 0, e.maxPolarAngle = S1(e.getDistance(), 0, 7e4, t, 0), this.map?.trigger("control-change", {
+  _createControls(e, t) {
+    const n = new Qb(this.camera, this.renderer.domElement), r = Math.PI / 2.1;
+    return n.screenSpacePanning = !1, n.minDistance = e ?? 0.1, n.maxDistance = t ?? 6e4, n.maxPolarAngle = r, n.enableDamping = !0, n.dampingFactor = 0.08, n.keyPanSpeed = 1, n.listenToKeyEvents(this.renderer.domElement), n.addEventListener("change", () => {
+      const o = Math.max(n.getPolarAngle(), 0.1), l = Math.max(n.getDistance(), 100);
+      n.zoomSpeed = Math.max(Math.log(l / 1e3), 1) + 3;
+      const c = 3e5 * 2;
+      n.maxDistance > c * 0.95 && (n.maxDistance = c * 0.95), this.camera.far = yt.clamp(l / o * 8, 100, c), this.camera.near = yt.clamp(this.camera.far / 1e3, 1e-3, 1), this.camera.updateProjectionMatrix(), this.scene.fog instanceof jh && (this.scene.fog.density = o / (l + 5) * this.fogFactor * 0.1);
+      const d = l > 6e4;
+      n.minAzimuthAngle = d ? 0 : -1 / 0, n.maxAzimuthAngle = d ? 0 : 1 / 0, n.maxPolarAngle = S1(n.getDistance(), 0, 7e4, r, 0), this.map?.trigger("control-change", {
         type: "control-change",
-        control: e,
+        control: n,
         camera: this.camera,
         target: this.map
       });
-    }), e.addEventListener("start", () => {
+    }), n.addEventListener("start", () => {
       this._isInteracting = !0, this.map?.trigger("control-start", {
         type: "control-start",
-        control: e,
+        control: n,
         camera: this.camera,
         target: this.map
       });
-    }), e.addEventListener("end", () => {
+    }), n.addEventListener("end", () => {
       this._isInteracting = !1, this.map?.trigger("control-end", {
         type: "control-end",
-        control: e,
+        control: n,
         camera: this.camera,
         target: this.map
       });
-    }), e;
+    }), n;
   }
   /**
    * 创建环境光
@@ -17219,7 +17221,7 @@ function lM(i, e) {
 }
 const cM = `{
 	"name": "@terra.gl/core",
-	"version": "0.0.1-alpha.44",
+	"version": "0.0.1-alpha.45",
 	"type": "module",
 	"files": [
 		"dist"
@@ -20376,7 +20378,7 @@ let Ei = class yp extends pc(
       let y = g.object, w = null;
       for (; y; ) {
         if (y instanceof Nn) {
-          w = y;
+          w = y, console.log(w, "feature ------------------- ");
           break;
         }
         y = y.parent;