@aibee/crc-bmap 0.0.128 → 0.0.129

package/lib/bmap.esm.js

@@ -454,7 +454,7 @@ var require_Graph = __commonJS({
 });
 
 // src/bmap.ts
-import { EventDispatcher as EventDispatcher7, Vector3 as Vector319 } from "three";
+import { EventDispatcher as EventDispatcher7, Vector3 as Vector318 } from "three";
 
 // src/utils/timer.ts
 var Timer = class {
@@ -2013,7 +2013,7 @@ function toWebWorker(obj) {
 import {
   EventDispatcher as EventDispatcher6,
   Box2,
-  Vector3 as Vector318,
+  Vector3 as Vector317,
   Vector2 as Vector26,
   Raycaster as Raycaster3,
   Box3 as Box39,
@@ -4015,16 +4015,29 @@ var Wall = class extends Object3D9 {
 };
 
 // src/elements/ground-texture.ts
-import { ExtrudeGeometry as ExtrudeGeometry3, Mesh as Mesh5, Object3D as Object3D10 } from "three";
+import {
+  DoubleSide as DoubleSide3,
+  Float32BufferAttribute,
+  Mesh as Mesh5,
+  MeshBasicMaterial as MeshBasicMaterial3,
+  Object3D as Object3D10,
+  ShapeGeometry
+} from "three";
+import { mergeGeometries as mergeGeometries2 } from "three/examples/jsm/utils/BufferGeometryUtils";
 var defaultOptions3 = {
   uuid: "",
   iconUrl: "",
   name: "",
-  secondRotate: 0,
   airHeight: 0,
   deltaHeight: 0,
   height: 0,
-  geometry: { cds: [], type: "polygon", coords: [], curveCpt: [], curveIndex: [] },
+  geometry: {
+    cds: [],
+    type: "polygon",
+    coords: [],
+    curveCpt: [],
+    curveIndex: []
+  },
   opacity: 1,
   visible: true
 };
@@ -4032,43 +4045,46 @@ var GroundTexture = class extends Object3D10 {
   constructor(context, options) {
     super();
     this.context = context;
-    this.options = proxyOptions(
-      { ...defaultOptions3, ...options },
-      this
-    );
+    this.options = options.map((item) => ({ ...defaultOptions3, ...item }));
     this.init();
   }
   options;
   mesh;
   async init() {
-    const { deltaHeight, airHeight, geometry, iconUrl, opacity } = this.options;
-    const shape = initShape(
-      geometry.coords[0],
-      geometry.coords.slice(1)
-    );
-    const extrudeGeometry = new ExtrudeGeometry3(shape, {
-      steps: 1,
-      bevelEnabled: false,
-      depth: 0,
-      curveSegments: 4
-    });
-    const planeMaterial = await this.context.materialFactory.createGroundTextureMaterial({
-      url: iconUrl,
-      opacity
+    const geometries = this.options.map((options) => {
+      const { geometry: geometry2 } = options;
+      const shape = initShape(geometry2.coords[0], geometry2.coords.slice(1));
+      const shapeGeometry = new ShapeGeometry(shape, 4);
+      const uvs = [1, 1, 0, 1, 0, 0, 1, 0];
+      shapeGeometry.setAttribute("uv", new Float32BufferAttribute(uvs, 2));
+      return shapeGeometry;
     });
-    const mesh = new Mesh5(extrudeGeometry, planeMaterial);
+    const geometry = mergeGeometries2(geometries, true);
+    geometries.forEach((geometry2) => geometry2.dispose());
+    const materials = await Promise.all(this.options.map(async (option) => {
+      const { iconUrl } = option;
+      const texture = await this.context.textureFactory.getTexture(iconUrl);
+      const material = new MeshBasicMaterial3({
+        map: texture,
+        alphaTest: 0.2,
+        side: DoubleSide3
+      });
+      return material;
+    }));
+    const mesh = new Mesh5(geometry, materials);
     this.mesh = mesh;
-    this.mesh.position.z = airHeight + deltaHeight;
+    this.position.z += 4e-3;
     this.add(mesh);
   }
   dispose() {
     this.mesh?.geometry.dispose();
+    (this.mesh?.material).forEach((item) => item.dispose());
     this.clear();
   }
 };
 
 // src/elements/glb-model.ts
-import { Box3 as Box37, Object3D as Object3D11, Vector3 as Vector312 } from "three";
+import { Box3 as Box37, Object3D as Object3D11, Vector3 as Vector311 } from "three";
 var defaultGlbOptions = {
   url: "",
   geometry: { type: "polygon", cds: [], coords: [], curveCpt: [], curveIndex: [] },
@@ -4076,7 +4092,9 @@ var defaultGlbOptions = {
   width: 0,
   rotate: 1,
   airHeight: 1,
-  deltaHeight: 0
+  deltaHeight: 0,
+  center_x: 0,
+  center_y: 0
 };
 var GlbModel = class extends Object3D11 {
   constructor(context, options) {
@@ -4091,13 +4109,12 @@ var GlbModel = class extends Object3D11 {
     const object = await loadModel(this.options.url);
     object.scene.rotation.set(Math.PI / 2, 0, 0);
     const box = new Box37().setFromObject(object.scene);
-    const size = box.getSize(new Vector312());
+    const size = box.getSize(new Vector311());
     const max = Math.max(size.x, size.y);
     const scale = this.options.width / max;
     this.scale.set(scale, scale, scale);
     this.add(object.scene);
-    const center2 = getCenter(this.options.geometry.coords[0]);
-    this.position.set(center2[0], center2[1], 0);
+    this.position.set(this.options.center_x, this.options.center_y, 0);
     this.position.z += this.options.airHeight + this.options.deltaHeight;
     this.model = object;
     this.rotateZ(this.options.rotate);
@@ -4109,8 +4126,8 @@ var GlbModel = class extends Object3D11 {
 };
 
 // src/elements/lane.ts
-import { BufferGeometry as BufferGeometry3, LineSegments as LineSegments3, Mesh as Mesh6, Object3D as Object3D12, ShapeGeometry, Vector3 as Vector313 } from "three";
-import { mergeGeometries as mergeGeometries2 } from "three/examples/jsm/utils/BufferGeometryUtils";
+import { BufferGeometry as BufferGeometry3, LineSegments as LineSegments3, Mesh as Mesh6, Object3D as Object3D12, ShapeGeometry as ShapeGeometry2, Vector3 as Vector312 } from "three";
+import { mergeGeometries as mergeGeometries3 } from "three/examples/jsm/utils/BufferGeometryUtils";
 import { Line2 } from "three/examples/jsm/lines/Line2";
 import { LineGeometry } from "three/examples/jsm/lines/LineGeometry";
 var Lane = class extends Object3D12 {
@@ -4129,16 +4146,17 @@ var Lane = class extends Object3D12 {
   lineGeometry;
   Mesh;
   LineMesh;
+  doubleLines = [];
   initGeometry() {
     const geometries = this.options.map((option) => {
       const shape = initShape(
         option.geometry.coords[0].slice(0, -1),
         option.geometry.coords.slice(1)
       );
-      const geometry = new ShapeGeometry(shape, 4);
+      const geometry = new ShapeGeometry2(shape, 4);
       return geometry;
     });
-    this.geometry = mergeGeometries2(geometries);
+    this.geometry = mergeGeometries3(geometries);
     geometries.forEach((item) => item.dispose());
   }
   initMaterial() {
@@ -4169,8 +4187,8 @@ var Lane = class extends Object3D12 {
       for (let i = 0; i < curCds.length; i++) {
         const cur = curCds[i];
         const next = i + 1 === curCds.length ? curCds[0] : curCds[i + 1];
-        points.push(new Vector313(cur[0], cur[1], _height));
-        points.push(new Vector313(next[0], next[1], _height));
+        points.push(new Vector312(cur[0], cur[1], _height));
+        points.push(new Vector312(next[0], next[1], _height));
       }
     }
     return points;
@@ -4190,13 +4208,13 @@ var Lane = class extends Object3D12 {
       }
       return obj;
     }, {});
-    Object.values(group).map((options2) => {
+    this.doubleLines = Object.values(group).map((options2) => {
       const material = this.context.materialFactory.createLine2MaterialMap({
         color: options2[0].secondColor,
         width: 0.2,
         dashed: options2[0].dashed
       });
-      options2.map((option) => {
+      return options2.map((option) => {
         const geometry = new LineGeometry();
         const vec = option.geometry.otherCoords[1].map((item) => [...item, 0]).flat(2);
         geometry.setPositions(vec);
@@ -4204,15 +4222,16 @@ var Lane = class extends Object3D12 {
         line.computeLineDistances();
         line.position.z += 1e-3;
         this.add(line);
+        return line;
       });
-    });
+    }).flat(2);
   }
   initLineGeometry() {
     const geometries = this.options.map((option) => {
       const points = this.getBorderPoints(option);
       return new BufferGeometry3().setFromPoints(points);
     });
-    this.lineGeometry = mergeGeometries2(geometries);
+    this.lineGeometry = mergeGeometries3(geometries);
   }
   createBorder() {
     const line = new LineSegments3(this.lineGeometry, this.lineMaterial);
@@ -4234,6 +4253,7 @@ var Lane = class extends Object3D12 {
   dispose() {
     this.geometry?.dispose();
     this.lineGeometry?.dispose();
+    this.doubleLines.map((item) => item.geometry.dispose());
     this.clear();
   }
 };
@@ -4241,15 +4261,15 @@ var Lane = class extends Object3D12 {
 // src/elements/merge-graphic.ts
 import {
   Object3D as Object3D13,
-  ExtrudeGeometry as ExtrudeGeometry5,
+  ExtrudeGeometry as ExtrudeGeometry3,
   Mesh as Mesh7,
-  Vector3 as Vector314,
+  Vector3 as Vector313,
   BufferGeometry as BufferGeometry4,
   LineSegments as LineSegments4,
   ShaderMaterial as ShaderMaterial3,
   Color as Color4
 } from "three";
-import { mergeGeometries as mergeGeometries3 } from "three/examples/jsm/utils/BufferGeometryUtils";
+import { mergeGeometries as mergeGeometries4 } from "three/examples/jsm/utils/BufferGeometryUtils";
 var MergeGraphic = class extends Object3D13 {
   constructor(context, options) {
     super();
@@ -4279,7 +4299,7 @@ var MergeGraphic = class extends Object3D13 {
         option.geometry.coords[0],
         option.geometry.coords.slice(1)
       );
-      const geometry2 = new ExtrudeGeometry5(shape, {
+      const geometry2 = new ExtrudeGeometry3(shape, {
         steps: 1,
         bevelEnabled: false,
         depth: option.height,
@@ -4287,7 +4307,7 @@ var MergeGraphic = class extends Object3D13 {
       });
       return geometry2;
     });
-    const geometry = mergeGeometries3(geometries);
+    const geometry = mergeGeometries4(geometries);
     geometries.forEach((geometry2) => geometry2.dispose());
     return geometry;
   }
@@ -4371,8 +4391,8 @@ var MergeGraphic = class extends Object3D13 {
         for (let i = 0; i < curCds.length; i++) {
           const cur = curCds[i];
           const next = i + 1 === curCds.length ? curCds[0] : curCds[i + 1];
-          points.push(new Vector314(cur[0], cur[1], height));
-          points.push(new Vector314(next[0], next[1], height));
+          points.push(new Vector313(cur[0], cur[1], height));
+          points.push(new Vector313(next[0], next[1], height));
         }
       }
     });
@@ -4769,7 +4789,7 @@ import {
   MeshStandardMaterial as MeshStandardMaterial2,
   MeshBasicMaterial as MeshBasicMaterial5,
   ShaderMaterial as ShaderMaterial4,
-  DoubleSide as DoubleSide3,
+  DoubleSide as DoubleSide4,
   Vector2 as Vector25
 } from "three";
 function vectorToString(vector) {
@@ -4913,7 +4933,7 @@ var MaterialFactory = class {
       },
       vertexShader,
       fragmentShader,
-      side: DoubleSide3
+      side: DoubleSide4
     });
     this.shaderMaterialMap.set(key, material);
     return material;
@@ -4926,9 +4946,10 @@ var MaterialFactory = class {
     const texture = await this.context.textureFactory.getTexture(url);
     const material = new MeshBasicMaterial5({
       map: texture,
-      transparent: true,
-      opacity
+      alphaTest: 0.2,
+      side: DoubleSide4
     });
+    texture.needsUpdate = true;
     this.groundTextureMaterialMap.set(key, material);
     return material;
   }
@@ -4980,7 +5001,7 @@ var MaterialFactory = class {
 };
 
 // src/utils/camera-bound.ts
-import { Box3 as Box38, Vector3 as Vector317 } from "three";
+import { Box3 as Box38, Vector3 as Vector316 } from "three";
 var CameraBound = class {
   constructor(context) {
     this.context = context;
@@ -4988,9 +5009,9 @@ var CameraBound = class {
     this.changePrevCamera();
   }
   prevCamera = {
-    position: new Vector317(),
+    position: new Vector316(),
     zoom: 1,
-    target: new Vector317()
+    target: new Vector316()
   };
   enable = true;
   setEnable(enable) {
@@ -5032,8 +5053,8 @@ var CameraBound = class {
     const { min, max } = box;
     const lb = vector3ToDevice(min, camera, w, h);
     const rt = vector3ToDevice(max, camera, w, h);
-    const lt = vector3ToDevice(new Vector317(min.x, max.y, max.z), camera, w, h);
-    const rb = vector3ToDevice(new Vector317(max.x, min.y, min.z), camera, w, h);
+    const lt = vector3ToDevice(new Vector316(min.x, max.y, max.z), camera, w, h);
+    const rb = vector3ToDevice(new Vector316(max.x, min.y, min.z), camera, w, h);
     const left = Math.min(lb.x, rt.x, lt.x, rb.x);
     const right = Math.max(lb.x, rt.x, lt.x, rb.x);
     const top = Math.min(lb.y, rt.y, lt.y, rb.y);
@@ -5083,13 +5104,20 @@ var TextureFactory = class {
     if (this.textureMap.has(url)) {
       return this.textureMap.get(url);
     }
-    const texture = await this.loader.loadAsync(url);
-    this.textureMap.set(url, texture);
-    return texture;
+    const texturePromise = this.loader.loadAsync(url).then((texture) => {
+      this.textureMap.set(url, texture);
+      return texture;
+    });
+    this.textureMap.set(url, texturePromise);
+    return texturePromise;
   }
   dispose() {
     this.textureMap.forEach((texture) => {
-      texture.dispose();
+      if (texture instanceof Promise) {
+        texture.then((res) => res.dispose());
+      } else {
+        texture.dispose();
+      }
     });
     this.textureMap.clear();
   }
@@ -5163,7 +5191,7 @@ var Context = class extends EventDispatcher6 {
   /**
    * 获取两个点之间的像素数
    */
-  getRatio(point1 = new Vector318(0, 0, 0), point22 = new Vector318(100, 0, 0)) {
+  getRatio(point1 = new Vector317(0, 0, 0), point22 = new Vector317(100, 0, 0)) {
     const { clientWidth, clientHeight } = this.container;
     const device1 = vector3ToDevice(point1, this.camera, clientWidth, clientHeight);
     const device2 = vector3ToDevice(point22, this.camera, clientWidth, clientHeight);
@@ -5364,7 +5392,7 @@ var Context = class extends EventDispatcher6 {
     );
   }
   getCameraLookAt() {
-    return new Vector318().subVectors(this.control.target, this.camera.position);
+    return new Vector317().subVectors(this.control.target, this.camera.position);
   }
   /**
    * 按照一个中心点设置相机的放大缩小
@@ -5419,10 +5447,10 @@ var Context = class extends EventDispatcher6 {
     const boundingBox = new Box39().setFromObject(object);
     this.setPolarAngle(polar, 0);
     const { max, min } = boundingBox;
-    const leftTop = new Vector318(min.x, max.y, max.z);
-    const rightTop = new Vector318(max.x, max.y, max.z);
-    const rightBottom = new Vector318(max.x, min.y, min.z);
-    const leftBottom = new Vector318(min.x, min.y, min.z);
+    const leftTop = new Vector317(min.x, max.y, max.z);
+    const rightTop = new Vector317(max.x, max.y, max.z);
+    const rightBottom = new Vector317(max.x, min.y, min.z);
+    const leftBottom = new Vector317(min.x, min.y, min.z);
     const leftTop2d = vector3ToDevice(leftTop, this.camera, width, height);
     const rightTop2d = vector3ToDevice(rightTop, this.camera, width, height);
     const leftBottom2d = vector3ToDevice(leftBottom, this.camera, width, height);
@@ -5437,7 +5465,7 @@ var Context = class extends EventDispatcher6 {
     const xScale = (width - right - left) / size.x;
     const yScale = (height - top - bottom) / size.y;
     const scale = Math.min(xScale, yScale);
-    const center2 = new Vector318((max.x + min.x) / 2, (max.y + min.y) / 2, (max.z + min.z) / 2);
+    const center2 = new Vector317((max.x + min.x) / 2, (max.y + min.y) / 2, (max.z + min.z) / 2);
     return { zoom: scale * this.camera.zoom, center: center2 };
   }
   /**
@@ -5988,7 +6016,7 @@ var BMap = class extends EventDispatcher7 {
         } = this.context;
         const device = vector3ToDevice(position, camera, width, height);
         const offsetX = device.x - width / 2;
-        const v3 = new Vector319();
+        const v3 = new Vector318();
         v3.setFromMatrixColumn(this.context.camera.matrix, 0);
         v3.normalize();
         v3.multiplyScalar(offsetX / this.context.camera.zoom);
@@ -6366,7 +6394,7 @@ import {
   TextureLoader as TextureLoader2,
   Color as Color8,
   Vector2 as Vector28,
-  Vector3 as Vector321,
+  Vector3 as Vector320,
   NormalBlending,
   RepeatWrapping
 } from "three";
@@ -6375,7 +6403,7 @@ import {
 import {
   BufferGeometry as BufferGeometry5,
   Matrix4,
-  Vector3 as Vector320,
+  Vector3 as Vector319,
   Ray as Ray2,
   Sphere,
   LineSegments as LineSegments5,
@@ -6455,7 +6483,7 @@ MeshLine.prototype.setPoints = function(points, wcb) {
   this.widthCallback = wcb;
   this.positions = [];
   this.counters = [];
-  if (points.length && points[0] instanceof Vector320) {
+  if (points.length && points[0] instanceof Vector319) {
     for (var j = 0; j < points.length; j++) {
       var p = points[j];
       var c = j / points.length;
@@ -6479,7 +6507,7 @@ function MeshLineRaycast(raycaster, intersects) {
   var inverseMatrix = new Matrix4();
   var ray = new Ray2();
   var sphere = new Sphere();
-  var interRay = new Vector320();
+  var interRay = new Vector319();
   var geometry = this.geometry;
   if (!geometry.boundingSphere) geometry.computeBoundingSphere();
   sphere.copy(geometry.boundingSphere);
@@ -6489,9 +6517,9 @@ function MeshLineRaycast(raycaster, intersects) {
   }
   inverseMatrix.copy(this.matrixWorld).invert();
   ray.copy(raycaster.ray).applyMatrix4(inverseMatrix);
-  var vStart = new Vector320();
-  var vEnd = new Vector320();
-  var interSegment = new Vector320();
+  var vStart = new Vector319();
+  var vEnd = new Vector319();
+  var interSegment = new Vector319();
   var step = this instanceof LineSegments5 ? 2 : 1;
   var index = geometry.index;
   var attributes = geometry.attributes;
@@ -6545,8 +6573,8 @@ MeshLine.prototype.getDistance = function(i) {
   let maxLength = 0;
   for (let k = 0; k < i; k++) {
     const index = 6 * k;
-    const p0 = new Vector320(this.positions[index], this.positions[index + 1], this.positions[index + 2]);
-    const p1 = new Vector320(this.positions[index + 6], this.positions[index + 7], this.positions[index + 8]);
+    const p0 = new Vector319(this.positions[index], this.positions[index + 1], this.positions[index + 2]);
+    const p1 = new Vector319(this.positions[index + 6], this.positions[index + 7], this.positions[index + 8]);
     const distance = p0.distanceTo(p1);
     maxLength += distance;
   }
@@ -7058,7 +7086,7 @@ var Path2 = class extends Object3D16 {
       }
     } = this;
     const screenPoints = points.map(
-      ([x, y]) => vector3ToDevice(new Vector321(x, y, 0), camera, width, height)
+      ([x, y]) => vector3ToDevice(new Vector320(x, y, 0), camera, width, height)
     ).map(({ x, y }) => [x, y]);
     const pointLength = getPathLength(screenPoints);
     return pointLength / 32;
@@ -7831,8 +7859,8 @@ var AibeeLoader = class {
             return obj;
           }, {});
           Object.values(group).forEach((options) => {
-            const mergeGeometries4 = new MergeGraphic(this.bmap.context, options);
-            floor.mergeGraphicLayer.add(mergeGeometries4);
+            const mergeGeometries5 = new MergeGraphic(this.bmap.context, options);
+            floor.mergeGraphicLayer.add(mergeGeometries5);
           });
           break;
         case "ground":
@@ -7877,19 +7905,20 @@ var AibeeLoader = class {
         case "texture2d":
         case "texture3d":
           transformGraphicData(layer.elements, center2);
-          layer.elements.forEach((options) => {
-            const texture = new GroundTexture(this.bmap.context, options);
-            floor.textureLayer.add(texture);
-          });
+          const texture = new GroundTexture(this.bmap.context, layer.elements);
+          floor.textureLayer.add(texture);
           break;
         case "glb":
           transformGraphicData(layer.elements, center2);
           layer.elements.forEach((options) => {
+            const pos = translatePosToCenter([options.center_x, options.center_y], center2);
             const model = new GlbModel(this.bmap.context, {
               ...options,
               url: options.secondUrl,
               rotate: options.secondRotate,
-              width: options.secondWidth
+              width: options.secondWidth,
+              center_x: pos[0],
+              center_y: pos[1]
             });
             floor.glbModelLayer.add(model);
           });