Commit Graph
100 Commits
Author SHA1 Message Date
erwincoumans d26ef6cee1 Merge pull request #709 from erwincoumans/master
fix one more multi-threading issue
2016-07-21 17:02:13 -07:00
erwincoumans e88de13cc6 fix Parse joint dynamics in SDF 2016-07-20 15:41:58 -07:00
erwincoumans 2278385802 Merge pull request #707 from matpalm/loadErrorMsgTypo
fix error msg when loading sdfs
2016-07-20 10:50:31 -07:00
erwincoumans 628d029e30 Merge pull request #706 from erwincoumans/master
Improve OpenVR support, fix some multi-threading issue (disable CProfileManager singleton), fix/remove old API
2016-07-20 10:31:11 -07:00
erwincoumans 73ac7c89c6 Merge pull request #703 from erwincoumans/master
OpenVR controller can pick/drag objects
2016-07-18 11:46:53 -07:00
Erwin Coumans 5cb97baba0 add husky, quadcopter and plane 100x100 meter urdf files,
to prepare for a bit of robotics, machine learning and VR fun
2016-07-16 23:14:16 -07:00
Erwin Coumans fcc9d4ebcb fix SIMD/16-byte alignment issue causing issue in one of the old benchmarks 2016-07-16 22:33:15 -07:00
erwincoumans 260e5d2b3d Merge pull request #701 from erwincoumans/master
Remove many memory leaks/technical debt in example code.
2016-07-16 22:01:19 -07:00
Erwin Coumans f9096c2e30 typo/case sensitivity BroadphaseCollision vs NarrowPhaseCollision, aargh 2016-07-16 21:47:07 -07:00
Erwin Coumans 8c69bfb042 fix: accidently enable memory-leak debug test 2016-07-16 21:36:40 -07:00
Erwin Coumans c54a61b97a More example code is memory-leak free now, in particular PhysicsServerExample.
/PhysicsServerCommandProcessor
also fixed some memory issue in InverseDynamicsExample (the base class is supposed to delete collision shape memory)
2016-07-16 21:29:31 -07:00
Erwin Coumans 589fa376b3 only add compound child shapes to 'allocated' list once 2016-07-16 17:58:06 -07:00
Erwin Coumans e2bdd7dbb1 fix more memory leaks, ImportURDFExample is now leak-free
eliminate all run-time memory allocation (except for mouse-pick/ray-intersection) in ImportURDFExample
2016-07-16 17:40:44 -07:00
Erwin Coumans 2caa2b7ff4 removed more memory leaks and improve btAlignedAllocator memory-leak debugging 2016-07-16 14:58:11 -07:00
Erwin Coumans bbefc6b108 fix an issue in previous commit 2016-07-16 01:11:53 -07:00
erwincoumans 4cbc741f66 Merge pull request #693 from hujiajie/master
[WIP] Suppress compiler warnings.
2016-07-14 10:52:59 -07:00
erwincoumans 93e98ddbd0 Merge pull request #698 from matpalm/linkIdFix
pybullet_applyExternalForce linkId bug
2016-07-14 10:51:49 -07:00
erwincoumans 824c721710 Merge pull request #699 from erwincoumans/master
Add kiva_shelf to prepare for picking/grasping task
2016-07-14 10:51:34 -07:00
erwincoumans 31e7f2e309 Merge pull request #697 from matpalm/addFovToRenderImage
pybullet renderimage with projection matrix calculated using field of view
2016-07-13 18:46:42 -07:00
erwincoumans 6c856d9fa3 Merge pull request #694 from matpalm/flipDepthImage
fix for vertically flipped depth buffer in TinyRenderer::render
2016-07-13 15:56:33 -07:00
erwincoumans 513ba9d035 Merge pull request #696 from erwincoumans/master
add option to use hardware OpenGL renderer for synthetic camera
2016-07-13 15:56:05 -07:00
erwincoumans 787cb0cb17 Merge pull request #648 from benelot/master
Create Inclined Plane, Newton's Cradle and Multi-Pendulum examples for the Bullet Example Browser
2016-07-11 22:17:31 -07:00
erwincoumans 5249ca7ceb Merge pull request #690 from hujiajie/master
[WIP] Suppress compiler warnings.
2016-07-11 18:13:58 -07:00
erwincoumans e2e750efb2 Merge pull request #689 from erwincoumans/master
prepare robotics learning examples, see examples/RoboticsLearning/b3R…
2016-07-11 10:38:38 -07:00
erwincoumans 9a99d18ca6 Merge pull request #688 from hujiajie/master
Suppress compiler warnings
2016-07-11 00:17:38 -07:00
erwincoumans 81ae53e3a4 Merge pull request #683 from erwincoumans/master
VR support in PhysicsServerExample, physics runs in its own thread.
2016-07-09 15:24:40 -07:00
erwincoumans 647774f8e4 Merge pull request #685 from ComradeKeys/master
There was a typo I came across when cross compiling
2016-07-08 17:23:41 -07:00
erwincoumans e918e5a44e Merge pull request #682 from hellojas/renderImagefix
fix minor issues
2016-07-07 14:47:01 -07:00
erwincoumans 9d629bdcd7 Merge pull request #672 from hellojas/renderImage
Render image with camera_pos, target_pos, camera_up vector as arguments
2016-07-07 12:42:41 -07:00
erwincoumans 0cba24b637 Merge pull request #680 from erwincoumans/master
Add preliminary support for VR/OpenVR for HTC Vive and Oculus Rift,
2016-07-02 11:07:43 -07:00
erwincoumans 67cfaa45fa Merge pull request #679 from jbohren/patch-1
pkg-config: Fixing regression introduced by e46b7b2
2016-07-02 10:03:20 -07:00
erwincoumans eae90eb201 Merge pull request #675 from erwincoumans/master
remove debug printf's, fix an issue introduced in a previous commit to btMultiJointMotor etc.
2016-06-27 16:22:59 -07:00
erwincoumans ed9be25570 Merge pull request #669 from hellojas/loadURDF
fix loading urdf at default position (0,0,0)
2016-06-26 19:12:20 -07:00
erwincoumans cf1a4b02a1 Merge pull request #673 from erwincoumans/master
implement a few more pybullet methods:
2016-06-26 19:09:54 -07:00
erwincoumans 84f6d60ab3 Merge pull request #671 from erwincoumans/master
move PD control from PhysicsServerCommandProcessor into btMultiBodyJointConstraint
2016-06-24 13:59:54 -07:00
erwincoumans a15eb3035e default gains 1 -> 0.1 2016-06-24 11:12:19 -07:00
erwincoumans 86150e2c71 Merge pull request #667 from erwincoumans/master
add one more test, related to b3CreatePoseCommandInit
2016-06-24 07:55:06 -07:00
Erwin Coumans 8b96e2de3c a few pybullet tweaks to set desired joint motor targets (pos/vel/torque) 2016-06-22 23:21:47 -07:00
Erwin Coumans df0b2a2e3a Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-06-22 10:01:26 -07:00
Erwin Coumans 79fa4ebd7c Merge remote-tracking branch 'bp/master' 2016-06-22 10:01:22 -07:00
Erwin Coumans 2b8bd58e1c support single-scalar scale values in URDF, even though "officially" it should be a vector3. This will load quadcopter.urdf in Drake:
https://github.com/RobotLocomotion/drake/blob/master/drake/examples/Quadrotor/quadrotor.urdf
2016-06-22 09:59:25 -07:00
erwincoumans 0b249361c2 fix a c99 issue in pybullet 2016-06-21 09:01:27 -07:00
erwincoumans 08b88c445a more travis/python testing fun 2016-06-21 08:51:43 -07:00
erwincoumans 07ee9673ef try to get python dependency in travis (pybullet) 2016-06-21 08:43:04 -07:00
erwincoumans 51da386345 also compile pybullet in one of the tests 2016-06-20 15:05:14 -07:00
erwincoumans 01cad7c2a5 fix return type in pybullet
.
2016-06-20 15:00:35 -07:00
erwincoumans b58978184c fix C99 issue, use malloc, not variable sized array.
.
2016-06-20 14:58:56 -07:00
erwincoumans 18e158ed38 Merge pull request #666 from erwincoumans/master
expand b3ResourcePath automagic resource localization capability.
2016-06-20 14:01:31 -07:00
erwincoumans 40317a8b59 Merge pull request #665 from erwincoumans/master
add texture support in SDF, URDF for both OpenGL and software rendere…
2016-06-19 18:05:57 -07:00
Erwin Coumans a67df7fd03 fix cmake and premake build systems, after adding texture support in SDF,
in a nutshell, add the following two files:

examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
examples/ThirdPartyLibs/stb_image/stb_image.cpp
2016-06-19 17:35:25 -07:00
Erwin Coumans e3b2b1a969 add texture support in SDF, URDF for both OpenGL and software renderer (TinyRenderer) 2016-06-18 18:02:20 -07:00
erwincoumans 6369e3e12a Merge pull request #664 from YunfeiBai/master
Check diffuse field in sdf.
2016-06-17 16:15:47 -07:00
erwincoumans 7d5dea1bac Merge pull request #663 from erwincoumans/master
colors for sdf
2016-06-17 13:58:23 -07:00
erwincoumans c7365837cd Merge pull request #661 from erwincoumans/master
fix some issues related to controlling a robot/multibody beyond body …
2016-06-17 07:34:07 -07:00
erwincoumans 70c7ec6c45 Merge pull request #660 from YunfeiBai/master
Set view and projection matrices from camera and frustum parameters.
2016-06-16 12:27:48 -07:00
erwincoumans 95feb8f530 Merge pull request #659 from erwincoumans/master
implement getJointInfo for objects loaded through SDF (shared memory API)
2016-06-16 09:03:36 -07:00
erwincoumans bb9634635c Merge pull request #658 from jermdax/readme-typos-patch
Typos in readme
2016-06-15 14:43:21 -07:00
erwincoumans 0646a847a2 Merge pull request #657 from hellojas/set-and-get-joints
Initialize and get joint positions, get joint information
2016-06-15 14:42:49 -07:00
erwincoumans b06e1cb873 Update CollisionShape2TriangleMesh.cpp
fix memory leak, thanks Ilya Kostrikov for the report.
2016-06-14 07:53:15 -07:00
erwincoumans 9a8a52e1f9 Merge pull request #656 from gtzampanakis/buildfix
Fixed: Error because of unparameterized btVectorX
2016-06-14 07:50:43 -07:00
erwincoumans 2b3cb55ac1 Merge pull request #654 from erwincoumans/master
b3LoadSdfCommandInit , pybullet loadSDF , Fix pybullet Windows build errors
2016-06-13 19:13:26 -07:00
erwincoumans 6523df336e Fix pybullet Windows build errors: C99 requires variables to be defined at the start of the function.
Improve CMake Windows support to build PyBullet (BUILD_PYBULLET)
Implement b3LoadSdfCommandInit in shared memory API
Implement pybullet SDF loading binding, in loadSDF API
TODO for SDF support is provide way to query object/link/joint information.
2016-06-13 10:11:28 -07:00
erwincoumans ce9ae430f7 Merge pull request #652 from hellojas/renderImage
render image with ability to set pixel resolution and initial camera position
2016-06-11 10:54:19 -07:00
erwincoumans 33c04ce9c7 Merge pull request #651 from erwincoumans/master
fix flipped tinyrenderer image
2016-06-10 09:43:10 -07:00
erwincoumans a5fa8712ec Merge pull request #385 from lordloki/btCone
New btConeshape member functions setHeight and setRadius
2016-06-09 08:58:25 -07:00
erwincoumans f5f4e1f3c0 Merge pull request #647 from erwincoumans/master
Support the <static> field under <model> in SDF, fix premake build system
2016-06-07 17:03:41 -07:00
Erwin Coumans e0c3392cee don't pass width/height into renderObject 2016-06-07 17:02:47 -07:00
Erwin Coumans d2e50d045b fix issues related to camera width/height
add width,height as arguments to pybullet.renderImage(x,y,[viewMat4x4],[projMat4x4])
2016-06-07 16:11:58 -07:00
Erwin Coumans bd668d11b0 add .stl file support in 'File/Open' of example browser. 2016-06-07 12:57:46 -07:00
Erwin Coumans 8076d5235c fix window resize/width bookkeeping bug in MacOpenGLWindow.mm 2016-06-04 21:51:21 -07:00
Erwin Coumans 612e46614a fix (unused) SSE operator btMatrix3x3 ==, thanks to yyzone for the report/fix.
fixes 552
2016-06-04 13:16:06 -07:00
erwincoumans 68932b0c0a Merge pull request #646 from erwincoumans/master
initial hookup of TinyRenderer to shared memory interface
2016-06-01 18:24:43 -07:00
erwincoumans dcc909133f Merge pull request #644 from erwincoumans/master
preparation to receive camera image data from physics server
2016-06-01 11:50:48 -07:00
erwincoumans f94809417c Merge pull request #642 from erwincoumans/master
Preliminary working version of TinyRenderer without OpenGL/X11. Fix pybullet getPositionAndOrientation crash.
2016-05-26 22:00:18 -07:00
erwincoumans f34b421095 Merge pull request #640 from erwincoumans/master
fix build3/stringify.sh
2016-05-25 17:37:33 -07:00
erwincoumans 16fc02c2ca Merge pull request #639 from erwincoumans/master
add pybullet.getBasePositionAndOrientation
2016-05-24 16:07:19 -07:00
erwincoumans 3d5786ea4f Merge pull request #638 from erwincoumans/master
Update URDFImporterInterface.h
2016-05-24 10:44:31 -07:00
erwincoumans ef19248daf Update URDFImporterInterface.h 2016-05-24 10:30:04 -07:00
erwincoumans b3cb767722 Merge pull request #637 from erwincoumans/master
avoid API change in URDFImporterInterface
2016-05-24 09:48:13 -07:00
Erwin Coumans 9bd88e5727 move some easy-to-use build files for Mac OSX, Linux and Windows
in the root directory.
2016-05-21 10:45:08 -07:00
erwincoumans 5041c75d5f Merge pull request #635 from erwincoumans/master
prepare support for VR, synthetic robotics camera, arbitrary robotics renderer
2016-05-20 14:19:22 -07:00
erwincoumans c87a43c2b1 Merge pull request #634 from erwincoumans/master
fix issue, some paths didn't return a value
2016-05-19 09:17:22 -07:00
erwincoumans e4aff80948 Merge pull request #633 from erwincoumans/master
work-in-progress tinyrenderer -> shared memory API synthetic camera
2016-05-19 09:16:04 -07:00
erwincoumans 43fa1622aa Merge pull request #631 from artoowang/master
Fixed btAssert warning message on printf in MSVC.
2016-05-17 21:03:37 -07:00
erwincoumans fd5bca1bab Merge pull request #628 from erwincoumans/master
Small refactoring for ExampleBrowser, Remove unused ROS urdf (was replaced by Bullet UrdfParser.
2016-05-14 10:11:01 -07:00
Erwin Coumans 578e4fc795 compile fixes 2016-05-13 22:10:18 -07:00
Erwin Coumans f4a6b0cb9f move InProcessExampleBrowser.cpp into App instead of Lib 2016-05-13 21:10:16 -07:00
erwincoumans c5f2264a2b Merge pull request #627 from simotek/master
Fix bullet.pc when built with CMAKE_INSTALL_PREFIX #626
2016-05-12 20:26:49 -07:00
erwincoumans 257c1425d7 Merge pull request #625 from YunfeiBai/master
SDF parser
2016-05-11 19:22:43 -07:00
erwincoumans 119d47166d Update test.py 2016-05-10 01:28:45 -07:00
erwincoumans 15ce069c04 Update test.py 2016-05-10 01:26:13 -07:00
erwincoumans 9ba3a844c0 Update test.py 2016-05-10 01:24:40 -07:00
erwincoumans 94fe96e2b4 Update test.py 2016-05-10 01:13:19 -07:00
erwincoumans bad3ff9699 Merge pull request #624 from erwincoumans/master
Allow to compile pybullet on Windows, using CMake
2016-05-10 01:12:00 -07:00
erwincoumans fa043429fe Merge pull request #623 from erwincoumans/master
add initial SDF importer, work-in-progress (still too incomplete to b…
2016-05-09 21:37:36 -07:00
erwincoumans 95541cad4f Merge pull request #622 from erwincoumans/master
copy the data folder into the cmake build directory, for the ExampleB…
2016-05-09 14:21:11 -07:00
erwincoumans fe4fd4169c Merge pull request #620 from erwincoumans/master
Added new tutorial sources, thanks to Mobeen
2016-05-08 12:34:11 -07:00
erwincoumans 13734de2c2 Merge pull request #621 from benelot/master
Add missing m_callback call in SliderMove()
2016-05-08 11:47:33 -07:00
erwincoumans 8a68e27bb7 move the RigidBodyFromObj to Importers section. 2016-05-07 16:36:14 -07:00
erwincoumans db4fb750bc Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-07 16:19:43 -07:00