Bart/bullet3
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,080 Commits 10 Branches 0 Tags
0160512a01b8098c722adcbe0c008b7e38d5af2e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
erwincoumans 0160512a01 Merge pull request #275 from erwincoumans/master 
fix build
 2014-10-22 14:47:53 -07:00
erwin coumans a59bedd745 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2014-10-22 14:47:07 -07:00
erwin coumans 1ce647742c fix build 2014-10-22 14:46:48 -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
erwin coumans 2e1cbc0133 add basic concept demo, Coordinate System for a start. 
set the up axis for some of the demos.
 2014-10-22 11:17:13 -07:00
Erwin Coumans 2965087110 remove unnecessary header 2014-10-21 18:06:36 -07:00
Erwin Coumans bb9ea22bf0 fix mac build 2014-10-21 17:49:57 -07:00
erwin coumans 579b34d2e0 Added a basic COLLADA .dae importer mainly to support URDF loading (URDF can refer to COLLADA .dae or STL .stl for mesh support) 
It is fairly limited, only supports loading <geometry> with triangulated meshes, no material loading
I will extend this with COLLADA Physics support.
 2014-10-21 17:44:54 -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
erwin coumans 5f61473229 fix double precision build 2014-10-17 13:39:34 -07:00
erwin coumans 1baf2e5cc6 add support to btHingeConstraint to set/get ERP, example use: 
hinge->setParam(BT_CONSTRAINT_ERP,0.5);
btScalar erp = hinge->getParam(BT_CONSTRAINT_ERP);
Also, preliminary support for status bar messages in demo framework.
 2014-10-17 13:05:53 -07:00
erwin coumans c0b4871f6c fix build error in SupportFuncDemo.h 2014-10-17 10:19:16 -07:00
Kevin Watts 0910eb9f72 Virtual dtor for CommonParameterInterface 2014-10-16 13:49:31 -07:00
Kevin Watts 2ad44a2ea6 Adding destructor to GraphicsPhysicsBridge 2014-10-16 13:46:58 -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
Kevin Watts 0623f99a27 Adding virtual dtors to classes in btSoftBody 2014-10-16 11:58:44 -07:00
Kevin Watts 2733f21d5f Adding virtual destructor for RenderCallbacks struct 2014-10-16 11:39:54 -07:00
Erwin Coumans eda1ff77db add alpha blendering option (disabled by default) using w component of color 
add low-level support function demo (test)
 2014-10-15 18:05:11 -07:00
sippeangelo f9674d4b95 MSVC-specific function calls wrapped in a MSVC-specific macro instead of a Windows-specific one. 2014-10-07 18:21:13 +02:00
Erwin Coumans ce0ad64475 fix max osx build 2014-09-29 10:37:39 -07:00
Erwin Coumans 84288952fc enable OpenGL3 by default (part of work-in-progress refactor) 2014-09-23 18:28:49 -07:00
Erwin Coumans e314f56f9d refactor to allow various gfx backends (work-in-progress) 2014-09-23 18:27:16 -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
Erwin Coumans 4352eb1ea4 disable btInMemorySerializer by default 2014-09-16 20:16:01 -07:00
Erwin Coumans 1fccfc4e28 fix btInMemorySerializer 2014-09-16 20:14:31 -07:00
erwincoumans dd526e7da9 Merge pull request #247 from erwincoumans/master 
disable btInMemorySerializer by default
 2014-09-16 19:57:11 -07:00
Erwin Coumans ad251da294 disable btInMemorySerializer by default 2014-09-16 19:56:26 -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
Erwin Coumans f9eb7c68c5 add btInMemorySerializer (experiments, allows for in-memory deep copy of worlds, bypassing the BulletFileLoader mechanism) 
add btCollisionWorldImporter that can load a .bullet file, or use the btInMemorySerializer for deep-copy
 2014-09-16 19:18:10 -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
Erwin Coumans 07e2dcc749 minor cleanup of btgui/demo3 stuff, much more demo cleanup is needed 
moved some files in btgui/Bullet3AppSupport
 2014-09-16 12:08:24 -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
xantares 8b8e3d3a1f Update CMakeLists.txt 
does not build on win32
 2014-09-11 18:56:59 +02: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
Erwin Coumans a26f9c1871 premake: use *.cpp insteadl of **.cpp 2014-09-05 11:22:25 -07:00
erwincoumans 3205f71e5e Merge pull request #237 from erwincoumans/master 
escape quits SimpleOpenGLApp
 2014-09-04 18:00:44 -07:00
Erwin Coumans 61808844de escape quits SimpleOpenGLApp 2014-09-04 17:54:33 -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
Erwin Coumans 0125324bd6 consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueTypeFont) 
consolidate stringify_linux/_osx into stringify.sh
 2014-09-03 09:52:31 -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
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
erwincoumans 3b7a7007ce Merge pull request #230 from erwincoumans/master 
remove BUILD_MULTITHREADING option from CMakeLists.txt
 2014-08-31 13:10:11 -07:00
Erwin Coumans 701ce71a1e remove BUILD_MULTITHREADING option from CMakeLists.txt 2014-08-31 13:09:20 -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
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