@woosh/meep-engine 2.118.13 → 2.119.0

package/src/engine/graphics/geometry/skining/computeSkinnedMeshVertices.js

@@ -1,4 +1,6 @@
-import { Matrix4 as ThreeMatrix4 } from "three";
+import { m4_multiply } from "../../../../core/geom/3d/mat4/m4_multiply.js";
+import { mat4x4_transpose_copy_to_mat4x3 } from "../../../../core/math/matrix/mat4x4_transpose_copy_to_mat4x3.js";
+import { mesh_apply_skeletal_vertex_skinning } from "./mesh_apply_skeletal_vertex_skinning.js";
 
 /**
  * NOTE: the method is completely inlined for better performance. 0 function calls within the skinning loop
@@ -6,21 +8,27 @@ import { Matrix4 as ThreeMatrix4 } from "three";
  * @param {SkinnedMesh} mesh
  * @param {number} [destination_offset=0]
  */
-export function computeSkinnedMeshVertices(destination, mesh, destination_offset = 0) {
+export function computeSkinnedMeshVertices(
+    destination,
+    mesh,
+    destination_offset = 0
+) {
+
     const geometry = mesh.geometry;
     const skeleton = mesh.skeleton;
 
-    const tempMatrix = new ThreeMatrix4();
+    const tempMatrix = new Float32Array(16);
 
     const attributes = geometry.attributes;
 
     const positions = attributes.position.array;
-    const skinIndicesArray = attributes.skinIndex.array;
-    const skinWeightsArray = attributes.skinWeight.array;
+    const skin_indices_array = attributes.skinIndex.array;
+    const skin_weights_array = attributes.skinWeight.array;
 
-    const vertexCount = attributes.position.count;
+    const vertex_count = attributes.position.count;
 
-    const boneCount = skeleton.bones.length;
+    const bones = skeleton.bones;
+    const boneCount = bones.length;
 
     //pre-build transform matrices for bones
     const boneMatrixData = new Float32Array(boneCount * 12);
@@ -28,113 +36,19 @@ export function computeSkinnedMeshVertices(destination, mesh, destination_offset
     for (let boneIndex = 0; boneIndex < boneCount; boneIndex++) {
         const targetIndex = boneIndex * 12;
 
-        tempMatrix.multiplyMatrices(skeleton.bones[boneIndex].matrixWorld, skeleton.boneInverses[boneIndex]);
-
-        const el = tempMatrix.elements;
-
-        //write matrix data in transposed form, to conform to access order when applied to Vector3 transformation
-        boneMatrixData[targetIndex] = el[0];
-        boneMatrixData[targetIndex + 1] = el[4];
-        boneMatrixData[targetIndex + 2] = el[8];
-        boneMatrixData[targetIndex + 3] = el[12];
+        m4_multiply(tempMatrix, bones[boneIndex].matrixWorld.elements, skeleton.boneInverses[boneIndex].elements);
 
-        boneMatrixData[targetIndex + 4] = el[1];
-        boneMatrixData[targetIndex + 5] = el[5];
-        boneMatrixData[targetIndex + 6] = el[9];
-        boneMatrixData[targetIndex + 7] = el[13];
-
-        boneMatrixData[targetIndex + 8] = el[2];
-        boneMatrixData[targetIndex + 9] = el[6];
-        boneMatrixData[targetIndex + 10] = el[10];
-        boneMatrixData[targetIndex + 11] = el[14];
+        // write matrix data in transposed form, to conform to access order when applied to Vector3 transformation
+        mat4x4_transpose_copy_to_mat4x3(
+            boneMatrixData, targetIndex,
+            tempMatrix, 0
+        );
     }
 
     const m4_bind = mesh.bindMatrix.elements;
 
-    const m4_bind_0 = m4_bind[0];
-    const m4_bind_1 = m4_bind[1];
-    const m4_bind_2 = m4_bind[2];
-    const m4_bind_4 = m4_bind[4];
-    const m4_bing_5 = m4_bind[5];
-    const m4_bing_6 = m4_bind[6];
-    const m4_bing_8 = m4_bind[8];
-    const m4_bing_9 = m4_bind[9];
-    const m4_bing_10 = m4_bind[10];
-    const m4_bing_12 = m4_bind[12];
-    const m4_bing_13 = m4_bind[13];
-    const m4_bing_14 = m4_bind[14];
-
+    // inverse of bind matrix
     const m4_bind_inv = mesh.bindMatrixInverse.elements;
 
-    const m4_bind_inv_0 = m4_bind_inv[0];
-    const m4_bind_inv_1 = m4_bind_inv[1];
-    const m4_bind_inv_2 = m4_bind_inv[2];
-    const m4_bind_inv_4 = m4_bind_inv[4];
-    const m4_bind_inv_5 = m4_bind_inv[5];
-    const m4_bind_inv_6 = m4_bind_inv[6];
-    const m4_bind_inv_8 = m4_bind_inv[8];
-    const m4_bind_inv_9 = m4_bind_inv[9];
-    const m4_bind_inv_10 = m4_bind_inv[10];
-    const m4_bind_inv_12 = m4_bind_inv[12];
-    const m4_bind_inv_13 = m4_bind_inv[13];
-    const m4_bind_inv_14 = m4_bind_inv[14];
-
-    let index, i, x, y, z;
-
-    for (index = 0; index < vertexCount; index++) {
-
-        const index3 = index * 3;
-        const index4 = index << 2;
-
-        //read vertex position
-        const px = positions[index3];
-        const py = positions[index3 + 1];
-        const pz = positions[index3 + 2];
-
-        //apply bind matrix transform to vertex
-        const bx = m4_bind_0 * px + m4_bind_4 * py + m4_bing_8 * pz + m4_bing_12;
-        const by = m4_bind_1 * px + m4_bing_5 * py + m4_bing_9 * pz + m4_bing_13;
-        const bz = m4_bind_2 * px + m4_bing_6 * py + m4_bing_10 * pz + m4_bing_14;
-
-        x = 0;
-        y = 0;
-        z = 0;
-
-        for (i = 0; i < 4; i++) {
-            const skinIndex = index4 + i;
-
-            const skinWeight = skinWeightsArray[skinIndex];
-
-            if (skinWeight !== 0) {
-
-                const boneIndex = skinIndicesArray[skinIndex];
-
-                const bdIndex = boneIndex * 12;
-
-                const sx = boneMatrixData[bdIndex] * bx + boneMatrixData[bdIndex + 1] * by + boneMatrixData[bdIndex + 2] * bz + boneMatrixData[bdIndex + 3];
-                const sy = boneMatrixData[bdIndex + 4] * bx + boneMatrixData[bdIndex + 5] * by + boneMatrixData[bdIndex + 6] * bz + boneMatrixData[bdIndex + 7];
-                const sz = boneMatrixData[bdIndex + 8] * bx + boneMatrixData[bdIndex + 9] * by + boneMatrixData[bdIndex + 10] * bz + boneMatrixData[bdIndex + 11];
-
-                const tx = sx * skinWeight;
-                const ty = sy * skinWeight;
-                const tz = sz * skinWeight;
-
-                x += tx;
-                y += ty;
-                z += tz;
-
-            }
-        }
-
-        //apply inverse bind matrix
-        const wx = m4_bind_inv_0 * x + m4_bind_inv_4 * y + m4_bind_inv_8 * z + m4_bind_inv_12;
-        const wy = m4_bind_inv_1 * x + m4_bind_inv_5 * y + m4_bind_inv_9 * z + m4_bind_inv_13;
-        const wz = m4_bind_inv_2 * x + m4_bind_inv_6 * y + m4_bind_inv_10 * z + m4_bind_inv_14;
-
-        const destination_address = destination_offset + index3;
-
-        destination[destination_address] = wx;
-        destination[destination_address + 1] = wy;
-        destination[destination_address + 2] = wz;
-    }
+    mesh_apply_skeletal_vertex_skinning(destination, destination_offset, positions, vertex_count, skin_weights_array, skin_indices_array, boneMatrixData, m4_bind, m4_bind_inv);
 }

package/src/engine/graphics/geometry/skining/mesh_apply_skeletal_vertex_skinning.d.ts

@@ -0,0 +1,15 @@
+/**
+ *
+ * @param {number[]|Float32Array} destination
+ * @param {number} destination_offset
+ * @param {number[]|Float32Array} positions
+ * @param {number} vertex_count
+ * @param {number[]|Float32Array} skin_weights_array
+ * @param {number[]|Uint32Array} skin_indices_array
+ * @param {number[]|Float32Array} bone_matrices 4x3 transform matrices
+ * @param {number[]|Float32Array} m4_bind
+ * @param {number[]|Float32Array} m4_bind_inv
+ * @param {number} [bones_per_vertex]
+ */
+export function mesh_apply_skeletal_vertex_skinning(destination: number[] | Float32Array, destination_offset: number, positions: number[] | Float32Array, vertex_count: number, skin_weights_array: number[] | Float32Array, skin_indices_array: number[] | Uint32Array, bone_matrices: number[] | Float32Array, m4_bind: number[] | Float32Array, m4_bind_inv: number[] | Float32Array, bones_per_vertex?: number): void;
+//# sourceMappingURL=mesh_apply_skeletal_vertex_skinning.d.ts.map

package/src/engine/graphics/geometry/skining/mesh_apply_skeletal_vertex_skinning.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mesh_apply_skeletal_vertex_skinning.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/skining/mesh_apply_skeletal_vertex_skinning.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,iEAXW,MAAM,EAAE,GAAC,YAAY,sBACrB,MAAM,aACN,MAAM,EAAE,GAAC,YAAY,gBACrB,MAAM,sBACN,MAAM,EAAE,GAAC,YAAY,sBACrB,MAAM,EAAE,GAAC,WAAW,iBACpB,MAAM,EAAE,GAAC,YAAY,WACrB,MAAM,EAAE,GAAC,YAAY,eACrB,MAAM,EAAE,GAAC,YAAY,qBACrB,MAAM,QAyEhB"}

package/src/engine/graphics/geometry/skining/mesh_apply_skeletal_vertex_skinning.js

@@ -0,0 +1,85 @@
+/**
+ *
+ * @param {number[]|Float32Array} destination
+ * @param {number} destination_offset
+ * @param {number[]|Float32Array} positions
+ * @param {number} vertex_count
+ * @param {number[]|Float32Array} skin_weights_array
+ * @param {number[]|Uint32Array} skin_indices_array
+ * @param {number[]|Float32Array} bone_matrices 4x3 transform matrices
+ * @param {number[]|Float32Array} m4_bind
+ * @param {number[]|Float32Array} m4_bind_inv
+ * @param {number} [bones_per_vertex]
+ */
+export function mesh_apply_skeletal_vertex_skinning(
+    destination,
+    destination_offset,
+    positions,
+    vertex_count,
+    skin_weights_array,
+    skin_indices_array,
+    bone_matrices,
+    m4_bind,
+    m4_bind_inv,
+    bones_per_vertex = 4
+) {
+
+    let index, i, x, y, z;
+
+    for (index = 0; index < vertex_count; index++) {
+
+        const index3 = index * 3;
+
+        //read vertex position
+        const px = positions[index3];
+        const py = positions[index3 + 1];
+        const pz = positions[index3 + 2];
+
+        //apply bind matrix transform to vertex
+        const bx = m4_bind[0] * px + m4_bind[4] * py + m4_bind[8] * pz + m4_bind[12];
+        const by = m4_bind[1] * px + m4_bind[5] * py + m4_bind[9] * pz + m4_bind[13];
+        const bz = m4_bind[2] * px + m4_bind[6] * py + m4_bind[10] * pz + m4_bind[14];
+
+        x = 0;
+        y = 0;
+        z = 0;
+
+        for (i = 0; i < bones_per_vertex; i++) {
+
+            const skin_index = index * bones_per_vertex + i;
+
+            const skin_weight = skin_weights_array[skin_index];
+
+            if (skin_weight !== 0) {
+
+                const boneIndex = skin_indices_array[skin_index];
+
+                const bdIndex = boneIndex * 12;
+
+                const sx = bone_matrices[bdIndex] * bx + bone_matrices[bdIndex + 1] * by + bone_matrices[bdIndex + 2] * bz + bone_matrices[bdIndex + 3];
+                const sy = bone_matrices[bdIndex + 4] * bx + bone_matrices[bdIndex + 5] * by + bone_matrices[bdIndex + 6] * bz + bone_matrices[bdIndex + 7];
+                const sz = bone_matrices[bdIndex + 8] * bx + bone_matrices[bdIndex + 9] * by + bone_matrices[bdIndex + 10] * bz + bone_matrices[bdIndex + 11];
+
+                const tx = sx * skin_weight;
+                const ty = sy * skin_weight;
+                const tz = sz * skin_weight;
+
+                x += tx;
+                y += ty;
+                z += tz;
+
+            }
+        }
+
+        //apply inverse bind matrix
+        const wx = m4_bind_inv[0] * x + m4_bind_inv[4] * y + m4_bind_inv[8] * z + m4_bind_inv[12];
+        const wy = m4_bind_inv[1] * x + m4_bind_inv[5] * y + m4_bind_inv[9] * z + m4_bind_inv[13];
+        const wz = m4_bind_inv[2] * x + m4_bind_inv[6] * y + m4_bind_inv[10] * z + m4_bind_inv[14];
+
+        const destination_address = destination_offset + index3;
+
+        destination[destination_address] = wx;
+        destination[destination_address + 1] = wy;
+        destination[destination_address + 2] = wz;
+    }
+}

package/src/engine/graphics/trail/x/RibbonXPlugin.d.ts

@@ -4,7 +4,7 @@ export class RibbonXPlugin extends EnginePlugin {
     /**
      * @private
      * @readonly
-     * @type {Cache<RibbonXMaterialSpec, Material>}
+     * @type {Cache<RibbonXMaterialSpec, RibbonMaterialX>}
      */
     private readonly materialCache;
     __shared_uniforms: {

package/src/engine/graphics/trail/x/RibbonXPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RibbonXPlugin.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonXPlugin.js"],"names":[],"mappings":"AASA;IACI,8BA6BC;IA1BG,WAA2B;IAE3B;;;;OAIG;IACH,+BAKE;IAEF;;;;MAIC;IAED;;;;OAIG;IACH,oBAAwC;IAG5C,sCAIC;IAED,wBAMC;IAED,yBAKC;IAED;;;;OAIG;IACH,0EAIC;IAED;;;;OAIG;IACH,8CAFa,eAAe,CAe3B;IAGD;;;;;OAKG;IACH,yBAsCC;CACJ;6BAtI4B,iCAAiC;wBAL1B,OAAO;gCAOX,sBAAsB"}
+{"version":3,"file":"RibbonXPlugin.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonXPlugin.js"],"names":[],"mappings":"AASA;IACI,8BA6BC;IA1BG,WAA2B;IAE3B;;;;OAIG;IACH,+BAKE;IAEF;;;;MAIC;IAED;;;;OAIG;IACH,oBAAwC;IAG5C,sCAIC;IAED,wBAMC;IAED,yBAKC;IAED;;;;OAIG;IACH,0EAIC;IAED;;;;OAIG;IACH,8CAFa,eAAe,CAI3B;IAED;;;;;OAKG;IACH,yBAsCC;CACJ;6BA1H4B,iCAAiC;wBAL1B,OAAO;gCAOX,sBAAsB"}

package/src/engine/graphics/trail/x/RibbonXPlugin.js

@@ -16,7 +16,7 @@ export class RibbonXPlugin extends EnginePlugin {
         /**
          * @private
          * @readonly
-         * @type {Cache<RibbonXMaterialSpec, Material>}
+         * @type {Cache<RibbonXMaterialSpec, RibbonMaterialX>}
          */
         this.materialCache = new Cache({
             maxWeight: 128,
@@ -77,21 +77,9 @@ export class RibbonXPlugin extends EnginePlugin {
      * @returns {RibbonMaterialX}
      */
     obtain_material_x(spec) {
-        const existing = this.materialCache.get(spec);
-
-        if (existing !== null) {
-            return existing;
-        }
-
-        // material not found in cache
-        const material = this.__build_material(spec);
-
-        this.materialCache.put(spec, material);
-
-        return material;
+        return this.materialCache.getOrCompute(spec, this.__build_material, this);
     }
 
-
     /**
      *
      * @param {RibbonXMaterialSpec} spec

package/src/engine/intelligence/blackboard/BlackboardValue.d.ts

@@ -14,8 +14,8 @@ export class BlackboardValue {
      * @type {DataType}
      */
     type: DataType;
-    value: ObservedBoolean | Vector1;
+    value: Vector1 | ObservedBoolean;
 }
-import ObservedBoolean from "../../../core/model/ObservedBoolean.js";
 import Vector1 from "../../../core/geom/Vector1.js";
+import ObservedBoolean from "../../../core/model/ObservedBoolean.js";
 //# sourceMappingURL=BlackboardValue.d.ts.map

package/src/engine/intelligence/blackboard/BlackboardValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlackboardValue.d.ts","sourceRoot":"","sources":["../../../../../src/engine/intelligence/blackboard/BlackboardValue.js"],"names":[],"mappings":"AA+BA;IACI;;;OAGG;IACH,4BAYC;IAXG;;;OAGG;IACH,gBAFU,MAAM,CAEO;IACvB;;;OAGG;IACH,eAAgB;IAChB,iCAAoC;CAE3C;4BA/C2B,wCAAwC;oBADhD,+BAA+B"}
+{"version":3,"file":"BlackboardValue.d.ts","sourceRoot":"","sources":["../../../../../src/engine/intelligence/blackboard/BlackboardValue.js"],"names":[],"mappings":"AA+BA;IACI;;;OAGG;IACH,4BAYC;IAXG;;;OAGG;IACH,gBAFU,MAAM,CAEO;IACvB;;;OAGG;IACH,eAAgB;IAChB,iCAAoC;CAE3C;oBAhDmB,+BAA+B;4BACvB,wCAAwC"}