@onerjs/core 8.47.1 → 8.47.3

package/Meshes/mesh.js

@@ -3398,7 +3398,7 @@ export class Mesh extends AbstractMesh {
         // Physics
         //TODO implement correct serialization for physics impostors.
         if (this.getScene()._getComponent(SceneComponentConstants.NAME_PHYSICSENGINE)) {
-            const impostor = this.getPhysicsImpostor();
+            const impostor = this.getPhysicsImpostor?.();
             if (impostor) {
                 serializationObject.physicsMass = impostor.getParam("mass");
                 serializationObject.physicsFriction = impostor.getParam("friction");
@@ -3439,7 +3439,7 @@ export class Mesh extends AbstractMesh {
             // Physics
             //TODO implement correct serialization for physics impostors.
             if (this.getScene()._getComponent(SceneComponentConstants.NAME_PHYSICSENGINE)) {
-                const impostor = instance.getPhysicsImpostor();
+                const impostor = instance.getPhysicsImpostor?.();
                 if (impostor) {
                     serializationInstance.physicsMass = impostor.getParam("mass");
                     serializationInstance.physicsFriction = impostor.getParam("friction");
@@ -4110,8 +4110,14 @@ export class Mesh extends AbstractMesh {
                 }
             }
         }
+        // Preserve the caller's first mesh for naming and property copying,
+        // since sorting below may reorder the array.
+        const source = meshes[0];
         if (multiMultiMaterials) {
             subdivideWithSubMeshes = false;
+            // Sort meshes by material so that meshes sharing the same material are adjacent.
+            // This produces contiguous index ranges per material, enabling submesh consolidation below.
+            meshes.sort((a, b) => (a.material?.uniqueId ?? -1) - (b.material?.uniqueId ?? -1));
         }
         const materialArray = new Array();
         const materialIndexArray = new Array();
@@ -4168,13 +4174,34 @@ export class Mesh extends AbstractMesh {
                 }
             }
         }
-        const source = meshes[0];
+        // Consolidate consecutive submesh entries that share the same material and
+        // have contiguous index ranges. Same-material entries are not guaranteed to
+        // be gap-free, so only merge when the next range starts exactly where the
+        // current one ends.
+        if (multiMultiMaterials && indiceArray.length > 1) {
+            let writeIdx = 0;
+            for (let readIdx = 1; readIdx < indiceArray.length; readIdx++) {
+                const previousIndice = indiceArray[writeIdx];
+                const currentIndice = indiceArray[readIdx];
+                if (materialIndexArray[readIdx] === materialIndexArray[writeIdx] && previousIndice.start + previousIndice.count === currentIndice.start) {
+                    // Extend the previous entry only when this range is contiguous
+                    previousIndice.count += currentIndice.count;
+                }
+                else {
+                    writeIdx++;
+                    indiceArray[writeIdx] = currentIndice;
+                    materialIndexArray[writeIdx] = materialIndexArray[readIdx];
+                }
+            }
+            indiceArray.length = writeIdx + 1;
+            materialIndexArray.length = writeIdx + 1;
+        }
         const getVertexDataFromMesh = (mesh) => {
             const wm = mesh.computeWorldMatrix(true);
             const vertexData = VertexData.ExtractFromMesh(mesh, false, false);
             return { vertexData, transform: wm };
         };
-        const { vertexData: sourceVertexData, transform: sourceTransform } = getVertexDataFromMesh(source);
+        const { vertexData: sourceVertexData, transform: sourceTransform } = getVertexDataFromMesh(meshes[0]);
         if (isAsync) {
             yield;
         }