sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upload_native: final check

Browse Source
This commit is contained in:
Kirill Vainer 2016-11-27 14:32:21 -05:00
parent dd812b17c5
commit f60ffcc967
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp
View File

@ -100,7 +100,7 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
dynamicsWorld->setWorldUserInfo(this); dynamicsWorld->setWorldUserInfo(this);
broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback()); broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback());
dynamicsWorld->setGravity(btVector3(0, -9.81f, 0)); dynamicsWorld->setGravity(btVector3(0, -9.85f, 0));
struct jmeFilterCallback : public btOverlapFilterCallback { struct jmeFilterCallback : public btOverlapFilterCallback {
// return true when pairs need collision // return true when pairs need collision

6
private/upload_native.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
# NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)"
# if [ "$NATIVE_CHANGES" != "" ]; then if [ "$NATIVE_CHANGES" != "" ]; then
git config --global user.email "travis-ci" git config --global user.email "travis-ci"
git config --global user.name "travis-ci" git config --global user.name "travis-ci"
./gradlew -PbuildNativeProjects=true :jme3-bullet-native:assemble ./gradlew -PbuildNativeProjects=true :jme3-bullet-native:assemble
@ -13,4 +13,4 @@ set -euo pipefail
git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives"
git pull -q --rebase git pull -q --rebase
git push git@github.com:jMonkeyEngine/jmonkeyengine.git git push git@github.com:jMonkeyEngine/jmonkeyengine.git
# fi fi