u-space 0.0.12 → 0.0.13

package/dist/plugins/u-manager/index.js

@@ -1,4 +1,4 @@
-import { FileLoader, Scene, OrthographicCamera, Mesh, PlaneGeometry, MeshBasicNodeMaterial, SRGBColorSpace, Matrix4, Loader, LoadingManager, Group, EventDispatcher, Vector3, Box3, Quaternion, Sphere, Vector4, BufferGeometry, Float32BufferAttribute, DataTexture, RGBAFormat, FloatType, NearestFilter, Color, Euler } from "three/webgpu";
+import { FileLoader, Scene, OrthographicCamera, Mesh, PlaneGeometry, MeshBasicNodeMaterial, SRGBColorSpace, Matrix4, Loader, LoadingManager, Group, EventDispatcher, Vector3, Box3, Quaternion, Sphere, Vector4, BufferGeometry, Float32BufferAttribute, DataTexture, RGBAFormat, FloatType, NearestFilter, MeshStandardNodeMaterial, Color, Euler } from "three/webgpu";
 import { TextureLoaderManager, Model, ShapeMesh, CircleMesh, ExtrudeMesh, tweenAnimation, Topology, BaseMesh, BaseGroup, MaterialEffects as MaterialEffects$1 } from "u-space";
 import { pass, attribute, vec4, positionLocal, textureLoad, ivec2, mat4, int, textureSize } from "three/tsl";
 import { MaterialEffects } from "../../index.js";
@@ -20593,7 +20593,7 @@ class Watermarker extends Scene {
   camera;
   mesh;
   overlayPass;
-  #e = !1;
+  #r = !1;
   #t = null;
   constructor(t) {
     super(), this.viewer = t, this.camera = new OrthographicCamera(-1, 1, 1, -1, 0, 1), this.camera.position.z = 0.5, this.mesh = new Mesh(
@@ -20606,14 +20606,14 @@ class Watermarker extends Scene {
     ), this.add(this.mesh), this.overlayPass = pass(this, this.camera);
   }
   enable() {
-    this.#e = !0, this.#i().then((t) => {
-      this.#e && (this.mesh.material.map !== t && (this.mesh.material.map = t, this.mesh.material.needsUpdate = !0), this.viewer.renderPipeline.addOverlayPass(this.overlayPass));
+    this.#r = !0, this.#i().then((t) => {
+      this.#r && (this.mesh.material.map !== t && (this.mesh.material.map = t, this.mesh.material.needsUpdate = !0), this.viewer.renderPipeline.addOverlayPass(this.overlayPass));
     }).catch((t) => {
       this.#t = null, console.warn("u-space Watermarker: failed to load watermark texture.", t);
     });
   }
   disable() {
-    this.#e = !1, this.viewer.renderPipeline.removeOverlayPass(this.overlayPass);
+    this.#r = !1, this.viewer.renderPipeline.removeOverlayPass(this.overlayPass);
   }
   dispose() {
     this.disable(), this.overlayPass.dispose(), this.mesh.geometry.dispose(), this.mesh.material.dispose(), this.mesh.material.map?.dispose();
@@ -20688,9 +20688,9 @@ class SceneLoader extends Loader {
   cachedIds = /* @__PURE__ */ new Set();
   _resourceData = null;
   _treeData = [];
-  #e;
+  #r;
   constructor(t) {
-    super(), this.viewer = t, this.#e = new Watermarker(t), this.manager = new LoadingManager();
+    super(), this.viewer = t, this.#r = new Watermarker(t), this.manager = new LoadingManager();
   }
   setKey(t) {
     return this.key = t, this;
@@ -20708,7 +20708,7 @@ class SceneLoader extends Loader {
     if (this._resourceData = o, d)
       if (h.encryptWith === "DEBUG")
         try {
-          this._treeData = decryptWithDebugKey(o), this.#e.enable();
+          this._treeData = decryptWithDebugKey(o), this.#r.enable();
         } catch {
           throw new Error("u-space SceneLoader: decrypt with debug key failed");
         }
@@ -20743,7 +20743,7 @@ class SceneLoader extends Loader {
     }), this.cachedIds.clear();
   }
   dispose() {
-    this.clearCache(), this.#e.dispose();
+    this.clearCache(), this.#r.dispose();
   }
 }
 class AnimationsLoader extends Loader {
@@ -20926,7 +20926,7 @@ function createSemanticMaterial(u, t, h) {
       textureLoad(h, ivec2(l.add(2), v)),
       textureLoad(h, ivec2(l.add(3), v))
     );
-  }, f = r(u), a = r(t).x, n = new MeshBasicNodeMaterial({
+  }, f = r(u), a = r(t).x, n = new MeshStandardNodeMaterial({
     transparent: !0,
     depthWrite: !1
   });
@@ -20964,6 +20964,7 @@ function buildMergedSemanticGeometry(u) {
     c.push({
       id: a.id,
       kind: a.kind,
+      name: a.name,
       index: n,
       baseMatrix: U,
       matrix: new Matrix4(),
@@ -20984,17 +20985,19 @@ class FloorMesh extends BaseMesh {
   wallsInstances = /* @__PURE__ */ new Map();
   columnsInstances = /* @__PURE__ */ new Map();
   spacesInstances = /* @__PURE__ */ new Map();
+  doorsInstances = /* @__PURE__ */ new Map();
+  windowsInstances = /* @__PURE__ */ new Map();
   semanticInstances = /* @__PURE__ */ new Map();
-  #e;
+  #r;
   #t;
   #i;
   #a;
   #n;
   constructor(t) {
     const { geometry: h, states: o } = buildMergedSemanticGeometry(t), d = getStateTextureSize(o.length), r = getMatrixTextureSize(o.length), c = createStateTexture(d), f = createStateTexture(d), a = createStateTexture(r), n = createSemanticMaterial(c, f, a);
-    super(h, n), this.#e = o, this.#t = c, this.#i = f, this.#a = a, this.#n = new Mesh(), this.#n.matrixAutoUpdate = !1, this.frustumCulled = !1, this.#e.forEach((e) => {
-      this.semanticInstances.set(e.id, e.index), e.kind === "WALL" && this.wallsInstances.set(e.id, e.index), e.kind === "COLUMN" && this.columnsInstances.set(e.id, e.index), e.kind === "SPACE" && this.spacesInstances.set(e.id, e.index), this.#o(e.index), this.#u(e.index), this.#s(e.index);
-    }), this.userData.semanticEntries = this.#e.map(({ id: e, kind: s, index: l }) => ({ id: e, kind: s, index: l }));
+    super(h, n), this.#r = o, this.#t = c, this.#i = f, this.#a = a, this.#n = new Mesh(), this.#n.matrixAutoUpdate = !1, this.frustumCulled = !1, this.#r.forEach((e) => {
+      this.semanticInstances.set(e.id, e.index), e.kind === "WALL" && this.wallsInstances.set(e.id, e.index), e.kind === "COLUMN" && this.columnsInstances.set(e.id, e.index), e.kind === "SPACE" && this.spacesInstances.set(e.id, e.index), e.kind === "Doors" && this.doorsInstances.set(e.id, e.index), e.kind === "Windows" && this.windowsInstances.set(e.id, e.index), this.#o(e.index), this.#u(e.index), this.#s(e.index);
+    }), this.userData.semanticEntries = this.#r.map(({ id: e, kind: s, name: l, index: v }) => ({ id: e, kind: s, name: l, index: v }));
   }
   planish() {
     this.scale.set(1, 0.01, 1);
@@ -21003,7 +21006,7 @@ class FloorMesh extends BaseMesh {
     this.scale.set(1, 1, 1);
   }
   get semanticCount() {
-    return this.#e.length;
+    return this.#r.length;
   }
   get instanceCount() {
     return this.semanticCount;
@@ -21012,85 +21015,89 @@ class FloorMesh extends BaseMesh {
     return this.semanticInstances.get(t);
   }
   getSemanticIdAt(t) {
-    return this.#r(t).id;
+    return this.#e(t).id;
   }
   getSemanticKindAt(t) {
-    return this.#r(t).kind;
+    return this.#e(t).kind;
+  }
+  getSemanticNameAt(t) {
+    return this.#e(t).name;
   }
   setColorAt(t, h) {
-    const o = this.#r(t);
+    const o = this.#e(t);
     return copySemanticColor(h, o.color), this.#o(t), this;
   }
   getColorAt(t, h = new Vector4()) {
-    const o = this.#r(t).color;
+    const o = this.#e(t).color;
     return h.copy(o), h;
   }
   setOpacityAt(t, h) {
-    const o = this.#r(t);
+    const o = this.#e(t);
     return o.color.w = Math.max(0, Math.min(1, h)), this.#o(t), this;
   }
   getOpacityAt(t) {
-    return this.#r(t).color.w;
+    return this.#e(t).color.w;
   }
   setVisibleAt(t, h) {
-    const o = this.#r(t);
+    const o = this.#e(t);
     return o.visible = h, this.#u(t), this;
   }
   getVisibleAt(t) {
-    return this.#r(t).visible;
+    return this.#e(t).visible;
   }
   setMatrixAt(t, h) {
-    const o = this.#r(t);
+    const o = this.#e(t);
     return o.matrix.copy(h), o.finalMatrix.multiplyMatrices(o.baseMatrix, o.matrix), this.#f(), this.#s(t), this;
   }
   setScaleAt(t, h, o, d) {
-    const r = this.#r(t);
+    const r = this.#e(t);
     return r.matrix.decompose(_dummyPosition, _dummyQuaternion, _dummyScale), h instanceof Vector3 ? _dummyScale.copy(h) : _dummyScale.set(h, o ?? h, d ?? h), r.matrix.compose(_dummyPosition, _dummyQuaternion, _dummyScale), r.finalMatrix.multiplyMatrices(r.baseMatrix, r.matrix), this.#f(), this.#s(t), this;
   }
   getMatrixAt(t, h = new Matrix4()) {
-    return h.copy(this.#r(t).matrix), h;
+    return h.copy(this.#e(t).matrix), h;
   }
   getFinalMatrixAt(t, h = new Matrix4()) {
-    return h.copy(this.#r(t).finalMatrix), h;
+    return h.copy(this.#e(t).finalMatrix), h;
   }
   computeBoundingBox() {
     this.boundingBox === null && (this.boundingBox = new Box3()), this.boundingBox.makeEmpty();
-    for (const t of this.#e)
+    for (const t of this.#r)
       this.getBoundingBoxAt(t.index, _box, !1) && this.boundingBox.union(_box);
   }
   computeBoundingSphere() {
     this.boundingSphere === null && (this.boundingSphere = new Sphere()), this.boundingSphere.makeEmpty();
-    for (const t of this.#e)
+    for (const t of this.#r)
       this.getBoundingSphereAt(t.index, _boundsSphere, !1) && this.boundingSphere.union(_boundsSphere);
   }
   getBoundingBoxAt(t, h = new Box3(), o = !0) {
-    const d = this.#r(t);
+    const d = this.#e(t);
     return d.geometry.boundingBox || d.geometry.computeBoundingBox(), d.geometry.boundingBox ? (h.copy(d.geometry.boundingBox).applyMatrix4(d.finalMatrix), o && (this.updateWorldMatrix(!0, !1), h.applyMatrix4(this.matrixWorld)), h) : null;
   }
   getBoundingSphereAt(t, h = new Sphere(), o = !0) {
-    const d = this.#r(t);
+    const d = this.#e(t);
     return d.geometry.boundingSphere || d.geometry.computeBoundingSphere(), d.geometry.boundingSphere ? (h.copy(d.geometry.boundingSphere), o ? (this.updateWorldMatrix(!0, !1), _boundsMatrix.multiplyMatrices(this.matrixWorld, d.finalMatrix), h.applyMatrix4(_boundsMatrix)) : h.applyMatrix4(d.finalMatrix), h) : null;
   }
   raycast(t, h) {
     if (this.visible === !1 && this.ignoreInvisibleWhenRaycast === !0)
       return !1;
     this.updateWorldMatrix(!0, !1), this.#n.material = this.material;
-    for (const o of this.#e)
+    for (const o of this.#r)
       if (!(!o.visible || o.color.w <= 1e-3)) {
         this.#n.geometry = o.geometry, this.#n.matrixWorld.multiplyMatrices(this.matrixWorld, o.finalMatrix), _raycastHits.length = 0, this.#n.raycast(t, _raycastHits);
         for (const d of _raycastHits)
           d.object = this, d.instanceId = o.index, Object.assign(d, {
             semanticId: o.id,
             semanticKind: o.kind,
+            semanticName: o.name,
             semanticIndex: o.index
           }), h.push(d);
       }
   }
   dispose() {
-    this.geometry.dispose(), Array.isArray(this.material) ? this.material.forEach((t) => t.dispose()) : this.material.dispose(), this.#t.dispose(), this.#i.dispose(), this.#a.dispose(), this.#e.forEach((t) => t.geometry.dispose());
+    this.geometry.dispose(), Array.isArray(this.material) ? this.material.forEach((t) => t.dispose()) : this.material.dispose(), this.#t.dispose(), this.#i.dispose(), this.#a.dispose(), this.#r.forEach((t) => t.geometry.dispose());
   }
-  #r(t) {
-    const h = this.#e[t];
+  #e(t) {
+    const h = this.#r[t];
     if (!h)
       throw new Error(`u-space FloorMesh: invalid semantic index ${t}.`);
     return h;
@@ -21099,14 +21106,14 @@ class FloorMesh extends BaseMesh {
     this.boundingBox = null, this.boundingSphere = null;
   }
   #o(t) {
-    this.#r(t).color.toArray(this.#t.image.data, t * 4), this.#t.needsUpdate = !0;
+    this.#e(t).color.toArray(this.#t.image.data, t * 4), this.#t.needsUpdate = !0;
   }
   #u(t) {
-    const h = this.#r(t), o = this.#i.image.data;
+    const h = this.#e(t), o = this.#i.image.data;
     o[t * 4] = h.visible ? 1 : 0, o[t * 4 + 1] = 0, o[t * 4 + 2] = 0, o[t * 4 + 3] = 1, this.#i.needsUpdate = !0;
   }
   #s(t) {
-    this.#r(t).finalMatrix.toArray(this.#a.image.data, t * 16), this.#a.needsUpdate = !0;
+    this.#e(t).finalMatrix.toArray(this.#a.image.data, t * 16), this.#a.needsUpdate = !0;
   }
 }
 class BuildingGroup extends BaseGroup {
@@ -21146,6 +21153,16 @@ class BuildingGroup extends BaseGroup {
     return this.floorMeshes.forEach((t) => t.unplanish()), this;
   }
 }
+const SEMANTIC_INITIAL_COLORS = {
+  WALL: new Vector4(0.86, 0.86, 0.82, 1),
+  COLUMN: new Vector4(0.62, 0.65, 0.68, 1),
+  SPACE: new Vector4(0.36, 0.7, 0.5, 0.45),
+  Doors: new Vector4(0.9, 0.52, 0.2, 1),
+  Windows: new Vector4(0.28, 0.62, 0.95, 0.65)
+};
+function getInitialColor(u) {
+  return SEMANTIC_INITIAL_COLORS[u].clone();
+}
 function getValidPolygonShape(u, t, h) {
   return !Array.isArray(u) || u.length < 4 || u.length % 2 !== 0 ? (console.warn(`u-space SemanticLoader: invalid ${t} polygon shape for id ${h}.`), null) : u;
 }
@@ -21178,7 +21195,7 @@ class SemanticParser {
               id: e.ID,
               kind: "WALL",
               geometry: l,
-              color: new Vector4(1, 1, 1, 1)
+              color: getInitialColor("WALL")
             });
           }), c.Columns?.forEach((n) => {
             const e = t.Columns?.[n];
@@ -21194,7 +21211,39 @@ class SemanticParser {
               id: e.ID,
               kind: "COLUMN",
               geometry: l,
-              color: new Vector4().random().setW(1)
+              color: getInitialColor("COLUMN")
+            });
+          }), c.Doors?.forEach((n) => {
+            const e = t.Doors?.[n];
+            if (!e || !e.Polygon) return;
+            const s = getValidPolygonShape(e.Polygon.shape, "Doors", e.ID);
+            if (!s) return;
+            const l = ExtrudeMesh.createFromPoints(convertToPlaneIVector2(s), {
+              geometryParameters: {
+                options: { depth: e.Height, bevelEnabled: !1 }
+              }
+            }).geometry;
+            l.translate(0, e.Elevation, 0), l.userData.id = e.ID, f.push({
+              id: e.ID,
+              kind: "Doors",
+              geometry: l,
+              color: getInitialColor("Doors")
+            });
+          }), c.Windows?.forEach((n) => {
+            const e = t.Windows?.[n];
+            if (!e || !e.Polygon) return;
+            const s = getValidPolygonShape(e.Polygon.shape, "Windows", e.ID);
+            if (!s) return;
+            const l = ExtrudeMesh.createFromPoints(convertToPlaneIVector2(s), {
+              geometryParameters: {
+                options: { depth: e.Height, bevelEnabled: !1 }
+              }
+            }).geometry;
+            l.translate(0, e.Elevation, 0), l.userData.id = e.ID, f.push({
+              id: e.ID,
+              kind: "Windows",
+              geometry: l,
+              color: getInitialColor("Windows")
             });
           }), c.Spaces?.forEach((n) => {
             const e = t.Spaces?.[n];
@@ -21209,8 +21258,9 @@ class SemanticParser {
             v.translate(0, e.GroundHeight, 0), v.userData.id = e.ID, f.push({
               id: e.ID,
               kind: "SPACE",
+              name: e.Name,
               geometry: v,
-              color: new Vector4().random().setW(0.5)
+              color: getInitialColor("SPACE")
             });
           }), f.length === 0) return;
           const a = new FloorMesh(f);

package/dist/plugins/u-manager/semantics/FloorMesh.d.ts

@@ -10,6 +10,8 @@ export declare class FloorMesh extends BaseMesh {
     wallsInstances: Map<string, number>;
     columnsInstances: Map<string, number>;
     spacesInstances: Map<string, number>;
+    doorsInstances: Map<string, number>;
+    windowsInstances: Map<string, number>;
     semanticInstances: Map<string, number>;
     constructor(entries: SemanticGeometryEntry[]);
     planish(): void;
@@ -19,6 +21,7 @@ export declare class FloorMesh extends BaseMesh {
     getSemanticIndexById(id: string): number | undefined;
     getSemanticIdAt(index: number): string;
     getSemanticKindAt(index: number): import("./types").SemanticKind;
+    getSemanticNameAt(index: number): string | undefined;
     setColorAt(index: number, color: SemanticColor): this;
     getColorAt(index: number, target?: Vector4): Vector4;
     setOpacityAt(index: number, opacity: number): this;

package/dist/plugins/u-manager/semantics/types.d.ts

@@ -1,15 +1,17 @@
 import type { BufferGeometry, Color, Matrix4, Vector3, Vector4 } from 'three/webgpu';
-export type SemanticKind = 'WALL' | 'COLUMN' | 'SPACE';
+export type SemanticKind = 'WALL' | 'COLUMN' | 'SPACE' | 'Doors' | 'Windows';
 export type SemanticColor = Color | Vector3 | Vector4;
 export interface SemanticGeometryEntry {
     id: string;
     kind: SemanticKind;
+    name?: string;
     geometry: BufferGeometry;
     color: Vector4;
 }
 export interface SemanticObjectState {
     id: string;
     kind: SemanticKind;
+    name?: string;
     index: number;
     baseMatrix: Matrix4;
     matrix: Matrix4;

package/docs/api-plugin-u-manager.md

@@ -59,10 +59,11 @@ floor.addEventListener('click', ({ event }) => {
 | :---------- | :--- |
 | `semanticCount` / `instanceCount` | 当前楼层语义实例数量。 |
 | `semanticInstances` | `Map<string, number>`，从语义对象 ID 映射到实例下标。 |
-| `wallsInstances` / `columnsInstances` / `spacesInstances` | 按语义类型维护的 ID 到实例下标映射。 |
+| `wallsInstances` / `columnsInstances` / `spacesInstances` / `doorsInstances` / `windowsInstances` | 按语义类型维护的 ID 到实例下标映射。 |
 | `getSemanticIndexById(id)` | 根据语义 ID 获取实例下标。 |
 | `getSemanticIdAt(index)` | 获取实例语义 ID。 |
-| `getSemanticKindAt(index)` | 获取实例类型：`'WALL' \| 'COLUMN' \| 'SPACE'`。 |
+| `getSemanticKindAt(index)` | 获取实例类型：`'WALL' \| 'COLUMN' \| 'SPACE' \| 'Doors' \| 'Windows'`。 |
+| `getSemanticNameAt(index)` | 获取实例名称；当前 `SPACE` 会从语义数据的 `Name` 写入，其他类型可能为 `undefined`。 |
 | `setColorAt(index, color)` / `getColorAt(index, target?)` | 修改或读取实例颜色，支持 `Color`、`Vector3`、`Vector4`。 |
 | `setOpacityAt(index, opacity)` / `getOpacityAt(index)` | 修改或读取实例透明度。 |
 | `setVisibleAt(index, visible)` / `getVisibleAt(index)` | 修改或读取实例显隐状态。 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-space",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "type": "module",
   "types": "dist/src/index.d.ts",
   "module": "dist/index.js",