matrix-engine-wgpu 1.3.7 → 1.3.9

package/index.js

@@ -4,7 +4,7 @@
  * npm import/export
  */
 // import {degToRad, radToDeg} from "./utils";
-import {downloadMeshes} from "./src/engine/loader-obj.js";
+import {downloadMeshes, makeObjSeqArg} from "./src/engine/loader-obj.js";
 import MatrixEngineWGPU from "./src/world.js";
 import {
   addRaycastsAABBListener,
@@ -36,5 +36,6 @@ export {
   rayIntersectsAABB,
   computeAABB,
   computeWorldVertsAndAABB,
+  makeObjSeqArg,
   about
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-engine-wgpu",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "obj sequence anim +HOTFIX raycast, webGPU powered pwa application. Crazy fast rendering with AmmoJS physics support. Simple raycaster hit object added.",
   "main": "index.js",
   "files": [

package/src/physics/matrix-ammo.js

@@ -68,8 +68,14 @@ export default class MatrixAmmo {
   }
 
   addPhysicsSphere(MEObject, pOptions) {
+    const FLAGS = {
+      TEST_NIDZA: 3,
+      CF_KINEMATIC_OBJECT: 2
+    }
+
     let Ammo = this.Ammo;
-    var colShape = new Ammo.btSphereShape(pOptions.radius),
+    console.log(pOptions.radius + "<<pOptions.radius")
+    var colShape = new Ammo.btSphereShape(Array.isArray(pOptions.radius) ? pOptions.radius[0] : pOptions.radius),
       startTransform = new Ammo.btTransform();
     startTransform.setIdentity();
     var mass = 1;
@@ -81,6 +87,20 @@ export default class MatrixAmmo {
       rbInfo = new Ammo.btRigidBodyConstructionInfo(mass, myMotionState, colShape, localInertia),
       body = new Ammo.btRigidBody(rbInfo);
 
+    if(pOptions.mass == 0 && typeof pOptions.state == 'undefined' && typeof pOptions.collide == 'undefined') {
+      body.setActivationState(2)
+      body.setCollisionFlags(FLAGS.CF_KINEMATIC_OBJECT);
+      // console.log('what is pOptions.mass and state is 2 ....', pOptions.mass)
+    } else if(typeof pOptions.collide != 'undefined' && pOptions.collide == false) {
+      // idea not work for now - eliminate collide effect
+      body.setActivationState(4)
+      body.setCollisionFlags(FLAGS.TEST_NIDZA);
+    } else {
+      body.setActivationState(4)
+    }
+
+    body.name = pOptions.name;
+    MEObject.itIsPhysicsBody = true;
     body.MEObject = MEObject;
     this.dynamicsWorld.addRigidBody(body);
     this.rigidBodies.push(body);