Bart/bullet3
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,026 Commits 10 Branches 0 Tags
58d7a7b9d544415c3a53a557872bb179c54a34b4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erwin Coumans (Google) 58d7a7b9d5 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2014-09-01 09:21:26 -07:00
Erwin Coumans (Google) e20c240178 make stringify_linux.sh compatible with mac osx (testing) 2014-09-01 09:17:21 -07:00
Erwin Coumans 701ce71a1e remove BUILD_MULTITHREADING option from CMakeLists.txt 2014-08-31 13:09:20 -07:00
Erwin Coumans 6f302f8a6f Merge remote-tracking branch 'bp/master' 2014-08-31 12:56:40 -07:00
Erwin Coumans da8abf443e fix support for dynamic loading of X11 functions, after adding XRaiseWindow 
./premake4_linux64 --force_dlopen_x11 gmake
 2014-08-31 12:51:11 -07:00
Erwin Coumans ec3650acc4 CMake: remove CMAKE_INSTALL_PREFIX from CMakeLists.txt it is automagically used 
See also https://github.com/bulletphysics/bullet3/pull/227
remove pthread from OpenGL/GlutStuff.cpp for now (it breaks CMake build)
 2014-08-31 12:36:02 -07:00
Erwin Coumans f199a4a972 add fileOpenDialog and enable loading of urdf from GUI 
(will add .bullet file support soon)
Uses native Windows (getFileOpenFileName) and Mac OSX NSOpenPanel,
on Linux using pipe popen to zenity)
 2014-08-31 11:53:44 -07:00
erwincoumans 6760cee950 Merge pull request #224 from erwincoumans/master 
update badges in README.md
 2014-08-28 23:20:03 -07:00
Erwin Coumans 8595928949 update appveyor badge 2014-08-28 23:02:19 -07:00
Erwin Coumans 145123260c update badges for README.md 2014-08-28 22:58:10 -07:00
Erwin Coumans 81bafacca1 rename to see if travis message works with .md extension? 2014-08-28 22:50:28 -07:00
erwincoumans 613beab593 Update readme.txt 
attempt to get travis results in readme
 2014-08-28 22:37:04 -07:00
erwincoumans 09e758b9e5 Update appveyor.yml 
aaargh, trial-and-error appveyor scripting
 2014-08-28 22:27:24 -07:00
erwincoumans 4004ab4dbc Update appveyor.yml 
aargh, a few more examples how to use simple cmd use would help, please appveyor
 2014-08-28 22:26:17 -07:00
erwincoumans 7c4a5fc311 Update appveyor.yml 2014-08-28 22:17:22 -07:00
erwincoumans 8f27aaa5df Update appveyor.yml 2014-08-28 22:05:40 -07:00
erwincoumans d0d6de121c Update appveyor.yml 2014-08-28 22:04:46 -07:00
erwincoumans aa8c1e9270 Create appveyor.yml 
test script for appveyor
 2014-08-28 21:42:11 -07:00
erwincoumans a51382e13b Merge pull request #223 from erwincoumans/master 
add 'fixed' joint for btMultiBody
 2014-08-28 19:13:44 -07:00
erwin coumans dc16655d35 more bug fixes 2014-08-28 19:01:56 -07:00
erwin coumans 0dff61fbe0 fix two compile errors, thanks to Travis 
https://travis-ci.org/bulletphysics/bullet3/jobs/33858712
 2014-08-28 18:53:51 -07:00
erwin coumans bc5e2b3d50 fix compile issue 2014-08-28 18:47:22 -07:00
erwin coumans 89addd438e add 'fixed' joint for btMultiBody 
improve btMultiBody version of URDF reader (still work-in-progress)
enabled planar joint for btMultiBody (untested)
enable loading from relative path for .stl meshes
 2014-08-28 18:42:08 -07:00
erwincoumans e40606efd1 Merge pull request #222 from erwincoumans/master 
Fixes CMake, X11 stencil shadow , capsule deserialization,add TestJointTorqueSetup demo in App_AllBullet2Demos
 2014-08-26 18:06:30 -07:00
Erwin Coumans 3c558ec995 explicitly deserialize btCapsuleShape date (margin, scaling, halfextents), because the API modifies them 2014-08-26 17:21:08 -07:00
Erwin Coumans a0778a1d49 CMakeLists.txt: OSX check is below 10.9 (not below 10.10), and add new files 2014-08-26 11:37:00 -07:00
Erwin Coumans 2b35911f2a X11OpenGLWindow: create stencil buffer for shadows in OpenGL2 mode (OpenGL3 uses shadow maps) 
Add 'createCollisionObjectGraphicsObject' API for CommonPhysicsSetup
Add 'pthread' dependency as workaround for NVIDIA graphics driver issue
(see //See https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers-319/+bug/1248642
)
 2014-08-26 11:28:44 -07:00
erwincoumans 1e956c8002 Merge pull request #220 from erwincoumans/master 
fix a few warnings, and matching class/struct in forward declaration
 2014-08-25 11:51:07 -07:00
Erwin Coumans 6cbf89905f move the clearForceAndTorque to after the stepVelocities, 
see also https://github.com/bulletphysics/bullet3/pull/221
todo: create test
 2014-08-25 08:48:45 -07:00
Erwin Coumans 8e64ee57c9 fix a few warnings, and matching class/struct in forward declaration 2014-08-22 18:15:17 -07:00
Erwin Coumans 2c19a27694 add missing ConstraintPhysicsSetup.* files 2014-08-22 14:50:42 -07:00
Erwin Coumans 954d488756 cmake+premake disable OpenGL 3 demos on Mac OSX versions below 10.9 
See also http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=10073
Move ConstraintPhysicsSetup to Demos3/bullet3/ConstraintDemo
 2014-08-22 14:41:21 -07:00
erwincoumans ade897c132 Merge pull request #219 from erwincoumans/master 
fix another warning
 2014-08-22 11:52:00 -07:00
Erwin Coumans 95f207e786 fix another warning 2014-08-22 11:51:22 -07:00
erwincoumans bc96d5e82c Update ImportURDFSetup.cpp 
fix signed/unsigned warning
 2014-08-22 11:45:17 -07:00
erwincoumans edbc1872c6 Merge pull request #218 from erwincoumans/master 
remove a lot of warnings (more todo in demos and serialization code)
 2014-08-22 11:17:46 -07:00
Erwin Coumans af5883c6e8 remove a lot of warnings (more todo in demos and serialization code) 2014-08-22 10:29:05 -07:00
erwincoumans e1e54f748c Merge pull request #217 from erwincoumans/master 
fix more warnings, implement missing X11 function for dynamic loading
 2014-08-21 17:36:41 -07:00
Erwin Coumans 37aa4dc4f8 fix more warnings, implement missing X11 function for dynamic loading 2014-08-21 17:27:14 -07:00
erwincoumans 60ab931dbd Merge pull request #216 from erwincoumans/master 
fix more warnings in BulletCollision, and fix CMakeLists for Linux
 2014-08-21 16:03:14 -07:00
Erwin Coumans 5834547368 fix more warnings in BulletCollision, and fix CMakeLists for Linux 2014-08-21 15:54:50 -07:00
erwincoumans 4118495de3 Merge pull request #215 from erwincoumans/master 
remove some warnings
 2014-08-21 14:05:47 -07:00
Erwin Coumans 143c2da254 premake4: don't use recursive file globbing in LinearMath and BulletCollision 2014-08-21 14:03:15 -07:00
Erwin Coumans 4af9c5a4c9 remove some warnings 2014-08-21 13:32:32 -07:00
erwincoumans 590504bf72 Merge pull request #201 from bgossage/fix_pointer_cast 
-- Corrected cast of 32-bit int to 64-bit pointer
 2014-08-21 11:19:45 -07:00
Erwin Coumans ed637a6942 fix mac build 2014-08-20 17:24:12 -07:00
erwincoumans cb55f7df30 Merge pull request #214 from erwincoumans/master 
fix Linux  and Cmake build
 2014-08-20 16:51:02 -07:00
Erwin Coumans d4e4fdc2c5 fix Linux and Cmake build 2014-08-20 16:48:46 -07:00
Erwin Coumans 7b28e86c7b add improved btGeneric6DofSpring2Constraint, thanks to Puhr Gabor and Tamas Umenhoffer! 
improved the new demo testbed (work-in-progress)
add basic Lua demo, import URDF test, STL import, obj import
 2014-08-20 16:28:16 -07:00
erwincoumans d2509ae7a1 Merge pull request #212 from erwincoumans/master 
dynamic loading of OpenGL/X11
 2014-08-19 08:35:09 -07:00
erwincoumans cd22ccdbcf Merge pull request #187 from filipwasil/subproject_build_fix 
fix: path resolving was wrong when built as a subproject
 2014-08-19 08:34:48 -07:00
erwincoumans 34baab5077 Merge pull request #196 from jackoalan/parallel_linear_bvh_cl_fix 
Compile fix for parallelLinearBvh.cl on OS X Intel HD 5000
 2014-08-19 08:30:56 -07:00
Erwin Coumans 423f07945f Merge remote-tracking branch 'github_bulletphysics/master' 2014-08-18 22:33:14 -07:00
Erwin Coumans d93b27f16c premake4: add option to force dynamic loading of OpenGL and X11 
--force_dlopen_opengl and --force_dlopen_x11
 2014-08-18 22:19:34 -07:00
Erwin Coumans bf1bd07636 premake4 build: allow to dynamically load X11 if X11 system headers/library is missing 
premake4 build: allow to dynamically load OpenGL/GLEW/glx if system headers are missing
 2014-08-18 21:43:08 -07:00
erwincoumans 2442977725 Merge pull request #209 from erwincoumans/master 
see https://github.com/erwincoumans/bullet3/commit/670576ec721c0d490f319a65778dad19814d3fc3
 2014-08-12 12:21:52 -07:00
erwin coumans 670576ec72 remove #include <stdbool.h> it breaks MSVC 2010 
enable gtest by default when using premake, added flag without-gtest
use gtest ASSERT_EQ( expected_value, actual_value) instead of the reverse,
this fixes issue 205 (https://github.com/bulletphysics/bullet3/issues/205)
 2014-08-12 12:18:32 -07:00
Erwin Coumans 4027ed09ae Merge remote-tracking branch 'bulletphysics/master' 2014-08-03 21:18:32 -07:00
Erwin Coumans 5ed49cc3a2 fix missing implementation 2014-08-03 14:00:22 -07:00
Erwin Coumans f85e251a5b add missing files to CMakeLists 2014-08-03 13:56:45 -07:00
Erwin Coumans ae98ffe218 add Obj and STL import demo, work on URDF import 2014-08-03 13:45:05 -07:00
Erwin Coumans ba5a8a450b Merge remote-tracking branch 'bulletphysics/master' 2014-08-03 13:19:44 -07:00
Erwin Coumans 86f793a6ae start of URDF parsing (extremely preliminary) 2014-08-01 13:01:31 -07:00
Erwin Coumans 070802f4de fix premake build 2014-07-31 18:19:59 -07:00
Erwin Coumans 85e5a0c55b Merge branch 'master' of https://github.com/bulletphysics/bullet3 2014-07-31 18:11:03 -07:00
Erwin Coumans fa3d01e6af fix build 2014-07-31 18:10:50 -07:00
erwincoumans c471e27280 Merge pull request #203 from AussieBacom/master 
added get elapsed time from clock in seconds
 2014-07-31 18:05:24 -07:00
Erwin Coumans a08d4a94e3 create URDF skeleton for a demo (only loading data, not converting it yet) 2014-07-31 16:54:28 -07:00
Haydn Trigg 3d944782e9 Update btQuickprof.cpp 
removed inline declaration from get time seconds function definition
 2014-08-01 07:25:31 +09:30
Erwin Coumans af446c79b5 Merge branch 'master' of https://github.com/bulletphysics/bullet3 2014-07-31 14:43:11 -07:00
Erwin Coumans f9691957c1 fix Windows version of urdf parser 2014-07-31 14:42:33 -07:00
Erwin Coumans 793bcb1cde move menuItems into constructor (was a typo) 2014-07-31 14:20:24 -07:00
Erwin Coumans 8e1fbb482b add GwenParameterInterface.cpp and ConstraintPhysicsSetup.cpp to CMakeLists.txt 
should fix the build
 2014-07-31 14:06:53 -07:00
Erwin Coumans e4f64d91f1 add CommonParameterInterface.h 2014-07-31 14:04:09 -07:00
Erwin Coumans 04632538ec add tinyxml, urdfdom and urdfdom_headers from https://github.com/ros/urdfdom 
(removed BOOST dependency and make it compile on Windows)
 2014-07-31 13:38:31 -07:00
Erwin Coumans 4b8c8e7910 expose basic parameters in SimpleOpenGL3App, test with accumulated hinge angle, GUI is still preliminary 2014-07-31 11:47:04 -07:00
Erwin Coumans d798144167 don't add collision shapes to the list twice 2014-07-30 22:28:38 -07:00
Erwin Coumans 1d00d91707 add btHingeAccumulatedAngleConstraint derived from btHingeConstraint, 
that exposes a new method getAccumulatedHingeAngle
See also https://github.com/bulletphysics/bullet3/issues/42
 2014-07-30 16:13:34 -07:00
Erwin Coumans 97fc144134 fix Windows compile error, SIMD data needs to be passed by reference 2014-07-30 09:48:18 -07:00
Erwin Coumans (Google) e1abb8ba89 fix #include path and compile error 2014-07-30 08:27:17 -07:00
Erwin Coumans a817b0bb24 support Retina for movie generation in SimpleOpenGL3App 2014-07-29 23:06:36 -07:00
Erwin Coumans 0c39cda57b enable png and mp4 output in SimpleOpenGL3App, see 
Demos3/SimpleOpenGL3 use commandline parameter
--png_file="pngname" or
--mp4_file="video.mp4"

Thanks to http://blog.mmacklin.com/2013/06/11/real-time-video-capture-with-ffmpeg/
 2014-07-29 16:58:22 -07:00
Erwin Coumans fb01827aee expose debugDraw in gl3 2014-07-29 14:03:15 -07:00
Erwin Coumans 811087b099 Merge branch 'master' of https://github.com/bulletphysics/bullet3 
Conflicts:
	btgui/OpenGLWindow/X11OpenGLWindow.cpp
 2014-07-27 10:55:58 -07:00
Erwin Coumans 0b40e1a899 add upAxis option for Y or Z up 
remove some warnings
 2014-07-27 10:29:10 -07:00
Erwin Coumans 5e9102bf00 fix warnings in OpenGLTrueTypeFont 2014-07-27 10:25:36 -07:00
Haydn Trigg 6ff7a6d48b Update btQuickprof.cpp 2014-07-26 00:44:16 +09:30
Haydn Trigg 4a43eab4dd Update btQuickprof.h 2014-07-26 00:44:15 +09:30
erwincoumans d347bca2ba use lower-case input by default under Linux 2014-07-20 06:22:50 -07:00
bgossage d58857f06b -- Corrected cast of 32-bit int to 64-bit pointer 
-- Removes 64-bit portability issue.
 2014-07-17 11:13:07 -05:00
erwincoumans e317b64643 Merge pull request #197 from juj/no_xcompile_system_includes 
No system headers when cross-compiling.
 2014-07-14 09:26:16 -07:00
Jukka Jylänki 1054fd1992 Fix CMakeLists.txt to not unconditionally add include paths to native system headers in /usr/include and /usr/local/include, which contain include files for the host architecture, and not the target architecture that is being compiled for. 2014-07-12 13:50:12 +03:00
Jack Andersen d4fd695d56 Compile fix for parallelLinearBvh.cl on OS X Intel HD 5000 2014-07-11 14:11:11 -10:00
Erwin Coumans (Google) 433d349369 add option for newer Linux demos to dynamically load X11, glX and OpenGL 1 functions 
(and avoid having to link against X, glx and GL)
-DGLEW_INIT_OPENGL11_FUNCTIONS
-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
-DDYNAMIC_LOAD_X11_FUNCTIONS
and link against libdl (for example usingi -ldl)
 2014-07-11 14:25:32 -07:00
Erwin Coumans (Google) 72ae3b6afb test commit for travis-ci.org 2014-07-11 13:21:00 -07:00
Erwin Coumans (Google) b99ef60451 test commit for travis-ci.org 2014-07-11 13:17:33 -07:00
erwincoumans 8e11121ced Merge pull request #178 from scpeters/travis_yml 
Add .travis.yml for continuous integration
 2014-07-11 12:58:16 -07:00
Erwin Coumans 9b9fa7509f Add option to let glew initialize the OpenGL 1.1 function pointers (not just all OpenGL 1.2 and above function pointers) 
so you can avoid linking against OpenGL / libGL library at link-time.
See also http://sourceforge.net/p/glew/mailman/message/22729161/ and
http://portal.nersc.gov/svn/visit/branches/2.6RC/src/third_party_builtin/glew/glew/
Thanks to Tom Fogal for the help.
 2014-07-10 11:45:35 -07:00
Erwin Coumans (Google) 27b0e4d1e6 experiments with params in AllBullet2Demos (quick hack for testing, will clean this up soon) 
yet another workaround to make Intel GPU work with glDrawBuffers on Ubuntu
 2014-07-08 16:42:57 -07:00
Erwin Coumans (Google) f89d70b895 fix Linux build 2014-07-03 22:41:07 -07:00