@volter/blender-engine 0.1.73 → 0.1.74

package/browser/three/blender-motion-geometry.ts

@@ -33,8 +33,9 @@ export class BlenderMotionGeometry {
   private drawnMeshes = 0;
   private fullTriangles = 0;
   private motionTriangles = 0;
+  private lastNavigation = {meshes: 0, fullTriangles: 0, motionTriangles: 0, tooClose: 0};
 
-  constructor(private readonly root: THREE.Group, private readonly invalidate: () => void) {}
+  constructor(private readonly invalidate: () => void) {}
 
   setObjects(objects: Iterable<THREE.Object3D>): void {
     const groups = new Map<THREE.BufferGeometry, THREE.Mesh[]>();
@@ -45,7 +46,9 @@ export class BlenderMotionGeometry {
       const g = mesh.geometry;
       const position = g.getAttribute('position');
       if (!g.index || g.index.count < 6144 || !position || position.count > 200_000 ||
-          Object.values(g.attributes).some(a => !(a instanceof THREE.BufferAttribute)) ||
+          Object.values(g.attributes).some(a => !(a instanceof THREE.BufferAttribute) ||
+            (a as THREE.BufferAttribute & {isFloat16BufferAttribute?: boolean}).isFloat16BufferAttribute ||
+            (a as THREE.InstancedBufferAttribute).isInstancedBufferAttribute) ||
           Object.keys(g.morphAttributes).length || g.drawRange.start !== 0 || g.drawRange.count < g.index.count) continue;
       // Only a whole, single material surface. Material boundaries are never
       // crossed by the simplifier, nor are authored group ranges shortened.
@@ -166,10 +169,10 @@ export class BlenderMotionGeometry {
     this.timer = setTimeout(() => { this.timer = null; this.next(); }, 0);
   }
 
-  prepare(camera: THREE.Camera, interactive: boolean, height: number): void {
+  prepare(camera: THREE.Camera, interactive: boolean, height: number): boolean {
     this.finish();
     this.drawnMeshes = this.fullTriangles = this.motionTriangles = 0;
-    if (!interactive || !(height > 0)) return;
+    if (!interactive || !(height > 0)) return false;
     const now = performance.now();
     const moved = this.cameraKnown && (!camera.matrixWorld.equals(this.cameraWorld) ||
       !camera.projectionMatrix.equals(this.cameraProjection));
@@ -182,44 +185,37 @@ export class BlenderMotionGeometry {
       if (this.quietTimer) clearTimeout(this.quietTimer);
       this.quietTimer = setTimeout(() => { this.quietTimer = null; this.invalidate(); }, QUIET_MS + 1);
     }
-    if (now - this.movedAt > QUIET_MS) return;
+    if (now - this.movedAt > QUIET_MS) return false;
     this.projection.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
     this.frustum.setFromProjectionMatrix(this.projection);
-    const allowed = new Map<THREE.BufferGeometry, THREE.BufferGeometry>();
+    let tooClose = 0;
     for (const [source, entry] of this.cache) {
-      let fits = true;
       for (const mesh of this.groups.get(source) ?? []) {
         if (!instanceObjectShown(mesh) || (mesh.frustumCulled && !this.frustum.intersectsObject(mesh))) continue;
-        const scale = mesh.matrixWorld.getMaxScaleOnAxis();
+        // Frobenius norm bounds the linear transform even under shear; the
+        // longest axis alone can understate the projected simplifier error.
+        const e = mesh.matrixWorld.elements;
+        const scale = Math.hypot(e[0]!, e[1]!, e[2]!, e[4]!, e[5]!, e[6]!, e[8]!, e[9]!, e[10]!);
         const sphere = source.boundingSphere!;
         this.centre.copy(sphere.center).applyMatrix4(mesh.matrixWorld).applyMatrix4(camera.matrixWorldInverse);
         const depth = (camera as THREE.PerspectiveCamera).isPerspectiveCamera
           ? -this.centre.z - sphere.radius * scale : 1;
         const pixels = entry.error * scale * Math.abs(camera.projectionMatrix.elements[5]!) * height / (2 * depth);
-        if (!(depth > 0) || pixels > 1) { fits = false; break; }
+        if (!(depth > 0) || pixels > 1) { tooClose++; continue; }
+        // Decide per placement: one near-camera blade must not veto thousands
+        // of distant placements of its shared geometry. The following draw
+        // planner sees these geometry identities, so transparency still batches
+        // only consecutive compatible surfaces in the original camera order.
+        this.swapped.push({mesh, geometry: source});
+        mesh.geometry = entry.geometry;
+        this.drawnMeshes++;
+        this.fullTriangles += source.index!.count / 3;
+        this.motionTriangles += entry.geometry.index!.count / 3;
       }
-      if (fits) allowed.set(source, entry.geometry);
     }
-    // After instancing/culling chose its exact members: both ordinary and
-    // internal draws select the same temporary geometry for this camera.
-    this.root.traverse(object => {
-      const mesh = object as THREE.Mesh;
-      if (!mesh.isMesh || (mesh as THREE.SkinnedMesh).isSkinnedMesh || mesh.morphTargetInfluences ||
-          ((mesh as THREE.InstancedMesh).isInstancedMesh && mesh.userData['engineInternal'] !== true)) return;
-      if (Array.isArray(mesh.material) && (mesh.material.length !== 1 || mesh.geometry.groups.length !== 1 ||
-          mesh.geometry.groups[0]!.start !== 0 || mesh.geometry.groups[0]!.count !== mesh.geometry.index?.count ||
-          mesh.geometry.groups[0]!.materialIndex !== 0)) return;
-      const copy = allowed.get(mesh.geometry);
-      if (!copy) return;
-      this.swapped.push({mesh, geometry: mesh.geometry});
-      if (mesh.visible && mesh.layers.isEnabled(0)) {
-        const count = (mesh as THREE.InstancedMesh).isInstancedMesh ? (mesh as THREE.InstancedMesh).count : 1;
-        this.drawnMeshes += count;
-        this.fullTriangles += mesh.geometry.index!.count / 3 * count;
-        this.motionTriangles += copy.index!.count / 3 * count;
-      }
-      mesh.geometry = copy;
-    });
+    this.lastNavigation = {meshes: this.drawnMeshes, fullTriangles: this.fullTriangles,
+      motionTriangles: this.motionTriangles, tooClose};
+    return this.swapped.length > 0;
   }
 
   private quietTimer: ReturnType<typeof setTimeout> | null = null;
@@ -229,7 +225,7 @@ export class BlenderMotionGeometry {
   }
   inspect() {
     return {copies: this.cache.size, bytes: this.bytes, queued: this.queue.length, pending: this.pending !== null,
-      unavailable: this.unavailable, lastDraw: {meshes: this.drawnMeshes, fullTriangles: this.fullTriangles, motionTriangles: this.motionTriangles}};
+      unavailable: this.unavailable, lastNavigation: {...this.lastNavigation}};
   }
   private releaseCopies(): void {
     this.finish();

package/browser/three/blender-runtime-view.ts

@@ -645,7 +645,7 @@ export class BlenderRuntimeView {
   readonly root = new THREE.Group();
   private readonly instances = new BlenderRuntimeInstances(this.root);
   private readonly transparentInstances = new BlenderTransparentInstances(this.root);
-  private readonly motionGeometry = new BlenderMotionGeometry(this.root, presenterChanged);
+  private readonly motionGeometry = new BlenderMotionGeometry(presenterChanged);
   private drawBatching = true;
   private readonly objects = new Map<string, THREE.Object3D>();
   private readonly meshes = new Map<
@@ -1249,8 +1249,14 @@ export class BlenderRuntimeView {
     try {
       this.instances.prepareDraw(camera);
       this.root.updateMatrixWorld(true);
+      const motion = this.motionGeometry.prepare(camera, !this.rendered && (this.mode ?? this.frame?.mode) === 'OBJECT' &&
+        options?.interactive === true, options?.height ?? 0);
+      // A changed navigation geometry is an ordinary-draw fallback for an
+      // opaque batch; its full-detail members remain instanced. Transparent
+      // runs are planned AFTER per-placement geometry selection, preserving
+      // their sorting barriers and compatible geometry grouping.
+      if (motion) this.instances.sync();
       this.transparentInstances.prepare(camera);
-      this.motionGeometry.prepare(camera, !this.rendered && options?.interactive === true, options?.height ?? 0);
     } catch (error) {
       this.motionGeometry.finish();
       this.instances.finishDraw();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@volter/blender-engine",
   "author": "Volter AI, Inc.",
   "license": "GPL-3.0-or-later",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "publishConfig": {
     "access": "public"
   },