soonspacejs 3.0.0-alpha.1 → 3.0.0-alpha.2

package/dist/index.esm.js

@@ -25,7 +25,7 @@ import * as cn from "three/examples/jsm/utils/SkeletonUtils.js";
 import * as ul from "three/examples/jsm/libs/fflate.module.js";
 import { NURBSCurve as dl } from "three/examples/jsm/curves/NURBSCurve.js";
 import { RectAreaLightHelper as pl } from "three/examples/jsm/helpers/RectAreaLightHelper.js";
-const fl = "soonspacejs", ml = "3.0.0-alpha.1", ln = {
+const fl = "soonspacejs", ml = "3.0.0-alpha.2", ln = {
   name: fl,
   version: ml
 }, ea = "[soonspacejs]: ";
@@ -6882,15 +6882,17 @@ class lu {
   enabled = !0;
   batchedEnabled = !0;
   rebuilds = 0;
+  sourceParts = 0;
+  batchCounts = { instancedBatches: 0, batchedBatches: 0, independentObjects: 0 };
   selection = /* @__PURE__ */ new Set();
   selectionDirty = !1;
   highlights = /* @__PURE__ */ new Map();
   highlightMaterial = new Jt({ color: 16753920, wireframe: !0, depthTest: !1, depthWrite: !1, toneMapped: !1, side: tt });
   add(e) {
-    this.entries.set(e.entity, e.parts.map((t, s) => ({ input: e, partIndex: s, matrix: new W(), visible: !1, eligible: !1 })));
+    this.entries.has(e.entity) && this.remove(e.entity), this.entries.set(e.entity, e.parts.map((t, s) => ({ input: e, partIndex: s, matrix: new W(), visible: !1, eligible: !1 }))), this.sourceParts += e.parts.length;
   }
   remove(e) {
-    this.removeHighlight(e);
+    this.removeHighlight(e), this.sourceParts -= this.entries.get(e)?.length ?? 0;
     for (const t of this.entries.get(e) ?? [])
       t.key && (this.groups.get(t.key)?.delete(t), this.dirtyGroups.add(t.key));
     this.entries.delete(e), this.bounds.delete(e);
@@ -6954,7 +6956,7 @@ class lu {
   }
   rebuildGroup(e) {
     for (const h of this.groupBatches.get(e) ?? [])
-      this.sideVariants?.unregister(h.object), h.object.removeFromParent(), (h.object instanceof Ye || h.object instanceof et) && h.object.dispose(), h.ownedMaterial?.dispose(), this.batches.delete(h), this.mappings.delete(h.object);
+      this.sideVariants?.unregister(h.object), h.object.removeFromParent(), (h.object instanceof Ye || h.object instanceof et) && h.object.dispose(), h.ownedMaterial?.dispose(), this.batches.delete(h), this.countBatch(h, -1), this.mappings.delete(h.object);
     const t = [...this.groups.get(e) ?? []], s = [];
     if (t.length === 0) {
       this.groups.delete(e), this.groupBatches.delete(e);
@@ -7015,7 +7017,7 @@ class lu {
     }
     e.forEach((o) => {
       o.batch = n;
-    }), this.batches.add(n), t.push(n), this.mappings.set(i, n), this.sideVariants?.register(i), this.root.add(i), this.updateBatch(n);
+    }), this.batches.add(n), this.countBatch(n, 1), t.push(n), this.mappings.set(i, n), this.sideVariants?.register(i), this.root.add(i), this.updateBatch(n);
   }
   updateBatch(e) {
     const { object: t } = e;
@@ -7043,19 +7045,21 @@ class lu {
     return this.bounds.get(e)?.clone() ?? new mt();
   }
   getStats() {
-    let e = 0, t = 0, s = 0;
-    return this.batches.forEach((r) => {
-      r.object instanceof et ? t++ : r.object instanceof Ye ? e++ : s++;
-    }), { instancedBatches: e, batchedBatches: t, independentObjects: s, rebuilds: this.rebuilds };
+    const { instancedBatches: e, batchedBatches: t, independentObjects: s } = this.batchCounts;
+    return { ...this.batchCounts, sourceParts: this.sourceParts, renderObjects: e + t + s, rebuilds: this.rebuilds };
+  }
+  countBatch(e, t) {
+    const s = e.object instanceof et ? "batchedBatches" : e.object instanceof Ye ? "instancedBatches" : "independentObjects";
+    this.batchCounts[s] += t;
   }
   clearBatches() {
     this.batches.forEach((e) => {
       this.sideVariants?.unregister(e.object), e.object.removeFromParent(), (e.object instanceof Ye || e.object instanceof et) && e.object.dispose(), e.ownedMaterial?.dispose();
-    }), this.batches.clear(), this.mappings.clear();
+    }), this.batches.clear(), this.batchCounts = { instancedBatches: 0, batchedBatches: 0, independentObjects: 0 }, this.mappings.clear();
   }
   dispose() {
     for (const e of this.highlights.keys()) this.removeHighlight(e);
-    this.selection.clear(), this.highlightMaterial.dispose(), this.clearBatches(), this.entries.clear(), this.bounds.clear(), this.groups.clear(), this.groupBatches.clear(), this.root.removeFromParent();
+    this.selection.clear(), this.highlightMaterial.dispose(), this.clearBatches(), this.entries.clear(), this.sourceParts = 0, this.bounds.clear(), this.groups.clear(), this.groupBatches.clear(), this.root.removeFromParent();
   }
 }
 async function za(a, e, t, s) {
@@ -7345,6 +7349,7 @@ class fu {
   pendingModels = /* @__PURE__ */ new Map();
   selected = /* @__PURE__ */ new Set();
   selectionDirty = !1;
+  selectionHighlight = !0;
   get roots() {
     return [...this.nodes.values()].filter((e) => !e.parent).map((e) => e.entity);
   }
@@ -7491,7 +7496,7 @@ class fu {
       }
     }
     if (this.selectionDirty) {
-      const n = /* @__PURE__ */ new Set(), o = [...this.selected];
+      const n = /* @__PURE__ */ new Set(), o = this.selectionHighlight ? [...this.selected] : [];
       for (; o.length; ) {
         const c = o.pop();
         n.has(c) || (n.add(c), o.push(...this.node(c).children));
@@ -7542,8 +7547,9 @@ class fu {
   getStats() {
     return { ...this.renderer.getStats(), updatedEntities: this.updatedEntities, entities: this.nodes.size };
   }
-  setSelection(e) {
-    e.forEach((t) => this.node(t)), this.selected = new Set(e), this.selectionDirty = !0, this.schedule();
+  /** Selection identity is retained even when the optional visual overlay is disabled. */
+  setSelection(e, t = {}) {
+    e.forEach((s) => this.node(s)), this.selected = new Set(e), this.selectionHighlight = t.highlight !== !1, this.selectionDirty = !0, this.schedule();
   }
   getSelection() {
     return [...this.selected];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "homepage": "https://www.xwbuilders.com/soonspacejs/",
   "description": "SoonSpace.js 3.0 alpha",
   "module": "./dist/index.esm.js",

package/types/Entity/EntityCollection.d.ts

@@ -19,6 +19,7 @@ export declare class EntityCollection {
     private pendingModels;
     private selected;
     private selectionDirty;
+    private selectionHighlight;
     constructor(scene: Scene, requestRender: () => void, models: ModelResources, sideVariants?: Pick<TransparentSideVariants, 'register' | 'unregister'>);
     get roots(): readonly Entity[];
     getById(id: string): Entity | undefined;
@@ -49,12 +50,17 @@ export declare class EntityCollection {
     getStats(): {
         updatedEntities: number;
         entities: number;
+        sourceParts: number;
+        renderObjects: number;
+        rebuilds: number;
         instancedBatches: number;
         batchedBatches: number;
         independentObjects: number;
-        rebuilds: number;
     };
-    setSelection(entities: readonly Entity[]): void;
+    /** Selection identity is retained even when the optional visual overlay is disabled. */
+    setSelection(entities: readonly Entity[], options?: {
+        highlight?: boolean;
+    }): void;
     getSelection(): readonly Entity[];
     setInstancingEnabled(enabled: boolean): void;
     setBatchedEnabled(enabled: boolean): void;

package/types/Entity/EntityRenderer.d.ts

@@ -28,6 +28,8 @@ export declare class EntityRenderer {
     private enabled;
     private batchedEnabled;
     private rebuilds;
+    private sourceParts;
+    private batchCounts;
     private selection;
     private selectionDirty;
     private highlights;
@@ -48,11 +50,14 @@ export declare class EntityRenderer {
     pick(raycaster: Raycaster): EntityHit[];
     getBounds(entity: Entity): Box3;
     getStats(): {
+        sourceParts: number;
+        renderObjects: number;
+        rebuilds: number;
         instancedBatches: number;
         batchedBatches: number;
         independentObjects: number;
-        rebuilds: number;
     };
+    private countBatch;
     private clearBatches;
     dispose(): void;
 }

package/types/index.d.ts

@@ -2164,6 +2164,7 @@ export declare class EntityCollection {
     private pendingModels;
     private selected;
     private selectionDirty;
+    private selectionHighlight;
     constructor(scene: Scene, requestRender: () => void, models: ModelResources, sideVariants?: Pick<TransparentSideVariants, 'register' | 'unregister'>);
     get roots(): readonly Entity[];
     getById(id: string): Entity | undefined;
@@ -2194,12 +2195,17 @@ export declare class EntityCollection {
     getStats(): {
         updatedEntities: number;
         entities: number;
+        sourceParts: number;
+        renderObjects: number;
+        rebuilds: number;
         instancedBatches: number;
         batchedBatches: number;
         independentObjects: number;
-        rebuilds: number;
     };
-    setSelection(entities: readonly Entity[]): void;
+    /** Selection identity is retained even when the optional visual overlay is disabled. */
+    setSelection(entities: readonly Entity[], options?: {
+        highlight?: boolean;
+    }): void;
     getSelection(): readonly Entity[];
     setInstancingEnabled(enabled: boolean): void;
     setBatchedEnabled(enabled: boolean): void;