Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add constructor for btcollisionworld #356

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: tst
on: workflow_dispatch
jobs:
build:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '^3.5'
- uses: mymindstorm/setup-emsdk@v8
with:
version: 'latest'
- run: emcc -v
- run: python -V
- run: cmake --version
- run: ${{ matrix.make || 'make' }} --version
- run: cmake -B builds -DCLOSURE=1 ${{ matrix.cmake-args }}
- run: cmake --build builds -- VERBOSE=1
- run: npm ci
- name: Archive production artifacts
uses: actions/upload-artifact@v3
with:
name: dist-without-markdown
path: builds/**/ammo*
- name: Test Ammo Javascript
run: npx ava
env:
AMMO_BUILD: builds/ammo.js
- name: Test Ammo WebAssembly
run: npx ava
env:
AMMO_BUILD: builds/ammo.wasm.js
strategy:
matrix:
os:
- ubuntu-latest
- macos-latest
- windows-latest
include:
- os: windows-latest
cmake-args: -G 'MinGW Makefiles'
make: mingw32-make
18 changes: 13 additions & 5 deletions ammo.idl
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ btDefaultMotionState implements btMotionState;
// Collision

interface btCollisionObject {
void btCollisionObject();
void setAnisotropicFriction([Const, Ref] btVector3 anisotropicFriction, long frictionMode);
btCollisionShape getCollisionShape();
void setContactProcessingThreshold(float contactProcessingThreshold);
Expand Down Expand Up @@ -504,8 +505,17 @@ btCollisionDispatcher implements btDispatcher;
interface btOverlappingPairCallback {
};

interface btOverlapFilterCallback {
};

interface btBroadphaseProxy {
attribute long m_collisionFilterGroup;
attribute long m_collisionFilterMask;
};

interface btOverlappingPairCache {
void setInternalGhostPairCallback(btOverlappingPairCallback ghostPairCallback);
void setOverlapFilterCallback(btOverlapFilterCallback filterCallback);
[Const] float getNumOverlappingPairs();
};

Expand All @@ -524,11 +534,6 @@ interface btDbvtBroadphase {
void btDbvtBroadphase();
};

interface btBroadphaseProxy {
attribute long m_collisionFilterGroup;
attribute long m_collisionFilterMask;
};


// Dynamics

Expand Down Expand Up @@ -714,6 +719,7 @@ interface btDispatcherInfo {
};

interface btCollisionWorld {
void btCollisionWorld(btDispatcher dispatcher, btBroadphaseInterface pairCache, btCollisionConfiguration collisionConfiguration);
btDispatcher getDispatcher();
void rayTest([Const, Ref] btVector3 rayFromWorld, [Const, Ref] btVector3 rayToWorld, [Ref] RayResultCallback resultCallback);
btOverlappingPairCache getPairCache();
Expand All @@ -729,6 +735,8 @@ interface btCollisionWorld {
btIDebugDraw getDebugDrawer();
void debugDrawWorld();
void debugDrawObject([Const, Ref] btTransform worldTransform, [Const] btCollisionShape shape, [Const, Ref] btVector3 color);
long getNumCollisionObjects();
void performDiscreteCollisionDetection();
};

interface btContactSolverInfo {
Expand Down