@gg-web-engine/ammo 0.0.40 → 0.0.49

package/build_gg_ammo/Makefile

@@ -1,6 +1,6 @@
 # Define variables
-AMMOJS_GIT_REPO=https://github.com/i12345/ammo.js.git
-AMMOJS_GIT_COMMIT=98d8fb3e8d5b3f3b581e7c5fe8856edb91b578d8
+AMMOJS_GIT_REPO=https://github.com/AndyGura/ammo.js.git
+AMMOJS_GIT_COMMIT=c3d7c801e49c0f41273874e643da4794e1915bf8
 BULLET_GIT_REPO=https://github.com/bulletphysics/bullet3.git
 BULLET_GIT_COMMIT=2c204c49e56ed15ec5fcfa71d199ab6d6570b3f5 # 3.25 release
 REPLACE_SRC_DIR=./patch_files

package/dist/ammo-factory.js

@@ -17,21 +17,28 @@ export class AmmoFactory {
         return new AmmoRaycastVehicleComponent(this.world, chassis);
     }
     createShape(descriptor) {
+        let shape;
         switch (descriptor.shape) {
             case 'PLANE':
-                return new Ammo.btStaticPlaneShape(new Ammo.btVector3(0, 0, 1), 0);
+                shape = new Ammo.btStaticPlaneShape(new Ammo.btVector3(0, 0, 1), 0);
+                break;
             case 'BOX':
-                return new Ammo.btBoxShape(new Ammo.btVector3(descriptor.dimensions.x / 2, descriptor.dimensions.y / 2, descriptor.dimensions.z / 2));
+                shape = new Ammo.btBoxShape(new Ammo.btVector3(descriptor.dimensions.x / 2, descriptor.dimensions.y / 2, descriptor.dimensions.z / 2));
+                break;
             case 'CAPSULE':
-                return new Ammo.btCapsuleShapeZ(descriptor.radius, descriptor.centersDistance);
+                shape = new Ammo.btCapsuleShapeZ(descriptor.radius, descriptor.centersDistance);
+                break;
             case 'CYLINDER':
-                return new Ammo.btCylinderShapeZ(new Ammo.btVector3(descriptor.radius, descriptor.radius, descriptor.height / 2));
+                shape = new Ammo.btCylinderShapeZ(new Ammo.btVector3(descriptor.radius, descriptor.radius, descriptor.height / 2));
+                break;
             case 'CONE':
-                return new Ammo.btConeShapeZ(descriptor.radius, descriptor.height);
+                shape = new Ammo.btConeShapeZ(descriptor.radius, descriptor.height);
+                break;
             case 'SPHERE':
-                return new Ammo.btSphereShape(descriptor.radius);
+                shape = new Ammo.btSphereShape(descriptor.radius);
+                break;
             case 'COMPOUND':
-                const compoundShape = new Ammo.btCompoundShape();
+                let cs = new Ammo.btCompoundShape();
                 for (const item of descriptor.children) {
                     const subShape = this.createShape(item.shape);
                     if (!subShape) {
@@ -42,19 +49,21 @@ export class AmmoFactory {
                     const rot = item.rotation || Qtrn.O;
                     subShapeTransform.setOrigin(new Ammo.btVector3(pos.x, pos.y, pos.z));
                     subShapeTransform.setRotation(new Ammo.btQuaternion(rot.x, rot.y, rot.z, rot.w));
-                    compoundShape.addChildShape(subShapeTransform, subShape);
+                    cs.addChildShape(subShapeTransform, subShape);
                 }
-                return compoundShape;
+                shape = cs;
+                break;
             case 'CONVEX_HULL':
-                const shape = new Ammo.btConvexHullShape();
+                const s = new Ammo.btConvexHullShape();
                 const tmpVector = new Ammo.btVector3();
                 for (const v of descriptor.vertices) {
                     tmpVector.setValue(v.x, v.y, v.z);
-                    shape.addPoint(tmpVector);
+                    s.addPoint(tmpVector);
                 }
                 Ammo.destroy(tmpVector);
-                shape.recalcLocalAabb();
-                return shape;
+                s.recalcLocalAabb();
+                shape = s;
+                break;
             case 'MESH':
                 const mesh = new Ammo.btTriangleMesh(true, true);
                 const tmpVectors = [
@@ -71,9 +80,15 @@ export class AmmoFactory {
                 tmpVectors.forEach(v => {
                     Ammo.destroy(v);
                 });
-                return new Ammo.btBvhTriangleMeshShape(mesh, false, true);
+                shape = new Ammo.btBvhTriangleMeshShape(mesh, false, true);
+                break;
+            default:
+                throw new Error(`Shape "${descriptor.shape}" not implemented for Ammo.js`);
         }
-        throw new Error(`Shape "${descriptor.shape}" not implemented for Ammo.js`);
+        if (descriptor.collisionMargin) {
+            shape.setMargin(descriptor.collisionMargin);
+        }
+        return shape;
     }
     createRigidBodyFromShape(nativeShape, shapeDescr, options, transform) {
         if (options.dynamic === false) {