diff --git a/.travis.yml b/.travis.yml index bb6dcde2e..25053a90d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,14 @@ os: compiler: - gcc - clang +addons: + apt: + packages: + - python3 script: - echo "CXX="$CXX - echo "CC="$CC - - cmake . -G "Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror + - cmake . -DBUILD_PYBULLET=ON -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror - make -j8 - ctest -j8 --output-on-failure # Build again with double precision diff --git a/examples/Utils/b3ResourcePath.cpp b/examples/Utils/b3ResourcePath.cpp index d27b61e99..fdd546d5e 100644 --- a/examples/Utils/b3ResourcePath.cpp +++ b/examples/Utils/b3ResourcePath.cpp @@ -77,6 +77,12 @@ int b3ResourcePath::findResourcePath(const char* resourceName, char* resourcePat { return strlen(resourcePath); } + sprintf(resourcePath,"%s.runfiles/google3/third_party/bullet/data/%s",exePath,resourceName); + //printf("try resource at %s\n", resourcePath); + if (b3FileUtils::findFile(resourcePath, resourcePath, resourcePathMaxNumBytes)) + { + return strlen(resourcePath); + } } } diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c index fbd070ff9..9235f3e5a 100644 --- a/examples/pybullet/pybullet.c +++ b/examples/pybullet/pybullet.c @@ -276,7 +276,7 @@ pybullet_resetSimulation(PyObject* self, PyObject* args) return Py_None; } -static int pybullet_setJointControl(PyObject* self, PyObject* args) +static PyObject* pybullet_setJointControl(PyObject* self, PyObject* args) { //todo(erwincoumans): set max forces, kp, kd @@ -302,6 +302,7 @@ static int pybullet_setJointControl(PyObject* self, PyObject* args) len = PySequence_Size(targetValues); numJoints = b3GetNumJoints(sm,bodyIndex); b3SharedMemoryCommandHandle commandHandle; + int qIndex; if (len!=numJoints) { @@ -321,7 +322,7 @@ static int pybullet_setJointControl(PyObject* self, PyObject* args) commandHandle = b3JointControlCommandInit(sm, bodyIndex,controlMode); - for (int qIndex=0;qIndex