Commit Graph

379 Commits

Author SHA1 Message Date
erwin coumans
b961545292 prepare support for VR 2016-05-19 09:19:36 -07:00
erwin coumans
9cc028d44c fix issue, some paths didn't return a value 2016-05-19 09:16:47 -07:00
Erwin Coumans
cf1012aa3d minor update in TinyRenderer example 2016-05-18 18:32:13 -07:00
Erwin Coumans
fb2134f15f add combobox to select software/opengl rendering to compare 2016-05-18 17:57:13 -07:00
Erwin Coumans
7994a339ee disable RTC update for Physics Server by default 2016-05-18 16:21:40 -07:00
Erwin Coumans
5500fc81df fix #include 2016-05-18 16:01:36 -07:00
Erwin Coumans
cdd6954ada fix pybullet cmake compilation 2016-05-18 15:07:42 -07:00
erwin coumans
a395ddcb06 add option to embed a physics server in the physics client example, for easier debugging 2016-05-18 09:34:42 -07:00
erwin coumans
606f78da43 work-in-progress tinyrenderer -> shared memory API synthetic camera image 2016-05-17 23:57:19 -07:00
Erwin Coumans
876c9e57fe fixes 2016-05-13 22:57:41 -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
Erwin Coumans
d186320f30 fixes in rendering 2016-05-13 18:45:56 -07:00
erwin coumans
6a9c54c4ef Remove unused ROS urdf (was replaced by Bullet UrdfParser.
Small refactoring for ExampleBrowser: move examples cpp files in the app/executable
Move ExtendedTutorials in its own app/executable as a test.
2016-05-12 23:03:12 -07:00
yunfeibai
7929bee128 parse root transformation and test loading two robots 2016-05-11 15:52:50 -07:00
yunfeibai
06a2669b32 test load kuka arm sdf 2016-05-11 13:43:50 -07:00
yunfeibai
1bebcc6d9a Merge remote-tracking branch 'upstream/master' 2016-05-10 10:18:27 -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
erwin coumans
99073e03f7 Allow to compile pybullet on Windows, using CMake
(got it to run, rename pybullet.dll into pybullet.pyd and copy in c:\python34\dlls)
Update test.py
Allow to compile pybullet using Python 3.x and 2.7
2016-05-10 00:57:54 -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
Erwin Coumans
e9c6abff47 add initial SDF importer, work-in-progress (still too incomplete to be useful) 2016-05-09 17:25:07 -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
Erwin Coumans
2fee43b021 copy the data folder into the cmake build directory, for the ExampleBrowser
out-of-source builds of Example Browser don't find their resources...
2016-05-09 14:03:13 -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
Benjamin Ellenberger
4f169b4d8f Add missing m_callback call in SliderMove().
-------
The MySliderEventHandler is missing the m_callback whereas the SliderParams contains the m_callback field. Therefore, the m_callback is never called if the slider position is changed. This commit adds the missing m_callback field and call in SliderMove().
Fixes #613.
2016-05-08 20:26:05 +02: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
erwincoumans
5151519b94 https://github.com/bulletphysics/bullet3/pull/618 by Mobeen
Summary of changes:
1) Changed include paths to be relative to the current sources (affected
files: LoadMeshFromObj.cpp, Wavefront2GLInstanceGraphicsShape.h/cpp)
2) Added new tutorials in the ExtendedTutorials folder
3) Modified the main_opengl_single_example.cpp file to enable picking
support in standalone demos
2016-05-06 15:07:54 -07:00
erwin coumans
aae9e509a9 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-06 13:58:21 -07:00
erwin coumans
0a3efbe349 make standalone versions (console, tinyrender, opengl) of InverseDynamics/InverseDynamicsExample 2016-05-06 13:57:48 -07:00
Erwin Coumans
b0a4e126bf use cmake FIND_PACKAGE(PythonLibs 2.7 REQUIRED) if pybullet is build 2016-05-04 13:24:06 -07:00
erwincoumans
ec5806a979 Merge pull request #614 from erwincoumans/master
add BasicExampleGui for cmake, preliminary pybullet
2016-05-04 00:35:34 -07:00
Erwin Coumans (Google)
194009f46e linux fixes 2016-05-04 00:17:39 -07:00
erwin coumans
8360e2e66d windows fixes 2016-05-04 00:16:53 -07:00
Erwin Coumans
0d3440b388 fixes in Mac resizing example browser (if window size exceeds capability) 2016-05-03 23:46:29 -07:00
Erwin Coumans
f0b9037cd2 tweak cmake, add option BUILD_PYBULLET 2016-05-03 23:42:19 -07:00
Erwin Coumans
938db633df fixes in build system 2016-05-03 23:34:48 -07:00
Erwin Coumans
7a833a7ac2 fix target link libs in cmake 2016-05-03 22:05:30 -07:00
Erwin Coumans
a251ff4331 add 'dl' target libs in cmake 2016-05-03 21:48:28 -07:00
erwincoumans
50d86b98ff Merge pull request #612 from cirosantilli/hello-world
Improve HelloWorld
2016-05-03 21:43:08 -07:00
Erwin Coumans
a9ef145910 add standalone opengl version of BasicExample for cmake, called BasicExampleGui 2016-05-03 21:27:30 -07:00
Erwin Coumans
709a55d5ab add CMake support for pybullet (still preliminary)
requires shared library build:
cmake .. -DBUILD_SHARED_LIBS=on
then create a symbolic link from libpybullet.so to pybullet.so
2016-05-03 13:03:12 -07:00
Erwin Coumans
fb65c29033 use "world" to make door static (instead of using mass = 0)
minor improvements to pybullet
2016-05-03 12:59:21 -07:00
erwin coumans
984c880b2c move 'main' functions into a separate folder, to make it easier to create standalone demos (console app without gui, or opengl app, and possibly even other versions, like a software renderer, producing pictures in the cloud)
Add a line in an example cpp file to allow a standalone version.
See examples/BasicExample.cpp: B3_STANDALONE_EXAMPLE(BasicExampleCreateFunc)
2016-05-01 14:52:27 -07:00
Ciro Santilli
3c5b4af1c3 Improve HelloWorld
- explain in comments the shape of the ground and better group that code
- give enough time for the sphere to hit the ground
- don't ask for confirmation to exit, it's annoying
2016-05-01 15:48:03 +02:00
Erwin Coumans
1d0f038aad add initial pybullet module, using the shared memory API
(for now, start the example browser in 'physics server',
then compile using premake --python option,
then run python in the bin folder (so it finds pybullet.so)
and run the test.py script in examples/pybullet folder.
The robotics shared memory C API is very suitable for this.
2016-04-30 11:18:54 -07:00
Erwin Coumans
ab4299f517 expose the local inertial frame for each link in the shared memory API
struct b3LinkState
{
    double m_worldPosition[3];//this is the inertial frame
    double m_worldOrientation[4];

    double m_localInertialPosition[3];//this is the local frame from inertial to link frame
    double m_localInertialOrientation[4];
};

  const btTransform link_frame_world =
               inertial_frame_world * m_local_inertial_frame->inverse();
2016-04-29 14:46:25 -07:00
Erwin Coumans
ec914b08e7 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-04-28 23:13:35 -07:00
Erwin Coumans
aa9a276a71 fix typo in texels flip
add support to create a cube in TinyRenderer (quick test)
2016-04-28 23:01:49 -07:00
Erwin Coumans
615effa4d9 fix typo in texels flip
add support to create a cube in TinyRenderer (quick test)
2016-04-28 12:28:04 -07:00
Erwin Coumans
a3767193ce add example to use BasicDemo with an OpenGL Window, without example browser 2016-04-27 09:55:42 -07:00
Erwin Coumans
924456548e fix build, add premake4.lua 2016-04-26 21:08:02 -07:00
erwin coumans
40841e9078 revert floor.obj test file, load it by default in TinyRenderer/main.cpp 2016-04-26 21:01:46 -07:00
erwin coumans
03bdcc8737 patch TinyRenderer so it software-renders in an OpenGL texture, for testing
fix texture support: flip texture to make OpenGL happy (lower-left is origin)
add path prefix to .obj loader, so materials/textures are loaded ok.
2016-04-26 20:52:52 -07:00
erwin coumans
2cb39e358a add unmodified version of TinyRenderer, a 500 line software renderer with vertex and pixel shaders, texture mapping and Wavefront .obj support. 2016-04-26 20:47:10 -07:00
Erwin Coumans
edba85bab3 fix issue in X11OpenGLWindow (uninitialized variable causing issue at exit) 2016-04-25 19:19:19 -07:00
Erwin Coumans
64cfbacf0a Merge remote-tracking branch 'bp/master' 2016-04-25 13:24:18 -07:00
Erwin Coumans
778ce5296d add example of rendering a cube in SimpleOpenGL3 2016-04-25 13:21:56 -07:00
erwincoumans
a080a568f2 Update main.cpp
remove unused variable
2016-04-25 09:42:16 -07:00
erwincoumans
66bfb7e708 Update PhysicsClientC_API.cpp
fix a copy/paste bug -> pos+quat = 7, but pos is just 3
2016-04-25 09:37:04 -07:00
Erwin Coumans
f99d1c45aa expose multibody link world transform in the shared memory API 2016-04-23 17:29:46 -07:00
Erwin Coumans
16cbc191bd Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-04-23 11:06:49 -07:00
Erwin Coumans
d8da00aa35 re-enable Wavefront .obj loader 2016-04-23 11:06:34 -07:00
Erwin Coumans (Google)
67426ecee9 add missing stubs for the obsolete SimpleOpenGL2Renderer 2016-04-21 14:10:45 -07:00
Erwin Coumans
4e61f0cab9 add function to CommonRenderInterface to update/activate a texture
add example how to render a texture 2d quad in SimpleOpenGL3
2016-04-20 12:55:21 -07:00
Erwin Coumans
da948a0729 fix text rendering (uninitialized uniforms) 2016-04-19 18:21:53 -07:00
yunfeibai
cbeddfc897 Modify shared memory client example to test joint motor torque measurement. 2016-04-19 16:52:47 -07:00
yunfeibai
c384383250 Merge branch 'master' of https://github.com/bulletphysics/bullet3
Update measured torque name.
2016-04-19 14:20:28 -07:00
yunfeibai
c3afbf7689 set desired position target 2016-04-19 14:19:18 -07:00
Erwin Coumans
0f5ee7a0a9 rename m_jointForce -> m_jointMotorForce to separate the name from m_jointForceTorque (which should have been called m_jointReactionForce) 2016-04-19 12:22:38 -07:00
erwincoumans
05845d7df9 Merge pull request #602 from erwincoumans/master
handle window closing in InProcessPhysicsClientSharedMemoryMainThread
2016-04-19 10:58:13 -07:00
yunfeibai
f9719e2405 Add measured joint motor force to joint sensor state. 2016-04-19 10:44:59 -07:00
Erwin Coumans
bebe9a728b handle window closing in InProcessPhysicsClientSharedMemoryMainThread 2016-04-19 08:29:20 -07:00
Erwin Coumans (Google)
3a8ffebc28 fix possible division-by-zero if the profiler gui is called before stepSimulation is proceeding. 2016-04-18 21:43:42 -07:00
Erwin Coumans
476eb342ab fix scaling in URDF importer 2016-04-18 17:41:54 -07:00
Erwin Coumans
59e0bef988 remove compile errors and some debug code in ExampleBrowser. 2016-04-14 12:19:55 -07:00
Erwin Coumans
2cbfeb9590 run GUI on main thread for Mac OSX/__APPLE__, due to OS limitation
add b3CreateInProcessPhysicsServerAndConnectMainThread to test.c
2016-04-14 08:51:20 -07:00
Erwin Coumans
0ca56e756f add joint damping in PhysicsServerCommandProcessor 2016-04-13 17:21:43 -07:00
Erwin Coumans
4df7257250 more comments in SharedMemory C API 2016-04-13 17:09:48 -07:00
Erwin Coumans
34e6eb4a18 add a few lines of documentation and some error checks in SharedMemory API 2016-04-13 13:06:15 -07:00
Erwin Coumans
f3c7f30684 fix some memory leaks in ImportURDF / PhysicsServerCommandProcessor 2016-04-11 16:42:02 -07:00
Erwin Coumans
59b32b7af1 re-enable command log and playback in physics server
report applied motor torque in physics server
2016-04-08 18:17:17 -07:00
Erwin Coumans
d2793ec5c0 fix char -> int, to allow check with -1, some build systems fail
to make char a signed char
fix unused variable
removed duplicate header files in Gwen/Controls/Layout
2016-03-31 12:52:04 -07:00
Erwin Coumans
6c0ef7e597 fix resize issue on Linux, using i3 window manager on Linux
fix uninitialize modified key (ALT etc) on Linux/X11
2016-03-30 21:45:20 -07:00
Erwin Coumans
5c1eb2ec07 support 'world' tag for fixed objects in URDF 2016-03-30 14:43:59 -07:00
Erwin Coumans
84a136534a add preliminary Android build files for Bullet
add SimpleOpenGL3 example and show how to override
keyboard, mouse, wheel, resize callbacks
2016-03-27 10:21:05 -07:00
Erwin Coumans
643cf5ab1d Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-03-17 16:12:48 -07:00
Erwin Coumans
7e4dfb7207 remove SimpleOpenGL3 demo, it breaks some builds
reset callback to 0 after exiting a demo to avoid issues
2016-03-17 16:11:53 -07:00
erwincoumans
fe92de3e50 add infrastructure float btMultiBodyLink m_jointDamping, m_jointFriction (actual damping/friction is in a separate commit)
add door.urdf for testing damping/friction
2016-03-17 14:54:46 -07:00
Erwin Coumans
937b6d84e5 re-enable --enable_experimental_opencl flag for
premake build of App_BulletExampleBrowser
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
2016-03-16 09:02:39 -07:00
Erwin Coumans
6c9815c8f9 fix axis in r2d2.urdf
enable SimpleOpenGL3 demo for CMake
2016-03-16 08:13:53 -07:00
Erwin Coumans
aa3daaa8c6 turn test/SharedMemory/test.c into a gtest for CI unit testing in github
remove overly verbose printfs in importers
fix axis in r2d2.urdf
2016-03-15 22:47:53 -07:00
Erwin Coumans
005ef9d2f1 fixes in SharedMemory unit test, premake build issue on Linux 2016-03-15 18:29:32 -07:00
Erwin Coumans
c69524be9e fix Lua example 2016-03-10 21:15:23 -08:00
erwincoumans
efbb1edecc Allow InProcessExampleBrowser to use a malloc allocated memory block, instead of system shared memory.
Make shared memory client/server a bit more robust, in case the server is terminated early.
2016-03-10 14:36:46 -08:00
erwincoumans
40a9b8cea0 fix relative include path 2016-03-07 15:12:33 -08:00