@onerjs/core 8.44.3 → 8.44.5

package/Particles/solidParticleSystem.js

@@ -282,9 +282,12 @@ export class SolidParticleSystem {
         const meshPos = mesh.getVerticesData(VertexBuffer.PositionKind);
         const meshInd = mesh.getIndices();
         const meshUV = mesh.getVerticesData(this._getUVKind(mesh, options?.uvKind ?? 0));
-        const meshCol = mesh.getVerticesData(VertexBuffer.ColorKind);
+        let meshCol = mesh.getVerticesData(VertexBuffer.ColorKind);
         const meshNor = mesh.getVerticesData(VertexBuffer.NormalKind);
         const storage = options && options.storage ? options.storage : null;
+        // Normalize vertex colors to RGBA (4 components) since the code below always reads 4 components per color.
+        // Source meshes (e.g. from glTF) may provide RGB (3 components) vertex colors.
+        meshCol = this._normalizeMeshVertexColors(mesh, meshPos, meshCol);
         let f = 0; // facet counter
         const totalFacets = meshInd.length / 3; // a facet is a triangle, so 3 indices
         // compute size from number
@@ -605,6 +608,30 @@ export class SolidParticleSystem {
         target.push(sp);
         return sp;
     }
+    _normalizeMeshVertexColors(mesh, meshPos, meshCol) {
+        if (!meshCol) {
+            return meshCol;
+        }
+        const vertexCount = meshPos.length / 3;
+        if (!vertexCount) {
+            return meshCol;
+        }
+        const colorBuffer = mesh.getVertexBuffer(VertexBuffer.ColorKind);
+        const colorStride = colorBuffer ? colorBuffer.getSize() : Math.round(meshCol.length / vertexCount);
+        if (colorStride !== 3 || meshCol.length !== vertexCount * 3) {
+            return meshCol;
+        }
+        const rgba = new Float32Array(vertexCount * 4);
+        for (let i = 0; i < vertexCount; i++) {
+            const rgbIndex = i * 3;
+            const rgbaIndex = i * 4;
+            rgba[rgbaIndex] = meshCol[rgbIndex];
+            rgba[rgbaIndex + 1] = meshCol[rgbIndex + 1];
+            rgba[rgbaIndex + 2] = meshCol[rgbIndex + 2];
+            rgba[rgbaIndex + 3] = 1;
+        }
+        return rgba;
+    }
     /**
      * Adds some particles to the SPS from the model shape. Returns the shape id.
      * Please read the doc : https://doc.babylonjs.com/features/featuresDeepDive/particles/solid_particle_system/immutable_sps
@@ -622,9 +649,12 @@ export class SolidParticleSystem {
         const meshPos = mesh.getVerticesData(VertexBuffer.PositionKind);
         const meshInd = mesh.getIndices();
         const meshUV = mesh.getVerticesData(VertexBuffer.UVKind);
-        const meshCol = mesh.getVerticesData(VertexBuffer.ColorKind);
+        let meshCol = mesh.getVerticesData(VertexBuffer.ColorKind);
         const meshNor = mesh.getVerticesData(VertexBuffer.NormalKind);
         this.recomputeNormals = meshNor ? false : true;
+        // Normalize vertex colors to RGBA (4 components) since _meshBuilder always reads 4 components per color.
+        // Source meshes (e.g. from glTF) may provide RGB (3 components) vertex colors.
+        meshCol = this._normalizeMeshVertexColors(mesh, meshPos, meshCol);
         const indices = Array.from(meshInd);
         const shapeNormals = meshNor ? Array.from(meshNor) : [];
         const shapeColors = meshCol ? Array.from(meshCol) : [];