From e06eea4fbad2932dcceab99ee865ac02a6078129 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Feb 2011 14:45:45 +0000 Subject: fix for scons with recent change to how BINRELOC is enabled via cmake. also add WITH_PYTHON define to qtcreator project generator until we get a way to add them properly. --- extern/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extern/SConscript') diff --git a/extern/SConscript b/extern/SConscript index 22c7dc23dce..bd73d71f123 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -13,7 +13,7 @@ if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '': if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': SConscript(['libredcode/SConscript']) -if env['OURPLATFORM'] == 'linux2': +if env['WITH_BF_BINRELOC']: SConscript(['binreloc/SConscript']); if env['WITH_BF_LZO']: -- cgit v1.2.3 From 0a60bc14d63c898eef534fb5cdb7dc834fc74d90 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Sat, 9 Apr 2011 23:19:11 +0000 Subject: =cloth collisions= Plugged the eltopo library into the cloth solver. I was playing with it earlier, and it's so easy to use I decided to quickly put it in (trunk's) cloth. See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html . The authors are on the bleeding edge of continuous collision detection (one of them did ILM's cloth sim). I don't really have to time to plug it into softbody, particles, bullet, fluid, etc, but doing so would be pretty straightforward. I'll leave that up to someone else. To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons. --- extern/SConscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'extern/SConscript') diff --git a/extern/SConscript b/extern/SConscript index bd73d71f123..061bd1ba6a3 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -4,6 +4,9 @@ Import('env') SConscript(['glew/SConscript']) +if env['WITH_BF_ELTOPO']: + SConscript(['eltopo/SConscript']) + if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) -- cgit v1.2.3 From a42bf453335bdd569556895a168bced1fa7b3c3c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 12 Apr 2011 11:09:10 +0000 Subject: revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits) discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners. Its also too close to release to be making these kinds of changes. commands used: # reverse merge svn merge -r36073:36072 . # for some reason this gave a lot of property changes svn revert `svn st | grep "^ M" | awk '{print $2}'` # reverse merging didn't work here, removing while dir. svn rm extern/eltopo/ # manually fixed conflict in # ./source/blenderplayer/CMakeLists.txt # # also manually removed 2 lines from # ./CMakeLists.txt --- extern/SConscript | 3 --- 1 file changed, 3 deletions(-) (limited to 'extern/SConscript') diff --git a/extern/SConscript b/extern/SConscript index 061bd1ba6a3..bd73d71f123 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -4,9 +4,6 @@ Import('env') SConscript(['glew/SConscript']) -if env['WITH_BF_ELTOPO']: - SConscript(['eltopo/SConscript']) - if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) -- cgit v1.2.3 From 088899236b0904c0a3d0fc5a92b0cb5ffd35cd17 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Sun, 1 May 2011 21:39:13 +0000 Subject: =trunk= Recommitted eltopo collision code (but disabled by default) with Genscher's permission. To use, you need to install liblapack and libblas --- extern/SConscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'extern/SConscript') diff --git a/extern/SConscript b/extern/SConscript index bd73d71f123..061bd1ba6a3 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -4,6 +4,9 @@ Import('env') SConscript(['glew/SConscript']) +if env['WITH_BF_ELTOPO']: + SConscript(['eltopo/SConscript']) + if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) -- cgit v1.2.3