vis-core 0.30.0-beta.2 → 0.30.0-beta.4

package/dist/index.module.js

@@ -4,7 +4,7 @@ var Yn = Object.getOwnPropertyDescriptors;
 var In = Object.getOwnPropertySymbols, Hn = Object.getPrototypeOf, Un = Object.prototype.hasOwnProperty, Bn = Object.prototype.propertyIsEnumerable, On = Reflect.get;
 var Cn = (o, e) => (e = Symbol[o]) ? e : Symbol.for("Symbol." + o), Dn = (o) => {
   throw TypeError(o);
-}, bn = Math.pow, En = (o, e, n) => e in o ? kn(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, q0 = (o, e) => {
+}, fn = Math.pow, En = (o, e, n) => e in o ? kn(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, q0 = (o, e) => {
   for (var n in e || (e = {}))
     Un.call(e, n) && En(o, n, e[n]);
   if (In)
@@ -63,7 +63,7 @@ import { continentsCountriesIso2 } from "geojson-cn";
 Array.prototype.at || (Array.prototype.at = function(o) {
   return o < 0 && (o = this.length + o), this[o];
 });
-const version = "0.30.0-beta.2", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.30.0-beta.4", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -9120,7 +9120,7 @@ class Mesh extends Object3D {
    */
   raycast(e, n) {
     const r = this.geometry, w = this.material, E = this.matrixWorld;
-    w !== void 0 && (r.boundingSphere === null && r.computeBoundingSphere(), _sphere$6.copy(r.boundingSphere), _sphere$6.applyMatrix4(E), _ray$3.copy(e.ray).recast(e.near), !(_sphere$6.containsPoint(_ray$3.origin) === !1 && (_ray$3.intersectSphere(_sphere$6, _sphereHitAt) === null || _ray$3.origin.distanceToSquared(_sphereHitAt) > bn(e.far - e.near, 2))) && (_inverseMatrix$3.copy(E).invert(), _ray$3.copy(e.ray).applyMatrix4(_inverseMatrix$3), !(r.boundingBox !== null && _ray$3.intersectsBox(r.boundingBox) === !1) && this._computeIntersections(e, n, _ray$3)));
+    w !== void 0 && (r.boundingSphere === null && r.computeBoundingSphere(), _sphere$6.copy(r.boundingSphere), _sphere$6.applyMatrix4(E), _ray$3.copy(e.ray).recast(e.near), !(_sphere$6.containsPoint(_ray$3.origin) === !1 && (_ray$3.intersectSphere(_sphere$6, _sphereHitAt) === null || _ray$3.origin.distanceToSquared(_sphereHitAt) > fn(e.far - e.near, 2))) && (_inverseMatrix$3.copy(E).invert(), _ray$3.copy(e.ray).applyMatrix4(_inverseMatrix$3), !(r.boundingBox !== null && _ray$3.intersectsBox(r.boundingBox) === !1) && this._computeIntersections(e, n, _ray$3)));
   }
   _computeIntersections(e, n, r) {
     let w;
@@ -34280,8 +34280,8 @@ class WebGLRenderer {
       if ((cn.position !== void 0 || cn.normal !== void 0 || cn.color !== void 0) && Ai.update(c0, m0, ji), (Ji || Ei.receiveShadow !== c0.receiveShadow) && (Ei.receiveShadow = c0.receiveShadow, Ui.setValue(o0, "receiveShadow", c0.receiveShadow)), a0.isMeshGouraudMaterial && a0.envMap !== null && (on.envMap.value = N0, on.flipEnvMap.value = N0.isCubeTexture && N0.isRenderTargetTexture === !1 ? -1 : 1), a0.isMeshStandardMaterial && a0.envMap === null && l0.environment !== null && (on.envMapIntensity.value = l0.environmentIntensity), on.dfgLUT !== void 0 && (on.dfgLUT.value = getDFGLUT()), Ji && (Ui.setValue(o0, "toneMappingExposure", wt.toneMappingExposure), Ei.needsLights && mn(on, Di), S0 && a0.fog === !0 && Ti.refreshFogUniforms(on, S0), Ti.refreshMaterialUniforms(on, a0, h0, e0, bt.state.transmissionRenderTarget[jt.id]), WebGLUniforms.upload(o0, Ln(Ei), on, F0)), a0.isShaderMaterial && a0.uniformsNeedUpdate === !0 && (WebGLUniforms.upload(o0, Ln(Ei), on, F0), a0.uniformsNeedUpdate = !1), a0.isSpriteMaterial && Ui.setValue(o0, "center", c0.center), Ui.setValue(o0, "modelViewMatrix", c0.modelViewMatrix), Ui.setValue(o0, "normalMatrix", c0.normalMatrix), Ui.setValue(o0, "modelMatrix", c0.matrixWorld), a0.isShaderMaterial || a0.isRawShaderMaterial) {
         const qi = a0.uniformsGroups;
         for (let ln = 0, Pn = qi.length; ln < Pn; ln++) {
-          const fn = qi[ln];
-          Ri.update(fn, ji), Ri.bind(fn, ji);
+          const bn = qi[ln];
+          Ri.update(bn, ji), Ri.bind(bn, ji);
         }
       }
       return ji;
@@ -34416,8 +34416,8 @@ class WebGLRenderer {
       if (jt.isDepthTexture) {
         const cn = C0.get(jt), qi = C0.get(l0), ln = C0.get(cn.__renderTarget), Pn = C0.get(qi.__renderTarget);
         G0.bindFramebuffer(o0.READ_FRAMEBUFFER, ln.__webglFramebuffer), G0.bindFramebuffer(o0.DRAW_FRAMEBUFFER, Pn.__webglFramebuffer);
-        for (let fn = 0; fn < N0; fn++)
-          Ui && (o0.framebufferTextureLayer(o0.READ_FRAMEBUFFER, o0.COLOR_ATTACHMENT0, C0.get(jt).__webglTexture, c0, $0 + fn), o0.framebufferTextureLayer(o0.DRAW_FRAMEBUFFER, o0.COLOR_ATTACHMENT0, C0.get(l0).__webglTexture, S0, Pi + fn)), o0.blitFramebuffer(k0, B0, M0, R0, bi, Si, M0, R0, o0.DEPTH_BUFFER_BIT, o0.NEAREST);
+        for (let bn = 0; bn < N0; bn++)
+          Ui && (o0.framebufferTextureLayer(o0.READ_FRAMEBUFFER, o0.COLOR_ATTACHMENT0, C0.get(jt).__webglTexture, c0, $0 + bn), o0.framebufferTextureLayer(o0.DRAW_FRAMEBUFFER, o0.COLOR_ATTACHMENT0, C0.get(l0).__webglTexture, S0, Pi + bn)), o0.blitFramebuffer(k0, B0, M0, R0, bi, Si, M0, R0, o0.DEPTH_BUFFER_BIT, o0.NEAREST);
         G0.bindFramebuffer(o0.READ_FRAMEBUFFER, null), G0.bindFramebuffer(o0.DRAW_FRAMEBUFFER, null);
       } else if (c0 !== 0 || jt.isRenderTargetTexture || C0.has(jt)) {
         const cn = C0.get(jt), qi = C0.get(l0);
@@ -37962,7 +37962,7 @@ function geo_delaunay_from(o) {
   const w = [];
   let E = 1;
   for (let ze = 0, Fe = o.length; ze < Fe; ze++) {
-    let ke = bn(o[ze][0], 2) + bn(o[ze][1], 2);
+    let ke = fn(o[ze][0], 2) + fn(o[ze][1], 2);
     !isFinite(ke) || ke > 1e32 ? w.push(ze) : ke > E && (E = ke);
   }
   const O = 1e6 * sqrt(E);
@@ -40411,7 +40411,7 @@ function _populateBuffer(o, e) {
   }
 }
 function generateIndirectBuffer(o, e) {
-  const n = (o.index ? o.index.count : o.attributes.position.count) / 3, r = n > bn(2, 16), w = r ? 4 : 2, E = e ? new SharedArrayBuffer(n * w) : new ArrayBuffer(n * w), O = r ? new Uint32Array(E) : new Uint16Array(E);
+  const n = (o.index ? o.index.count : o.attributes.position.count) / 3, r = n > fn(2, 16), w = r ? 4 : 2, E = e ? new SharedArrayBuffer(n * w) : new ArrayBuffer(n * w), O = r ? new Uint32Array(E) : new Uint16Array(E);
   for (let j = 0, le = O.length; j < le; j++)
     O[j] = j;
   return O;
@@ -60056,7 +60056,7 @@ const l = {
   let w = o.clone().add(e);
   w = w.normalize().multiplyScalar(n);
   let E;
-  r <= 1 ? E = n / 5 * r : r > 1 && r < 2 ? E = n / 5 * bn(r, 2) : E = n / 5 * bn(r, 1.5);
+  r <= 1 ? E = n / 5 * r : r > 1 && r < 2 ? E = n / 5 * fn(r, 2) : E = n / 5 * fn(r, 1.5);
   const O = o.clone().add(w).normalize().multiplyScalar(n + E), j = e.clone().add(w).normalize().multiplyScalar(n + E);
   return new CubicBezierCurve3(o, O, j, e);
 }, createFlyPath2 = (o, e, n = 40) => {
@@ -144677,15 +144677,38 @@ const objs$1 = Bi(q0({}, objs$3), {
       const le = n();
       if (!le.length) return;
       this.pencil.controls.getPosition(E, !1);
-      const fe = w.clone().sub(E), Se = Math.sqrt(
-        Math.pow(fe.length(), 2) - Math.pow(O, 2)
-      ), ze = le.map((Fe) => Fe.position.clone().sub(E).length() > Se);
+      const fe = w.clone().sub(E), Se = Math.sqrt(fn(fe.length(), 2) - fn(O, 2)), ze = le.map((Fe) => Fe.position.clone().sub(E).length() > Se);
       r(le, ze);
     };
     j(), this.pencil.controls.addEventListener("update", () => {
       j();
     });
   }
+  /**
+   * 设置物体在球面上的位置和旋转，使其垂直于球面
+   * @param object - 要设置的物体
+   * @param location - 经纬度 [经度, 纬度]
+   * @param height - 距离球面的高度，默认为0
+   * @param upAxis - 物体的up轴方向，默认为Y轴 [0, 1, 0]
+   */
+  setObjectOnSphere(n, r, w = 0, E = [0, 1, 0]) {
+    if (n.objectType === "Plane") {
+      const O = this.getLocationPosition(r, w);
+      n.position.set(...O);
+      const j = n.object3d.material;
+      j && (j.side = DoubleSide), n.object3d.lookAt(0, 0, 0);
+    } else {
+      const O = n.rotation.clone(), j = this.getLocationPosition(r, w);
+      n.position.set(...j);
+      const le = new Vector3(...j).normalize(), fe = new Vector3(...E);
+      fe.applyEuler(O);
+      const Se = new Quaternion().setFromUnitVectors(
+        fe,
+        le
+      );
+      n.object3d.applyQuaternion(Se);
+    }
+  }
 };
 v0(wn, "VisName", "earth");
 let index$1 = wn;
@@ -145993,6 +146016,16 @@ const getLabelElement = (o) => {
     const [r, w] = n, [E, O] = this.projection([r, w]);
     return [E, -O, this.mapObj ? this.mapObj.z + this.mapObj.depth : 0];
   }
+  /**
+   * 设置物体在平面地图上的位置
+   * @param object - 要设置的物体
+   * @param location - 经纬度 [经度, 纬度]
+   * @param height - 距离地图平面的高度，默认为0
+   */
+  setObjectOnMap(n, r, w = 0) {
+    const E = this.getLocationPosition(r);
+    n.position.set(E[0], E[1], E[2] + w);
+  }
   getAdcodeScreenPosition(n) {
     const r = this.geAdcodePosition(n);
     if (r) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.30.0-beta.2";
+declare const _default: "0.30.0-beta.4";
 export default _default;

package/dist/vis/earth/index.d.ts

@@ -1,9 +1,9 @@
-import Base, { BaseOptions } from "../base";
+import Base, { type BaseOptions } from "../base";
 import leadObjs from "./objects";
-import { BaseObject, Lead } from 'gl-draw';
+import type { BaseObject, Lead } from 'gl-draw';
 import { MeshLineMaterial } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
-import PlaneMap from '../map/objects/PlaneMap';
+import type PlaneMap from '../map/objects/PlaneMap';
 interface EarthOptions extends BaseOptions {
     mapDepth?: number;
     otherMapDepth?: number;
@@ -74,5 +74,13 @@ export default class extends Base {
     }): Promise<PlaneMap | undefined>;
     getRadius(): number;
     checkBehindEarth(objArr: () => BaseObject[], cb: (obj: BaseObject[], res: boolean[]) => any): void;
+    /**
+     * 设置物体在球面上的位置和旋转，使其垂直于球面
+     * @param object - 要设置的物体
+     * @param location - 经纬度 [经度, 纬度]
+     * @param height - 距离球面的高度，默认为0
+     * @param upAxis - 物体的up轴方向，默认为Y轴 [0, 1, 0]
+     */
+    setObjectOnSphere(baseObject: BaseObject, location: [number, number], height?: number, upAxis?: [number, number, number]): void;
 }
 export {};

package/dist/vis/map/index.d.ts

@@ -219,6 +219,13 @@ export default class extends Base {
     eraseLabels(): void;
     geAdcodePosition(adcode: number): [number, number, number] | undefined;
     getLocationPosition(location: [number, number]): [number, number, number];
+    /**
+     * 设置物体在平面地图上的位置
+     * @param object - 要设置的物体
+     * @param location - 经纬度 [经度, 纬度]
+     * @param height - 距离地图平面的高度，默认为0
+     */
+    setObjectOnMap(object: BaseObject, location: [number, number], height?: number): void;
     getAdcodeScreenPosition(adcode: number): {
         x: number;
         y: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.30.0-beta.2",
+  "version": "0.30.0-beta.4",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",