Commit Graph

3066 Commits

Author SHA1 Message Date
erwin coumans
aaaf8dc4e2 Enable CMake support for Windows Phone (_WIN32+_M_ARM) and Windows Store Apps,
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!
2014-10-24 15:44:33 -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
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
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
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
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
Erwin Coumans
76f4bd9a9d fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS 2014-09-17 10:07:21 -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
=
f395a5d031 split Wavefront .obj to graphics conversion in a reusable file (Wavefront2GLInstanceGraphicsShape.*) 2014-09-16 14:22:09 -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
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