Bart/bullet3
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,166 Commits 10 Branches 0 Tags
a6690f97a3f311f5e5f107bf6d36c76bc0f3a127
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
erwincoumans a6690f97a3 Merge pull request #342 from erwincoumans/master 
small URDF2Bullet refactor to make URDF import a little bit more re-useable
 2015-03-20 13:33:45 -07:00
erwincoumans 3d19aec7fa add some minor fixes for URDF2Bullet to make it work (needs more testing) 2015-03-18 15:12:27 -07:00
erwincoumans e336c480bd Merge pull request #338 from erwincoumans/master 
ImportURDFSetup: add Wavefront/obj support
 2015-03-10 08:39:13 -07:00
erwincoumans 5e78feb4cb Merge pull request #253 from TimothyGu/patch-1 
Install pkg-config file on MinGW systems as well
 2015-03-04 16:11:03 -08:00
erwincoumans 97e9b5ccad Merge pull request #337 from erwincoumans/master 
add btMultiBodyConstraint::finalizeMultiDof API: if you add multi-body c...
 2015-03-03 17:06:04 -08:00
erwincoumans a391e619ed Update README.md 2015-03-01 10:30:20 -08:00
erwincoumans 98ac437649 Merge pull request #326 from erwincoumans/master 
_N -> n, _C -> c, _L ->l, some collision with a standard C++ header?
 2015-02-20 13:53:54 -08:00
erwincoumans 2a0787907b Merge pull request #324 from erwincoumans/master 
improved URDF support and fixes in btMultiBody
 2015-02-13 19:04:34 -08:00
Erwin Coumans 4e02f6673b fix a bug related to gyroscopic forces in btMultiBody 2015-02-13 18:27:01 -08:00
Erwin Coumans d8b08eaf2a fix in URDF loading: apply visual transform locally, not after compensating for inertia transform. 
add option in COLLADA loading to specify client up axis (so that if client=Z and COLLADA =Z, upAxisTransform is identity,
while if client=Y and COLLADA=Y, upAxisTransform is identity etc)
 2015-02-13 16:18:16 -08:00
erwincoumans 01a14e4daf Merge pull request #322 from scpeters/issue_321 
Add extra -I flag to bullet.pc to allow namespaced includes
 2015-02-12 13:34:58 -08:00
erwincoumans 5a91c9ea3c Merge pull request #317 from namar0x0309/master 
Fix for 64bit builds btSqrt and USE_APPROXIMATION
 2015-02-12 13:34:22 -08:00
erwincoumans 078afee015 Merge pull request #323 from erwincoumans/master 
fix some btMultiBody URDF conversion issues in ImportURDFSetup, add RenderInstancingDemo, use GLInstanceVertex
 2015-02-12 13:34:07 -08:00
erwincoumans b36936a4ab Update Test_v3interp.cpp 
add test case for https://github.com/bulletphysics/bullet3/pull/313
 2015-02-10 18:12:55 -08:00
erwincoumans 15d5659483 Merge pull request #313 from jackoalan/neon-setinterpolate3-fix 
Fixed self-referencial bug in btVector3's setInterpolate3 (NEON)
 2015-02-10 18:10:26 -08:00
erwincoumans e3a77042cd Merge pull request #320 from erwincoumans/master 
btTriangleMesh::addTriangleIndices, pthread link fix for OpenGLWindow
 2015-02-04 11:44:05 -08:00
erwincoumans b975248e05 Merge pull request #319 from scpeters/fix_pkgconfig_2.83 
Use absolute paths in pkg-config file, thanks to Steven Peters for the contribution!
 2015-02-04 11:43:44 -08:00
erwincoumans 76b80ca71b Merge pull request #309 from erwincoumans/master 
minor fixes (GL2, preSwapFileNameOut), improved URDF/btMultiBody (work in progress), basic debug drawing for btMultiBody
 2015-01-27 13:33:37 -08:00
erwincoumans bd16df8dd6 add basic debug drawing interface for btMultiBodyPoint2Point constraint 
add basic debug drawing drawText3D in SimpleOpenGL3App
remove a few warnings
add drawTexturedRect3D to GLPrimitiveRenderer to support debug drawing
 2015-01-27 10:45:56 -08:00
Erwin Coumans 51f41d0cfc fix issue, when debug drawer doesn't exist don't try to use it 
enable simulation by default (was accidently switched off at startup of AllBullet2Demos)
 2015-01-22 18:28:00 -08:00
erwincoumans c5b7d5011e Merge pull request #307 from a0121536/patch-1 
Fix the shadows in the 'Gyroscopic' demo
 2015-01-22 17:58:20 -08:00
erwincoumans a159fbac69 Improved URDF support for btMultiBody and separate graphics/collision/inertial frames and shapes 
Fix WinXP GetTickCount64 with a typedef
Expose debug drawing mode/flags in UI (hot keys A,D,L,W for now, buttons later)
GLInstancingRenderer: tweak near/far planes to allow closer approach of camera
btDiscreteDynamicsWorld: enable debug drawing for btGeneric6DofSpring2Constraint
btMultiBodyDynamicsWorld: enable basic debug drawing for btMultiBody
btMultibody: allow center-of-mass shift for prismatic and fixed constraint
 2015-01-22 17:56:24 -08:00
erwincoumans 46b9f7fbee Merge pull request #299 from erwincoumans/master 
fix crash in BasicDemo and some other minor things (see commits)
 2014-12-16 16:32:39 -08:00
erwincoumans bb2805379c Merge pull request #292 from lunkhound/fix-sse-win32 
quickfix: SSE was accidentally disabled on windows desktop
 2014-12-16 14:38:17 -08:00
erwincoumans c7d9c5ba5b Merge pull request #296 from rraallvv/master 
Stop adding motion in the kinematic character controller if the walk dir...
 2014-12-16 14:37:05 -08:00
erwincoumans 6e6c6812ec Merge pull request #297 from Orbots/convex-hull-fix 
Convex hull fix
 2014-12-12 21:18:49 -08:00
erwincoumans 366b2ef500 Merge pull request #295 from erwincoumans/master 
fix a problem in the btMultiBodyConstraint related to self-collision, se...
 2014-12-09 16:58:11 -08:00
erwincoumans dc731280b8 Merge pull request #281 from erwincoumans/master 
comment-out the memset in DEBUG mode in btVector3.cpp and b3Vector3.cpp
 2014-11-05 12:27:55 -08:00
erwincoumans df6d377224 Merge pull request #280 from erwincoumans/master 
Minkowski Portal Refinement, Finite Element Method demo
 2014-11-02 13:51:45 -08:00
erwincoumans 959e86eb1a Merge pull request #276 from erwincoumans/master 
Enable CMake support for Windows Phone (_WIN32+_M_ARM) and Windows Store...
 2014-10-27 12:47:59 -07:00
erwincoumans 5f53ebd430 Merge pull request #278 from dbasilioesp/master 
Stylized ReadMe
 2014-10-27 12:32:11 -07:00
erwincoumans 0160512a01 Merge pull request #275 from erwincoumans/master 
fix build
 2014-10-22 14:47:53 -07:00
erwincoumans 4de9e3fd24 Merge pull request #273 from erwincoumans/master 
COLLADA .dae importer for URDF, Basic Coordinate System demo
 2014-10-22 14:24:51 -07:00
erwincoumans 3799b021f5 Merge pull request #269 from kwatts/render_callback_virtual_dtor 
Render callback virtual dtor
 2014-10-17 13:49:59 -07:00
erwincoumans fccd00b3cf Merge pull request #260 from sippeangelo/issue-260 
Microsoft compiler wrongly assumed on Windows platform
 2014-10-17 13:49:30 -07:00
erwincoumans 1d78b1aef9 Merge pull request #271 from erwincoumans/master 
btHingeConstraint to set/get ERP, refactor gfx backends (work-in-progress)
 2014-10-17 13:48:02 -07:00
erwincoumans 70c307e08e Merge pull request #268 from kwatts/render_callback_virtual_dtor 
Thanks for the help! Adding virtual destructor for RenderCallbacks struct
 2014-10-16 13:35:43 -07:00
erwincoumans 46bd05f4f7 Merge pull request #241 from xantares/patch-1 
Fix removed dir
 2014-09-17 10:10:27 -07:00
erwincoumans 43304f494e Merge pull request #249 from erwincoumans/master 
fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS
 2014-09-17 10:08:34 -07:00
Erwin Coumans 76f4bd9a9d fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS 2014-09-17 10:07:21 -07:00
erwincoumans 065091bd12 Merge pull request #248 from erwincoumans/master 
fix btInMemorySerializer but disable btInMemorySerializer by default
 2014-09-16 20:17:51 -07:00
erwincoumans dd526e7da9 Merge pull request #247 from erwincoumans/master 
disable btInMemorySerializer by default
 2014-09-16 19:57:11 -07:00
erwincoumans 26a8eee4ad Merge pull request #246 from erwincoumans/master 
add btInMemorySerializer (experiments, allows for in-memory deep copy of...
 2014-09-16 19:40:58 -07:00
erwincoumans baeec0efcd Merge pull request #245 from erwincoumans/master 
split Wavefront .obj to graphics conversion in a reusable file (Wavefron...
 2014-09-16 14:23:46 -07:00
erwincoumans 11db92bfbc Merge pull request #243 from erwincoumans/master 
minor cleanup of btgui/demo3 stuff, much more demo cleanup is needed
 2014-09-16 12:31:17 -07:00
erwincoumans 3240d790e4 Update btSerializer.h 
fix compile error in LinearMath/btSerializer.h
 2014-09-16 09:32:26 -07:00
erwincoumans 89aeae9102 Add serialization support for btGeneric6DofSpring2Constraint 
Attempt to re-order serialization data so it can be serialized in-memory (for deep copy)
 2014-09-16 09:22:35 -07:00
erwincoumans 11ded54a04 call 'updateCamera' in GpuDemos. 2014-09-12 09:51:01 -07:00
erwincoumans 4403ecf49d AMD 14.50Alpha5 driver fixes the issue with MPR kernel, re-enable testFileFracture.bullet 2014-09-12 09:50:13 -07:00
erwincoumans 02ca31bc9d Merge pull request #240 from erwincoumans/master 
allow to compile using gcc-4.x on Mac OSX
 2014-09-10 20:51:07 -07:00
Erwin Coumans 6406519108 allow to compile using gcc-4.x on Mac OSX 2014-09-10 20:50:12 -07:00
erwincoumans 46565f3cea Merge pull request #238 from erwincoumans/master 
premake: use *.cpp insteadl of **.cpp
 2014-09-05 11:32:22 -07:00
erwincoumans 3205f71e5e Merge pull request #237 from erwincoumans/master 
escape quits SimpleOpenGLApp
 2014-09-04 18:00:44 -07:00
erwincoumans b125a96294 Merge pull request #232 from erwincoumans/master 
consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueType...
 2014-09-03 10:21:02 -07:00
erwincoumans d6c78426bd Merge pull request #231 from erwincoumans/master 
stringify unified between linux and mac
 2014-09-01 09:30:34 -07:00
erwincoumans 3b7a7007ce Merge pull request #230 from erwincoumans/master 
remove BUILD_MULTITHREADING option from CMakeLists.txt
 2014-08-31 13:10:11 -07:00
erwincoumans 57b3886c1f Merge pull request #229 from erwincoumans/master 
add fileOpenDialog selector (Win/Mac/Linux), CMake remote CMAKE_INSTALL_PREFIX,fix support for dynamic loading of X11 functions
 2014-08-31 13:01:22 -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
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
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
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
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
erwincoumans 4118495de3 Merge pull request #215 from erwincoumans/master 
remove some warnings
 2014-08-21 14:05:47 -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 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
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 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 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