summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix package config file include directorybaserock/morphRichard Dale2014-11-201-2/+2
|
* Merge pull request #281 from erwincoumans/mastererwincoumans2014-11-059-253/+675
|\ | | | | comment-out the memset in DEBUG mode in btVector3.cpp and b3Vector3.cpp
| * fix MSVC 2013 compilation (std::min needs #include <algorithm>erwin coumans2014-11-057-7/+429
| | | | | | | | add example use of GJK+MPR in VoronoiFractureDemo
| * comment-out the memset in DEBUG mode in btVector3.cpp and b3Vector3.cppErwin Coumans2014-11-022-246/+246
| |
* | fix linux build of test/collisionErwin Coumans2014-11-031-0/+5
| |
* | Merge pull request #280 from erwincoumans/mastererwincoumans2014-11-02157-379/+21010
|\ \ | |/ | | Minkowski Portal Refinement, Finite Element Method demo
| * disable work-in-progress softbody demoErwin Coumans2014-11-023-5/+5
| |
| * Merge remote-tracking branch 'bp/master'Erwin Coumans2014-11-028-61/+68
| |\ | |/ |/| | | | | Conflicts: btgui/Bullet3AppSupport/CommonParameterInterface.h
* | Merge pull request #276 from erwincoumans/mastererwincoumans2014-10-273-6/+18
|\ \ | | | | | | Enable CMake support for Windows Phone (_WIN32+_M_ARM) and Windows Store...
* \ \ Merge pull request #278 from dbasilioesp/mastererwincoumans2014-10-271-51/+54
|\ \ \ | | | | | | | | Stylized ReadMe
| * | | Update README.mdDavid Basilio Espitalher2014-10-271-1/+2
| | | |
| * | | Update README.mdDavid Basilio Espitalher2014-10-271-19/+19
| | | |
| * | | Update README.mdDavid Basilio Espitalher2014-10-271-30/+32
|/ / /
* | | Merge pull request #275 from erwincoumans/mastererwincoumans2014-10-224-8/+8
|\ \ \ | | | | | | | | fix build
* \ \ \ Merge pull request #273 from erwincoumans/mastererwincoumans2014-10-2216-6/+1691
|\ \ \ \ | | | | | | | | | | COLLADA .dae importer for URDF, Basic Coordinate System demo
* \ \ \ \ Merge pull request #269 from kwatts/render_callback_virtual_dtorerwincoumans2014-10-172-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Render callback virtual dtor
| * | | | | Virtual dtor for CommonParameterInterfaceKevin Watts2014-10-161-0/+1
| | | | | |
| * | | | | Adding destructor to GraphicsPhysicsBridgeKevin Watts2014-10-161-0/+1
| | | | | |
* | | | | | Merge pull request #260 from sippeangelo/issue-260erwincoumans2014-10-172-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Microsoft compiler wrongly assumed on Windows platform
| * | | | | | MSVC-specific function calls wrapped in a MSVC-specific macro instead of a ↵sippeangelo2014-10-072-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows-specific one.
* | | | | | | Merge pull request #271 from erwincoumans/mastererwincoumans2014-10-1755-348/+1440
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | btHingeConstraint to set/get ERP, refactor gfx backends (work-in-progress)
* \ \ \ \ \ \ \ Merge pull request #268 from kwatts/render_callback_virtual_dtorerwincoumans2014-10-162-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | Thanks for the help! Adding virtual destructor for RenderCallbacks struct
| * | | | | | Adding virtual dtors to classes in btSoftBodyKevin Watts2014-10-161-0/+2
| | | | | | |
| * | | | | | Adding virtual destructor for RenderCallbacks structKevin Watts2014-10-161-0/+1
|/ / / / / /
* | | | | | Merge pull request #241 from xantares/patch-1erwincoumans2014-09-171-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix removed dir
| * | | | | | Update CMakeLists.txtxantares2014-09-111-1/+0
| | | | | | | | | | | | | | | | | | | | | does not build on win32
* | | | | | | Merge pull request #249 from erwincoumans/mastererwincoumans2014-09-172-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS
* \ \ \ \ \ \ \ Merge pull request #248 from erwincoumans/mastererwincoumans2014-09-161-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix btInMemorySerializer but disable btInMemorySerializer by default
| | | | | | | | * Refactored GJK, EPA and MPR as a template class, reducing/removing the ↵Erwin Coumans2014-11-029-0/+2740
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependencies to the rest of the Bullet code base. This code will replace the original GJK/EPA in a future commit. Added btMprPenetration, an implementation of Minkowski Portal Refinement by Daniel Fiser. Original MPR idea is by Gary Snethen, and the first implementation is here: https://github.com/erwincoumans/xenocollide It is an alternative to EPA, although computing the local penetration depth. EPA computes the global penetration depth. In many cases, MPR is sufficient and performs better than EPA.
| | | | | | | | * placeholder for soft bodyErwin Coumans2014-10-313-0/+7
| | | | | | | | |
| | | | | | | | * render the tetrahedral mesh (no mesh normals)Erwin Coumans2014-10-314-39/+118
| | | | | | | | |
| | | | | | | | * add very basic multibody vehicleErwin Coumans2014-10-319-348/+486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tweak finite element experiment with parameter
| | | | | | | | * initialize variable to fix FEM nodesErwin Coumans2014-10-311-2/+3
| | | | | | | | |
| | | | | | | | * fix Mac build=2014-10-292-2/+3
| | | | | | | | |
| | | | | | | | * add btFileUtils::toLower to convert a string (char*) to lower caseerwin coumans2014-10-292-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URDF import demo: add COLLADA .dae file support add FiniteElementMethod demo, extracted from the OpenTissue library (under the zlib license) don't crash if loading an invalid STL file add comparison with Assimp for COLLADA file loading (disabled by default, to avoid library dependency) Gwen: disable some flags that make the build incompatible
| | | | | | | | * add btFileUtils::toLower to convert a string (char*) to lower caseerwin coumans2014-10-29139-46/+17704
| | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URDF import demo: add COLLADA .dae file support add FiniteElementMethod demo, extracted from the OpenTissue library (under the zlib license) don't crash if loading an invalid STL file add comparison with Assimp for COLLADA file loading (disabled by default, to avoid library dependency) Gwen: disable some flags that make the build incompatible
| | | | | | | * Enable CMake support for Windows Phone (_WIN32+_M_ARM) and Windows Store Apps,erwin coumans2014-10-243-6/+18
| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this recent cmake version (http://cmakems.codeplex.com/) or future cmake that has the Windows Phone/Store App support Use the following defines in CMake: -DCMAKE_SYSTEM_NAME=WindowsPhone or -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=8.0 or -DCMAKE_SYSTEM_VERSION=8.1 Thanks to Microsoft OSS group for the patch!
| | | | | | * Merge branch 'master' of https://github.com/erwincoumans/bullet3erwin coumans2014-10-228-5/+153
| | | | | | |\ | | | | | | |/ | | | | | |/|
| | | | | * | add basic concept demo, Coordinate System for a start.erwin coumans2014-10-226-3/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | set the up axis for some of the demos.
| | | | | * | remove unnecessary headerErwin Coumans2014-10-211-1/+0
| | | | | | |
| | | | | * | fix mac buildErwin Coumans2014-10-211-1/+1
| | | | | | |
| | | | | | * fix builderwin coumans2014-10-224-8/+8
| | | | | |/
| | | | | * Added a basic COLLADA .dae importer mainly to support URDF loading (URDF can ↵erwin coumans2014-10-2111-3/+1540
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | * fix double precision builderwin coumans2014-10-173-34/+45
| | | | |
| | | | * add support to btHingeConstraint to set/get ERP, example use:erwin coumans2014-10-174-10/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hinge->setParam(BT_CONSTRAINT_ERP,0.5); btScalar erp = hinge->getParam(BT_CONSTRAINT_ERP); Also, preliminary support for status bar messages in demo framework.
| | | | * fix build error in SupportFuncDemo.herwin coumans2014-10-171-3/+5
| | | | |
| | | | * add alpha blendering option (disabled by default) using w component of colorErwin Coumans2014-10-158-10/+147
| | | | | | | | | | | | | | | | | | | | add low-level support function demo (test)
| | | | * fix max osx buildErwin Coumans2014-09-291-2/+2
| | | | |
| | | | * enable OpenGL3 by default (part of work-in-progress refactor)Erwin Coumans2014-09-231-1/+1
| | | | |
| | | | * refactor to allow various gfx backends (work-in-progress)Erwin Coumans2014-09-2349-296/+1171
| | | |/ | | |/|