@meimu/mutracer 0.2.0 → 0.3.1

package/lib/util/fromTHREE.js

@@ -281,7 +281,7 @@ function convertMaterial(threeMaterial, textureCache) {
     }
     const dispersion = Number(physicalMaterial.dispersion);
     material.transmissionDispersionScale = Number.isFinite(dispersion)
-        ? Math.min(1, Math.max(0, dispersion))
+        ? Math.max(0, dispersion)
         : 0;
     const realtimeIridescence = physicalMaterial;
     material.thinFilmThickness = Math.min(20, Math.max(0, (realtimeIridescence.iridescenceThicknessRange?.[1] ?? 500) / 1000));
@@ -372,7 +372,7 @@ function convertMaterial(threeMaterial, textureCache) {
         material.specularColor = color(openPbr.specularColor, material.specularColor);
         material.transmissionScatter = color(openPbr.transmissionScatter, material.transmissionScatter);
         material.transmissionScatterAnisotropy = finite(openPbr.transmissionScatterAnisotropy, material.transmissionScatterAnisotropy, -0.95, 0.95);
-        material.transmissionDispersionScale = finite(openPbr.transmissionDispersionScale, material.transmissionDispersionScale);
+        material.transmissionDispersionScale = finite(openPbr.transmissionDispersionScale, material.transmissionDispersionScale, 0, Infinity);
         material.transmissionDispersionAbbeNumber = finite(openPbr.transmissionDispersionAbbeNumber, material.transmissionDispersionAbbeNumber, 1, 100);
         material.subsurfaceWeight = finite(openPbr.subsurfaceWeight, material.subsurfaceWeight);
         material.subsurfaceColor = color(openPbr.subsurfaceColor, material.subsurfaceColor);
@@ -435,7 +435,11 @@ function convertMaterial(threeMaterial, textureCache) {
     }
     return material;
 }
-function copyFloatAttribute(attribute, itemSize = attribute.itemSize) {
+function copyFloatAttribute(attribute, itemSize = attribute.itemSize, share = false) {
+    if (share && attribute.array instanceof Float32Array && !attribute.normalized &&
+        !attribute.isInterleavedBufferAttribute &&
+        attribute.itemSize === itemSize && attribute.array.length === attribute.count * itemSize)
+        return attribute.array;
     const result = new Float32Array(attribute.count * itemSize);
     if (attribute.array instanceof Float32Array && !attribute.normalized) {
         const interleaved = attribute;
@@ -470,7 +474,7 @@ function copyFloatAttribute(attribute, itemSize = attribute.itemSize) {
     }
     return result;
 }
-function convertGeometry(threeGeometry, drawRange, vertexColors, backSide) {
+function convertGeometry(threeGeometry, drawRange, vertexColors, backSide, share = false) {
     const positionAttrb = threeGeometry.getAttribute('position');
     const normalAttrb = threeGeometry.getAttribute('normal');
     const tangentAttrb = threeGeometry.getAttribute('tangent');
@@ -493,11 +497,12 @@ function convertGeometry(threeGeometry, drawRange, vertexColors, backSide) {
     indexCount -= indexCount % 3;
     if (indexCount === 0)
         return null;
-    const indices = new Uint32Array(indexCount);
-    if (indexAttrb) {
+    const sharedIndex = share && !backSide && start === 0 && indexCount === indexAttrb?.array.length && indexAttrb.array instanceof Uint32Array;
+    const indices = sharedIndex ? indexAttrb.array : new Uint32Array(indexCount);
+    if (indexAttrb && !sharedIndex) {
         indices.set(indexAttrb.array.subarray(start, start + indexCount));
     }
-    else {
+    else if (!indexAttrb) {
         for (let index = 0; index < indexCount; index++)
             indices[index] = start + index;
     }
@@ -509,15 +514,15 @@ function convertGeometry(threeGeometry, drawRange, vertexColors, backSide) {
         }
     }
     const geometry = new Geometry({
-        position: new Attribute(copyFloatAttribute(positionAttrb), positionAttrb.itemSize),
+        position: new Attribute(copyFloatAttribute(positionAttrb, positionAttrb.itemSize, share), positionAttrb.itemSize),
         normal: normalAttrb &&
-            new Attribute(copyFloatAttribute(normalAttrb), normalAttrb.itemSize),
-        tangent: tangentAttrb && new Attribute(copyFloatAttribute(tangentAttrb, Math.min(4, tangentAttrb.itemSize)), Math.min(4, tangentAttrb.itemSize)),
-        uv: uvAttrb && new Attribute(copyFloatAttribute(uvAttrb), uvAttrb.itemSize),
+            new Attribute(copyFloatAttribute(normalAttrb, normalAttrb.itemSize, share && !backSide), normalAttrb.itemSize),
+        tangent: tangentAttrb && new Attribute(copyFloatAttribute(tangentAttrb, Math.min(4, tangentAttrb.itemSize), share && !backSide), Math.min(4, tangentAttrb.itemSize)),
+        uv: uvAttrb && new Attribute(copyFloatAttribute(uvAttrb, uvAttrb.itemSize, share), uvAttrb.itemSize),
         uv1: uv1Attrb &&
-            new Attribute(copyFloatAttribute(uv1Attrb), uv1Attrb.itemSize),
+            new Attribute(copyFloatAttribute(uv1Attrb, uv1Attrb.itemSize, share), uv1Attrb.itemSize),
         // MuTracer stores linear RGB only; omit Three.js's optional vertex alpha.
-        color: colorAttrb ? new Attribute(copyFloatAttribute(colorAttrb, 3), 3) : undefined,
+        color: colorAttrb ? new Attribute(copyFloatAttribute(colorAttrb, 3, share), 3) : undefined,
         indices: new Attribute(indices, 1)
     });
     // Generated normals already follow the reversed indices; authored normals do not.
@@ -621,7 +626,7 @@ function retainLight(store, source, value) {
 export function fromTHREEScene(scene, options = {}) {
     return convertScene(scene, options, createConversionStore());
 }
-function convertScene(scene, options, store) {
+function convertScene(scene, options, store, shareStaticGeometry = false) {
     const updateId = ++store.updateId;
     const meshes = [];
     const lights = [];
@@ -812,7 +817,7 @@ function convertScene(scene, options, store) {
                     let geometry = geometryEntry.groups.get(geometryKey);
                     const newGeometry = !geometry;
                     if (!geometry) {
-                        const converted = convertGeometry(child.geometry, { start: group.start, count }, vertexColors, backSide);
+                        const converted = convertGeometry(child.geometry, { start: group.start, count }, vertexColors, backSide, shareStaticGeometry && !deformation);
                         if (!converted)
                             return;
                         geometry = converted;
@@ -1112,6 +1117,8 @@ function orbitControlsState(camera, controls) {
  */
 export class THREESync extends Sync {
     _options;
+    /** @internal Viewer-owned static source storage; default library conversions remain independent. */
+    _shareStaticGeometry = false;
     /** Retained converted scene; absent when no scene source was supplied. */
     scene;
     /** Retained converted camera; absent until the first camera update. */
@@ -1193,7 +1200,7 @@ export class THREESync extends Sync {
         }
         this._store.poseChanged = false;
         if (this._options.scene && this.scene) {
-            const next = convertScene(this._options.scene, this._options, this._store);
+            const next = convertScene(this._options.scene, this._options, this._store, this._shareStaticGeometry);
             if (!snapshotsEqual(this.scene.meshes, next.meshes))
                 this.scene.meshes = next.meshes;
             if (!snapshotsEqual(this.scene.lights, next.lights))