@d5techs/3dgs-lib 1.4.12 → 1.4.14

package/dist/3dgs-lib.cjs

@@ -2476,10 +2476,16 @@ class MeshRenderer {
       this.lightDir[2],
       this.ambientIntensity
     ]);
-    this.renderItems(pass, this.items, device, vpMatrix, lightData, false);
-    this.renderItems(pass, this.overlayItems, device, vpMatrix, lightData, true);
+    const unlitLightData = new Float32Array([
+      this.lightDir[0],
+      this.lightDir[1],
+      this.lightDir[2],
+      1
+    ]);
+    this.renderItems(pass, this.items, device, vpMatrix, lightData, unlitLightData, false);
+    this.renderItems(pass, this.overlayItems, device, vpMatrix, lightData, unlitLightData, true);
   }
-  renderItems(pass, items, device, vpMatrix, lightData, overlay) {
+  renderItems(pass, items, device, vpMatrix, lightData, unlitLightData, overlay) {
     if (items.length === 0) return;
     for (const item of items) {
       const { mesh, material, uniformBuffer, bindGroup } = item;
@@ -2487,7 +2493,11 @@ class MeshRenderer {
       device.queue.writeBuffer(uniformBuffer, 64, mesh.modelMatrix.buffer);
       const colorData = new Float32Array(material.baseColorFactor);
       device.queue.writeBuffer(uniformBuffer, 128, colorData.buffer);
-      device.queue.writeBuffer(uniformBuffer, 144, lightData.buffer);
+      if (material.unlit) {
+        device.queue.writeBuffer(uniformBuffer, 144, unlitLightData.buffer);
+      } else {
+        device.queue.writeBuffer(uniformBuffer, 144, lightData.buffer);
+      }
       let pipeline;
       if (overlay) {
         if (mesh.hasUV) {
@@ -13593,7 +13603,16 @@ class HotspotManager {
     let closestIdx = -1;
     for (let i = 0; i < this.hotspots.length; i++) {
       const h = this.hotspots[i];
-      const [px, py, pz] = h.position;
+      let px, py, pz;
+      const firstMesh = this.meshRenderer.getOverlayMeshByIndex(h.meshStartIndex);
+      if (firstMesh) {
+        const m = firstMesh.modelMatrix;
+        px = m[12];
+        py = m[13];
+        pz = m[14];
+      } else {
+        [px, py, pz] = h.position;
+      }
       const clipW = vp[3] * px + vp[7] * py + vp[11] * pz + vp[15];
       if (clipW <= 0) continue;
       const clipX = (vp[0] * px + vp[4] * py + vp[8] * pz + vp[12]) / clipW;
@@ -14001,6 +14020,77 @@ class HotspotManager {
     this.indicatorMesh.hasUV = false;
     this.indicatorMesh.indexFormat = "uint16";
   }
+  /**
+   * 在 OBJ 本地坐标系中创建背景圆盘 Mesh，
+   * 使其与 OBJ 图标共享同一 model matrix，billboard/缩放自动生效。
+   */
+  createBackgroundDisk(objBbox) {
+    const device = this.renderer.device;
+    const segments = 48;
+    const cx = (objBbox.min[0] + objBbox.max[0]) / 2;
+    const cy = (objBbox.min[1] + objBbox.max[1]) / 2;
+    const cz = Math.min(objBbox.min[2], objBbox.max[2]) - 5e-4;
+    const dx = objBbox.max[0] - objBbox.min[0];
+    const dy = objBbox.max[1] - objBbox.min[1];
+    const maxDim2D = Math.max(dx, dy, 1e-6);
+    const radius = maxDim2D * 0.85;
+    const vertexCount = segments + 1;
+    const stride = 6;
+    const vertexData = new Float32Array(vertexCount * stride);
+    vertexData[0] = cx;
+    vertexData[1] = cy;
+    vertexData[2] = cz;
+    vertexData[3] = 0;
+    vertexData[4] = 0;
+    vertexData[5] = 1;
+    for (let i = 0; i < segments; i++) {
+      const angle = i / segments * Math.PI * 2;
+      const off = (i + 1) * stride;
+      vertexData[off + 0] = cx + Math.cos(angle) * radius;
+      vertexData[off + 1] = cy + Math.sin(angle) * radius;
+      vertexData[off + 2] = cz;
+      vertexData[off + 3] = 0;
+      vertexData[off + 4] = 0;
+      vertexData[off + 5] = 1;
+    }
+    const indices = [];
+    for (let i = 0; i < segments; i++) {
+      indices.push(0, i + 1, (i + 1) % segments + 1);
+    }
+    const vertexBuffer = device.createBuffer({
+      size: vertexData.byteLength,
+      usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST
+    });
+    device.queue.writeBuffer(vertexBuffer, 0, vertexData);
+    const indexData = new Uint16Array(indices);
+    const alignedSize = Math.ceil(indexData.byteLength / 4) * 4;
+    const alignedBuf = new Uint8Array(alignedSize);
+    alignedBuf.set(
+      new Uint8Array(indexData.buffer, indexData.byteOffset, indexData.byteLength)
+    );
+    const indexBuffer = device.createBuffer({
+      size: alignedSize,
+      usage: GPUBufferUsage.INDEX | GPUBufferUsage.COPY_DST
+    });
+    device.queue.writeBuffer(indexBuffer, 0, alignedBuf);
+    const bbox = {
+      min: [cx - radius, cy - radius, cz],
+      max: [cx + radius, cy + radius, cz],
+      center: [cx, cy, cz],
+      radius
+    };
+    const mesh = new Mesh(vertexBuffer, vertexCount, indexBuffer, indices.length, bbox);
+    mesh.hasUV = false;
+    mesh.indexFormat = "uint16";
+    const material = {
+      baseColorFactor: [0.13, 0.59, 0.95, 1],
+      baseColorTexture: null,
+      metallicFactor: 0,
+      roughnessFactor: 0.5,
+      doubleSided: true
+    };
+    return { mesh, material };
+  }
   showIndicator() {
     if (!this.indicatorMesh || this.indicatorAdded) return;
     const material = {
@@ -14121,15 +14211,27 @@ class HotspotManager {
           (firstBbox.min[2] + firstBbox.max[2]) / 2
         ];
       }
-      for (const { mesh, material } of loadedMeshes) {
+      for (const { mesh } of loadedMeshes) {
         this.applyIndicatorTransform(mesh, snap);
+      }
+      let bgDiskMeshCount = 0;
+      if (firstBbox) {
+        const disk = this.createBackgroundDisk(firstBbox);
+        disk.mesh.modelMatrix.set(loadedMeshes[0].mesh.modelMatrix);
+        this.decomposeModelMatrix(disk.mesh);
+        this.meshRenderer.addOverlayMesh(disk.mesh, disk.material);
+        bgDiskMeshCount = 1;
+      }
+      for (const { mesh, material } of loadedMeshes) {
+        material.unlit = true;
         this.meshRenderer.addOverlayMesh(mesh, material);
       }
       const info = {
         position: [...snap.point],
         normal: [...snap.normal],
         meshStartIndex,
-        meshCount: loadedMeshes.length,
+        meshCount: bgDiskMeshCount + loadedMeshes.length,
+        bgDiskMeshCount,
         billboard: false,
         placedScale,
         placedNormalOffset: snap.normalOffset,
@@ -14328,7 +14430,7 @@ class HotspotManager {
           (firstBbox.min[2] + firstBbox.max[2]) / 2
         ];
       }
-      for (const { mesh, material } of loadedMeshes) {
+      for (const { mesh } of loadedMeshes) {
         const bbox = mesh.getLocalBoundingBox();
         let s = placedScale;
         let lcx = 0, lcy = 0, lcz = 0;
@@ -14364,13 +14466,25 @@ class HotspotManager {
         m[14] = position[2] + nz * normalOffset - owz;
         m[15] = 1;
         this.decomposeModelMatrix(mesh);
+      }
+      let bgDiskMeshCount = 0;
+      if (firstBbox) {
+        const disk = this.createBackgroundDisk(firstBbox);
+        disk.mesh.modelMatrix.set(loadedMeshes[0].mesh.modelMatrix);
+        this.decomposeModelMatrix(disk.mesh);
+        this.meshRenderer.addOverlayMesh(disk.mesh, disk.material);
+        bgDiskMeshCount = 1;
+      }
+      for (const { mesh, material } of loadedMeshes) {
+        material.unlit = true;
         this.meshRenderer.addOverlayMesh(mesh, material);
       }
       const info = {
         position: [...position],
         normal: [...normal],
         meshStartIndex,
-        meshCount: loadedMeshes.length,
+        meshCount: bgDiskMeshCount + loadedMeshes.length,
+        bgDiskMeshCount,
         billboard: false,
         placedScale,
         placedNormalOffset: normalOffset,