@gg-web-engine/ammo 0.0.30 → 0.0.37

package/README.md

@@ -4,6 +4,13 @@
 
 ## [Ammo.js](https://github.com/kripken/ammo.js) integration for [gg-web-engine](https://github.com/AndyGura/gg-web-engine), providing 3D phycics simulation
 
+### Note:
+This module uses self-built ammo.js, because requires additional functionality. Do not install another copy of ammo.js, 
+if you need direct access, import it straight from this module: 
+```typescript
+import { Ammo } from "@gg-web-engine/ammo";
+``` 
+
 ### Installation:
 1) make sure **@gg-web-engine/core** installed
 1) `npm install --save @gg-web-engine/ammo`

package/build_gg_ammo/Makefile

@@ -0,0 +1,41 @@
+# Define variables
+AMMOJS_GIT_REPO=https://github.com/i12345/ammo.js.git
+AMMOJS_GIT_COMMIT=98d8fb3e8d5b3f3b581e7c5fe8856edb91b578d8
+BULLET_GIT_REPO=https://github.com/bulletphysics/bullet3.git
+BULLET_GIT_COMMIT=2c204c49e56ed15ec5fcfa71d199ab6d6570b3f5 # 3.25 release
+REPLACE_SRC_DIR=./patch_files
+REPLACE_DEST_DIR=./ammo.js
+
+clean-all:
+	rm -rf ./ammo.js && rm -rf ./ammo_patches.txt && rm -rf ./bullet_patches.txt
+
+fetch_ammo:
+	git clone $(AMMOJS_GIT_REPO)
+
+switch_ammo:
+	cd ammo.js && git checkout $(AMMOJS_GIT_COMMIT)
+
+fetch_bullet:
+	cd ammo.js && git clone $(BULLET_GIT_REPO) bullet
+
+switch_bullet:
+	cd ammo.js/bullet && git checkout $(BULLET_GIT_COMMIT)
+
+replace:
+	cp -r $(REPLACE_SRC_DIR)/* $(REPLACE_DEST_DIR)
+	cd ammo.js && git diff > ../ammo_patches.txt
+	cd ammo.js/bullet && git diff > ../../bullet_patches.txt
+
+build:
+	cd ammo.js && npm i && npm run build:clean && docker-compose build && docker-compose up && npm run build:export
+
+copy:
+	cp -r ./ammo.js/dist/* ../src/ammo.js
+
+cleanup:
+	rm -rf ./ammo.js
+
+fetch_all: clean-all fetch_ammo switch_ammo fetch_bullet switch_bullet
+build_all: replace build copy
+
+all: fetch_all build_all cleanup

package/build_gg_ammo/README.md

@@ -0,0 +1,17 @@
+This is a place where I build proprietary ammo.js for gg-web-engine.
+
+Reasons to build own ammo.js instead of using [up-to-date one](https://github.com/i12345/ammo.js):
+1) The crucial feature, which bullet does not have: use collision groups for raycast vehicle. I already made a 
+[PR](https://github.com/bulletphysics/bullet3/pull/4559) to bullet.
+1) Manually added functions "getPointer" and "compare" to type declarations. 
+[PR](https://github.com/anotherpit/webidl2ts/pull/2) to webidl2ts is also on it's way
+1) Expose `m_erp2` property of `btContactSolverInfo`, needed for fighting with object clipping problem,
+which appeared in bullet 2.84. Also made a [PR](https://github.com/i12345/ammo.js/pull/2)
+
+
+All changed file diffs in ammo.js and bullet can be found [here](./ammo_patches.txt) and [here](./bullet_patches.txt) appropriately
+
+
+### How to build
+1) Docker has to be installed and started
+1) enter this directory and run `make all`

package/build_gg_ammo/ammo_patches.txt

@@ -0,0 +1,20 @@
+diff --git a/ammo.idl b/ammo.idl
+index 1f6b880..9c2e5cf 100644
+--- a/ammo.idl
++++ b/ammo.idl
+@@ -1293,6 +1293,8 @@ interface btVehicleRaycasterResult {
+ };
+ 
+ interface btVehicleRaycaster {
++    attribute long m_collisionFilterGroup;
++    attribute long m_collisionFilterMask;
+     void castRay ([Const, Ref] btVector3 from, [Const, Ref] btVector3 to, [Ref] btVehicleRaycasterResult result);
+ };
+ 
+diff --git a/bullet b/bullet
+index 6bb8d11..2c204c4 160000
+--- a/bullet
++++ b/bullet
+@@ -1 +1 @@
+-Subproject commit 6bb8d1123d8a55d407b19fd3357c724d0f5c9d3c
++Subproject commit 2c204c49e56ed15ec5fcfa71d199ab6d6570b3f5-dirty

package/build_gg_ammo/bullet_patches.txt

@@ -0,0 +1,27 @@
+diff --git a/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp b/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
+index cbb41ece2..44b0c3020 100644
+--- a/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
++++ b/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
+@@ -690,6 +690,9 @@ void* btDefaultVehicleRaycaster::castRay(const btVector3& from, const btVector3&
+ 
+ 	btCollisionWorld::ClosestRayResultCallback rayCallback(from, to);
+ 
++	rayCallback.m_collisionFilterMask = m_collisionFilterMask;
++	rayCallback.m_collisionFilterGroup = m_collisionFilterGroup;
++
+ 	m_dynamicsWorld->rayTest(from, to, rayCallback);
+ 
+ 	if (rayCallback.hasHit())
+diff --git a/src/BulletDynamics/Vehicle/btVehicleRaycaster.h b/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+index 2c44ce546..e74dc6c41 100644
+--- a/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
++++ b/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+@@ -16,6 +16,8 @@
+ /// btVehicleRaycaster is provides interface for between vehicle simulation and raycasting
+ struct btVehicleRaycaster
+ {
++	int m_collisionFilterMask;
++	int m_collisionFilterGroup;
+ 	virtual ~btVehicleRaycaster()
+ 	{
+ 	}