Commit Graph

347 Commits

Author SHA1 Message Date
Brecht Van Lommel
ec00764dd2 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD 2008-12-14 17:32:24 +00:00
Benoit Bolsee
61a83d2fba Add MSVC90 project files - part 3. Extern and Intern projects are merged in projectfiles_vc9\blender\blender.sln solution, you just need to open that solution to compile everything with VS2008. 2008-11-10 21:22:22 +00:00
Benoit Bolsee
c27a8da6dd Add MSVC90 project files - part 2. 2008-11-10 16:09:25 +00:00
Nathan Letwory
f59f5e67a5 * doing some warning cleaning
* accidently left priority tests around.
2008-11-04 23:46:01 +00:00
Nathan Letwory
beea73b110 * enable openjpeg building for win32/msvc
* add support for building redcode on win32/msvc, but disabled for now, as there are linking problems
  - I cleaned the redcode sconscript - the copying of headers within the source tree is not a clean solution
    This needs to be fixed later on. For now, lets use redcode from extern/ until a better way is found.
2008-11-04 23:04:15 +00:00
Nathan Letwory
0bd7934be7 * Minimum SCons version is now 1.0.0
- Code has been changed to reflect this (ie. deprecated functions are not anymore used)
* clean up the C and C++ compiler flags mess.
  - in the environment construction of BlenderLib all the compile flag governing options have been split in the *C*, *CC* and *CXX* containing equivalents.
    C is for C compiler only flags. CC is for C and C++ compiler flags and CXX is for C++ compiler only flags.
    All the platform default config files need to be double checked and fixed wherever it looks necessary. Either DIY, or send me a note with needed changes.
  - a start for the BlenderLib parameter list has been made - all the SConscripts need to be checked and modified to hand in flags properly.
* A theeth request: make -jN settable in the config file.
  - I give you BF_NUMJOBS, which is set to 1 by default. In your user-config.py, set BF_NUMJOBS=4 to have 4 parallel jobs handled. Yay.
2008-10-30 23:55:07 +00:00
Nathan Letwory
2ecf987dc6 * Minor cleanup of SCons files
- cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1
- changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
Benoit Bolsee
a71cb63ce6 BGE bug #17858 fixed: [SHOWSTOPPER] BGE Memory leak. The memory leak has been identified and fixed in bullet. 2008-10-18 18:37:58 +00:00
Erwin Coumans
c515395067 bugfix: copy/paste bug merged from Bullet main repo into Blender, hope it still can make 2.48 2008-10-14 06:14:25 +00:00
Erwin Coumans
3cac11a3a2 Last (hopefully) soft body fixes:
Enable soft body collision clusters by default.
Add option to 'disable collision' button between soft body and rigid body connected by constraint (option was already available between two rigid bodies)
2008-10-11 20:19:04 +00:00
Erwin Coumans
64a0bcd10a remove constraints from world, if not done yet 2008-10-11 19:32:53 +00:00
Erwin Coumans
17c391b429 bugfix: add Ghost support for soft bodies, so that they don't collide with ghosts, and can be ghost themselves. 2008-10-03 21:42:19 +00:00
Erwin Coumans
56b560bb6c Move the Solaris workaround in btScalar behind the sun define, to only make sun and apple ppc slower:
#if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined (__APPLE__) && ! defined (__i386__))
Also includes a fix to uninitialized variable (can cause failing collisions).

If possible, report all changes to extern/bullet2 to http://code.google.com/p/bullet/issues/list
2008-10-03 20:51:56 +00:00
Kent Mein
0eaccf881b Solaris was having problems with sqrtf and friends again.
I changed sqrtf to sqrt in elbeem
in bullet2 I added defines found in floatpatch.h eventually
we should make a "floatpatch.h" that all of blender can use.

Kent
2008-10-03 13:16:10 +00:00
Kent Mein
0110133cf7 Maybe not needed, I was running into some problems though
and noticed dos line endings in a bunch of files so ran
dos2unix on everything in bullet2.

Erwin,  I noticed there are a few files that do not have
license info in them, couple of quick examples are: btDefaultMotionState.h
btHashMap.h btQuickprof.cpp
could you take a look at add where needed?   If you want I can give a list
of files I think should get it added  and or just add the standard one
say the one in src/btBulletCollisionCommon.h 

Kent
2008-10-02 16:52:39 +00:00
Daniel Genrich
611b4b383a Disable building of fftw 2008-10-01 17:02:38 +00:00
Benoit Bolsee
f4c1fcefe8 Update MSVC project file for Bullet soft body. Strange, I though I already fixed them. 2008-10-01 07:04:10 +00:00
Erwin Coumans
808d6197cf add support for Bullet soft body constraints against a Bullet rigid body, as well as 'fixing' it. Just use the existing rigid body joint to use it. For now, it searches the closest node/vertex to the pivot. So you can use multiple constraints/joint to attach a cloth, soft body etc. 2008-09-30 23:34:25 +00:00
Erwin Coumans
09f79a8e9f add setUnscaledRadius for btSphereShape 2008-09-30 22:05:12 +00:00
Erwin Coumans
0b622fc07f added anisotropic friction support for Bullet. Both for static and dynamic objects 2008-09-29 03:09:03 +00:00
Daniel Genrich
a765f54b1a Commiting fftw lib into extern for ocean patch 2008-09-28 02:17:05 +00:00
Erwin Coumans
b6405b970c force collision bound type to be convex hull or concave triangle mesh for soft bodies
set collision margin between soft and mesh back to .3, smaller is not useable (yet)
2008-09-27 00:36:18 +00:00
Erwin Coumans
1e0cfcfd3a fixed some outstanding issues with Bullet soft bodies:
1) re-allocate a pool allocator, if one of the soft body collision algorithms is larger than max pool element size
2) manage child shapes properly, and call RemoveReferences on the m_sparsesdf
2008-09-26 23:20:31 +00:00
Erwin Coumans
17d9f2eda9 fixed soft body collision against concave triangle meshes. 2008-09-26 21:49:26 +00:00
Erwin Coumans
73119b840a avoid adding degenerate faces to a Bullet soft body 2008-09-26 21:27:33 +00:00
Benoit Bolsee
8b46e655fa Update MSVC project files 2008-09-26 17:46:55 +00:00
Brecht Van Lommel
dff3d418d4 Bullet build system fixes: add gimpact to the makefiles, and fix
blenderplayer linking for scons.
2008-09-26 16:43:50 +00:00
Joshua Leung
06a5e9b58a scons/mingw linking fixes with bullet - adjusting priorities to find libs 2008-09-26 08:40:35 +00:00
Nathan Letwory
a349a3201e * split collision lib into its subparts
-This is to remedy long command-line troubles for scons/mingw users. Hopefully this goes ok on other platforms too :)
2008-09-26 08:05:18 +00:00
Erwin Coumans
9d3c77ec62 support concave soft bodies, preliminary. could be used for cloth too. need vertex pinning/constraint attach to other objects. 2008-09-26 06:25:35 +00:00
Erwin Coumans
a1bef84ea8 Allow Bullet soft bodies to be created using a AddObject actuator. Added a fake world coordinate system to game soft bodies, although the vertices are already in world space.
Added Bullet/Gimpact concave collision detection to Blender. If your build system isn't updated yet, please add extern/bullet2/src/BulletCollision/Gimpact/*
This allows moving/dynamic concave triangle meshes (decomposing meshes into compound convex shapes, and using 'compound' shapes is still preferred)
2008-09-26 02:27:59 +00:00
Erwin Coumans
3b09c0b0d5 Created a KX_SoftBodyDeformer for real-time soft bodies.
Added SetDeformer/GetDeformer() to KX_GameObject.
Store mapping between graphics/soft body vertices (work-in-progress)
Real-time soft body integration is still very premature, but
for a quick preview, see this testfile:
http://bulletphysics.com/ftp/pub/test/index.php?dir=blender/&file=soft_test.blend
2008-09-24 03:12:10 +00:00
Erwin Coumans
d2d56e3058 bugfix for [#7006] Sleeping Objects losing Ghost Constraint
Bullet logic bug in (de)activation/island management: deactivated 'fantom' objects do merge islands, in particular when connected by constraints. (fantom = object with collision detection but no collision response).
2008-09-23 05:00:00 +00:00
Erwin Coumans
1c29d02305 BGE real-time soft bodies, step 2 / 3: create a btSoftBody. Next step is hooking up / deform graphics mesh and choose collision shape.
Note: feature is still disabled.
2008-09-21 15:17:50 +00:00
Erwin Coumans
deba5ab9a7 encountered some issue with the btDbvtBroadphase, switch of a deferred collision feature. 2008-09-21 01:13:54 +00:00
Erwin Coumans
2941f755f7 attempt to support negative local scaling for convex hull, box,sphere, cylinder, cone and btScaledBvhTriangleMeshShape in Bullet. 2008-09-20 23:45:45 +00:00
Erwin Coumans
877d70b14a fixed sphere-sphere collision: contact points were not properly removed/refreshed. 2008-09-20 22:34:54 +00:00
Campbell Barton
7e6c1e1091 needed these changes to get bullet building with cmake and linking with scons 2008-09-18 00:10:12 +00:00
Benoit Bolsee
0c1ec934c6 Update MSVC project file to include BulletSoftBody 2008-09-17 21:14:48 +00:00
Erwin Coumans
80f22a9e60 added another missing file, btHashMap 2008-09-17 20:02:20 +00:00
Erwin Coumans
8b73f35141 added src/LinearMath/btConvexHull.cpp 2008-09-17 19:58:16 +00:00
Erwin Coumans
015a42079c Please add extern/bullet2/src/LinearMath/btConvexHull.cpp to your build system!
Reverted back to original Bullet version.
2008-09-17 19:47:26 +00:00
Ton Roosendaal
2b6aea2009 Added BulletSoftBody as target for Makefile installing of .h files 2008-09-17 11:31:03 +00:00
Campbell Barton
bbdcd3a082 rev 16569 broke building.
Looks like bullets Extras/ConvexDecomposition is missing from blenders source.
comment functions so it builds for now.
2008-09-17 11:23:28 +00:00
Erwin Coumans
651c0e4861 Applied some fixes from Bullet: issues with btDbvtBroadphase, and btSoftBody, and better fix for 64-bit issue in btCompoundCollisionAlgorithm. 2008-09-17 02:30:19 +00:00
Erwin Coumans
ae418491dc Preparation for real-time soft bodies for the game engine, step 1 out of 3. This should be harmless/non-intrusive.
Please make sure each build system include extern/bullet2/src/BulletSoftBody/* and extern/bullet2/src/LinearMath/btConvexHull.*
2008-09-17 01:49:47 +00:00
Nathan Letwory
73c8d76ba4 * make BulletSoftBody own small lib to make sure bullet libs don't grow too large for our beloved scons/mingw users. 2008-09-16 21:23:56 +00:00
Erwin Coumans
0c77a178da add BulletSoftBody to SConscript and Makefile 2008-09-16 21:09:24 +00:00
Erwin Coumans
5941411839 add src/BulletSoftBody/* to cmake (other build systems also will need to do this soon) 2008-09-16 20:52:38 +00:00
Campbell Barton
ce41cfa40a bullet wasnt building on 64bit linux 2008-09-13 12:07:36 +00:00