@volter/blender-engine 0.1.66 → 0.1.67

package/browser/three/blender-graph-material.ts

@@ -148,6 +148,30 @@ export function graphUvChannels(material: THREE.MeshPhysicalMaterial): number[]
   return Object.values(bindings.get(material)?.channels ?? {});
 }
 
+/** Attributes a physical graph draw can read, including its pending program.
+ * Resident geometry retains many more authored layers than a shader consumes;
+ * only shader inputs count toward WebGL's vertex attribute limit. */
+export function graphDrawAttributes(material: THREE.Material, geometry: THREE.BufferGeometry): Set<string> {
+  const names = new Set(['position', 'normal', 'uv']);
+  if (geometry.hasAttribute('tangent')) names.add('tangent');
+  if (material.vertexColors) names.add('color');
+  if (!(material instanceof THREE.MeshPhysicalMaterial)) return names;
+  const channels = geometry.userData['blenderUvChannels'] as Record<string, number> | undefined;
+  const uv = (name: string) => {
+    const channel = name === '' ? 0 : (channels?.[name] ?? 9);
+    names.add(channel === 0 ? 'uv' : `uv${channel}`);
+  };
+  for (const texture of [material.map, material.roughnessMap, material.normalMap])
+    if (texture) uv((texture.userData['blenderUvName'] as string | undefined) ?? '');
+  for (const binding of [bindings.get(material), pendings.get(material)?.binding]) {
+    if (!binding) continue;
+    names.add('blenderOrco');
+    for (const name of binding.compiled.uvs) uv(name);
+    for (const name of binding.compiled.attributes) names.add(graphAttributeName(name));
+  }
+  return names;
+}
+
 /** The channel each named UV layer is in on `geometry` (a layer the mesh
  *  lacks reads zeros from channel 9, Blender's missing attribute). */
 function channelsFor(compiled: CompiledGraph, geometry: THREE.BufferGeometry): Record<string, number> {

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

@@ -1,4 +1,5 @@
 import * as THREE from 'three';
+import { graphDrawAttributes } from './blender-graph-material';
 
 // Small spatial batches retain frustum rejection without duplicating geometry.
 const BATCH_SIZE = 64;
@@ -42,6 +43,8 @@ export class BlenderRuntimeInstances {
   private readonly inverse = new THREE.Matrix4();
   private readonly matrix = new THREE.Matrix4();
   private readonly box = new THREE.Box3();
+  private eligible = 0;
+  private excluded: Record<string, number> = {};
 
   constructor(private readonly root: THREE.Group) {}
 
@@ -49,21 +52,24 @@ export class BlenderRuntimeInstances {
     this.clear();
     if (!enabled) return;
     const groups = new Map<string, THREE.Mesh[]>();
+    const exclude = (reason: string) => { this.excluded[reason] = (this.excluded[reason] ?? 0) + 1; };
     this.inverse.copy(this.root.matrixWorld).invert();
     for (const object of objects) {
       const mesh = object as THREE.Mesh;
-      if (!mesh.isMesh || (mesh as THREE.SkinnedMesh).isSkinnedMesh ||
+      if (!mesh.isMesh) continue;
+      if ((mesh as THREE.SkinnedMesh).isSkinnedMesh ||
           (mesh as THREE.InstancedMesh).isInstancedMesh || mesh.morphTargetInfluences ||
-          mesh.layers.mask !== 1) continue;
-      // WebGL2 guarantees sixteen vertex attributes; the instance matrix uses
-      // four. Keep richly attributed meshes on the ordinary path rather than
-      // dropping UV/colour channels or risking a refused shader.
-      if (Object.values(mesh.geometry.attributes).reduce((count, attribute) => count + Math.ceil(attribute.itemSize / 4), 0) > 12) continue;
+          mesh.layers.mask !== 1) { exclude('deformationOrLayers'); continue; }
       const materials = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
       if (materials.some(m => m.transparent || (m as THREE.MeshPhysicalMaterial).transmission > 0 ||
-          (m as THREE.ShaderMaterial).isShaderMaterial)) continue;
+          (m as THREE.ShaderMaterial).isShaderMaterial)) { exclude('material'); continue; }
+      // Four slots for instanceMatrix, at most twelve for each actual program.
+      // Count active inputs, NOT every stored authored layer: retaining unused
+      // UVs/colours must not disable batching. No channel is deleted to fit.
+      if (materials.some(m => graphDrawAttributes(m, mesh.geometry).size > 12)) { exclude('attributeBudget'); continue; }
       this.matrix.multiplyMatrices(this.inverse, mesh.matrixWorld);
-      if (!supported(this.matrix)) continue;
+      if (!supported(this.matrix)) { exclude('transform'); continue; }
+      this.eligible++;
       const key = `${mesh.geometry.id}:${Array.isArray(mesh.material) ? 'slots' : 'single'}:` +
         materials.map(m => m.uuid).join(',') + `:${mesh.renderOrder}`;
       const group = groups.get(key);
@@ -155,9 +161,12 @@ export class BlenderRuntimeInstances {
       draw.dispose(); // releases instance attributes, never shared geometry/material
     }
     this.batches.length = 0;
+    this.eligible = 0;
+    this.excluded = {};
   }
 
   inspect() {
-    return {batches: this.batches.length, instances: this.batches.reduce((count, {draw}) => count + draw.count, 0)};
+    return {batches: this.batches.length, instances: this.batches.reduce((count, {draw}) => count + draw.count, 0),
+      eligible: this.eligible, excluded: {...this.excluded}};
   }
 }

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

@@ -2027,6 +2027,10 @@ export class BlenderRuntimeView {
     };
   }
 
+  drawStatistics() {
+    return this.instances.inspect();
+  }
+
   snapshot() {
     return this.frame;
   }

package/package.json

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