Skip to content

Commit

Permalink
Merge pull request kripken#88 from coballast/master
Browse files Browse the repository at this point in the history
Added btStaticGroundShape interface.
  • Loading branch information
kripken committed Oct 8, 2014
2 parents ab09674 + 98b3f37 commit e7c3dff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions ammo.idl
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ interface btConcaveShape {
};
btConcaveShape implements btCollisionShape;

interface btStaticPlaneShape {
void btStaticPlaneShape([Const, Ref] btVector3 planeNormal, float planeConstant);
};
btStaticPlaneShape implements btConcaveShape;

interface btTriangleMeshShape {
};
btTriangleMeshShape implements btConcaveShape;
Expand Down
2 changes: 1 addition & 1 deletion test.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
print

def run(filename):
if JS_ENGINE == SPIDERMONKEY_ENGINE:
if JS_ENGINE == [SPIDERMONKEY_ENGINE]:
return Popen(JS_ENGINE + ['-e', 'gcparam("maxBytes", 1024*1024*1024); load("' + build + '"); load("' + os.path.join('tests', 'testutils.js') + '")', filename], stdout=PIPE).communicate()[0]
else:
return Popen(JS_ENGINE + [build, os.path.join('tests', 'testutils.js'), filename], stdout=PIPE).communicate()[0]
Expand Down

0 comments on commit e7c3dff

Please sign in to comment.