[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36423] trunk/blender: build system changes to eltopo, re-applied.
Campbell Barton
ideasman42 at gmail.com
Mon May 2 05:44:03 CEST 2011
Revision: 36423
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36423
Author: campbellbarton
Date: 2011-05-02 03:44:02 +0000 (Mon, 02 May 2011)
Log Message:
-----------
build system changes to eltopo, re-applied.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/extern/CMakeLists.txt
trunk/blender/extern/eltopo/CMakeLists.txt
trunk/blender/source/blender/blenkernel/BKE_collision.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/CMakeLists.txt 2011-05-02 03:44:02 UTC (rev 36423)
@@ -114,7 +114,6 @@
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
-option(WITH_ELTOPO "Enable Eltopo Continuous Collision Engine" OFF)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
# (unix defaults to OpenMP On)
Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/extern/CMakeLists.txt 2011-05-02 03:44:02 UTC (rev 36423)
@@ -31,7 +31,7 @@
add_subdirectory(bullet2)
endif()
-if(WITH_ELTOPO)
+if(WITH_MOD_CLOTH_ELTOPO)
add_subdirectory(eltopo)
endif()
Modified: trunk/blender/extern/eltopo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/eltopo/CMakeLists.txt 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/extern/eltopo/CMakeLists.txt 2011-05-02 03:44:02 UTC (rev 36423)
@@ -24,19 +24,102 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC . common common/newsparse eltopo3d common/tunicate common/meshes)
-
-FILE(GLOB SRC
- common/*.cpp
- common/newsparse/*.cpp
- common/tunicate/*.cpp
- common/sparse/*.cpp
- eltopo3d/*.cpp
- ./*.cpp
+set(INC
+ .
+ common
+ common/newsparse
+ common/tunicate
+ common/meshes
+ eltopo3d
)
-ADD_DEFINITIONS(-DNOGUI)
-ADD_DEFINITIONS(-DUSE_FORTRAN_BLAS)
+set(SRC
+ eltopo-capi.cpp
+ common/bfstream.cpp
+ common/ccd_wrapper.cpp
+ common/clamped_spline.cpp
+ common/collisionqueries.cpp
+ common/cubic_ccd_wrapper.cpp
+ common/fe_ccd_wrapper.cpp
+ common/fileio.cpp
+ common/gluvi.cpp
+ common/levelset.cpp
+ common/makelevelset2.cpp
+ common/makelevelset3.cpp
+ common/marching_triangles.cpp
+ common/newsparse/dense_matrix.cpp
+ common/newsparse/krylov_solvers.cpp
+ common/newsparse/sparse_matrix.cpp
+ common/predicates.cpp
+ common/sos_ccd_wrapper.cpp
+ common/sparse/incomplete_qr.cpp
+ common/tunicate/expansion.cpp
+ common/tunicate/intersection.cpp
+ common/tunicate/neg.cpp
+ common/tunicate/orientation.cpp
+ common/tunicate/sos_intersection.cpp
+ common/tunicate/sos_orientation.cpp
+ common/wallclocktime.cpp
+ eltopo3d/accelerationgrid.cpp
+ eltopo3d/broadphasegrid.cpp
+ eltopo3d/dynamicsurface.cpp
+ eltopo3d/eltopo.cpp
+ eltopo3d/nondestructivetrimesh.cpp
+ eltopo3d/subdivisionscheme.cpp
+ eltopo3d/surftrack.cpp
+ eltopo-capi.h
+ common/array1.h
+ common/array2.h
+ common/array3.h
+ common/array3_utils.h
+ common/bfstream.h
+ common/blas_wrapper.h
+ common/ccd_wrapper.h
+ common/clamped_spline.h
+ common/collisionqueries.h
+ common/fileio.h
+ common/gluvi.h
+ common/grid3.h
+ common/hashtable.h
+ common/lapack_wrapper.h
+ common/levelset.h
+ common/makelevelset2.h
+ common/makelevelset3.h
+ common/marching_triangles.h
+ common/mat.h
+ common/matlapack.h
+ common/newsparse/dense_matrix.h
+ common/newsparse/krylov_solvers.h
+ common/newsparse/linear_operator.h
+ common/newsparse/sparse_matrix.h
+ common/openglutils.h
+ common/predicates.h
+ common/sparse/cgsolver.h
+ common/sparse/crsolver.h
+ common/sparse/incomplete_qr.h
+ common/sparse/sparseilu.h
+ common/sparse/sparsematrix.h
+ common/sparse/sparsemilu.h
+ common/tunicate/expansion.h
+ common/tunicate/neg.h
+ common/tunicate/tunicate.h
+ common/util.h
+ common/vec.h
+ common/vector_math.h
+ common/wallclocktime.h
+ eltopo3d/accelerationgrid.h
+ eltopo3d/broadphase.h
+ eltopo3d/broadphasegrid.h
+ eltopo3d/dynamicsurface.h
+ eltopo3d/eltopo.h
+ eltopo3d/nondestructivetrimesh.h
+ eltopo3d/options.h
+ eltopo3d/subdivisionscheme.h
+ eltopo3d/surftrack.h
+ )
+
+add_definitions(-DNOGUI)
+add_definitions(-DUSE_FORTRAN_BLAS)
+
blender_add_lib(extern_eltopo "${SRC}" "${INC}")
-
Modified: trunk/blender/source/blender/blenkernel/BKE_collision.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_collision.h 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/source/blender/blenkernel/BKE_collision.h 2011-05-02 03:44:02 UTC (rev 36423)
@@ -64,7 +64,7 @@
typedef enum
{
COLLISION_IN_FUTURE = (1 << 1),
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
COLLISION_USE_COLLFACE = (1 << 2),
COLLISION_IS_EDGES = (1 << 3),
#endif
@@ -85,7 +85,7 @@
float pa[3], pb[3]; // collision point p1 on face1, p2 on face2
int flag;
float time; // collision time, from 0 up to 1
-#ifdef USE_ELTOPO /*either ap* or bp* can be set, but not both*/
+#ifdef WITH_ELTOPO /*either ap* or bp* can be set, but not both*/
float bary[3];
int ap1, ap2, ap3, collp, bp1, bp2, bp3;
int collface;
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-02 03:44:02 UTC (rev 36423)
@@ -240,9 +240,9 @@
add_definitions(-DUSE_BULLET)
endif()
-if(WITH_ELTOPO)
+if(WITH_MOD_CLOTH_ELTOPO)
list(APPEND INC ../../../extern/eltopo)
- add_definitions(-DUSE_ELTOPO)
+ add_definitions(-DWITH_ELTOPO)
endif()
if(WITH_IMAGE_OPENEXR)
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/source/blender/blenkernel/SConscript 2011-05-02 03:44:02 UTC (rev 36423)
@@ -29,7 +29,7 @@
if env['WITH_BF_ELTOPO']:
incs += ' ../../../extern/eltopo'
- defs.append('USE_ELTOPO')
+ defs.append('WITH_ELTOPO')
if env['WITH_BF_QUICKTIME']:
incs += ' ../quicktime'
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2011-05-02 03:44:02 UTC (rev 36423)
@@ -66,7 +66,7 @@
#include "BLI_kdopbvh.h"
#include "BKE_collision.h"
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
#include "eltopo-capi.h"
#endif
@@ -493,7 +493,7 @@
VECADDMUL ( to, v3, w3 );
}
-#ifndef USE_ELTOPO
+#ifndef WITH_ELTOPO
static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
{
int result = 0;
@@ -608,9 +608,9 @@
}
return result;
}
-#endif
+#endif /* !WITH_ELTOPO */
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
typedef struct edgepairkey {
int a1, a2, b1, b2;
} edgepairkey;
@@ -1392,7 +1392,7 @@
}
}
-#else
+#else /* !WITH_ELTOPO */
//Determines collisions on overlap, collisions are written to collpair[i] and collision+number_collision_found is returned
static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2,
@@ -1557,7 +1557,7 @@
}
return collpair;
}
-#endif
+#endif /* WITH_ELTOPO */
#if 0
@@ -2269,7 +2269,7 @@
CollPair **collisions, CollPair **collisions_index, int numresult, BVHTreeOverlap *overlap, double dt)
{
int i;
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
GHash *visithash = BLI_ghash_new(edgepair_hash, edgepair_cmp, "visthash, collision.c");
GHash *tri_visithash = BLI_ghash_new(tripair_hash, tripair_cmp, "tri_visthash, collision.c");
MemArena *arena = BLI_memarena_new(1<<16, "edge hash arena, collision.c");
@@ -2278,7 +2278,7 @@
*collisions = ( CollPair* ) MEM_mallocN ( sizeof ( CollPair ) * numresult * 64, "collision array" ); //*4 since cloth_collision_static can return more than 1 collision
*collisions_index = *collisions;
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
machine_epsilon_offset(clmd->clothObject);
for ( i = 0; i < numresult; i++ )
@@ -2295,13 +2295,13 @@
BLI_ghash_free(visithash, NULL, NULL);
BLI_ghash_free(tri_visithash, NULL, NULL);
BLI_memarena_free(arena);
-#else
+#else /* WITH_ELTOPO */
for ( i = 0; i < numresult; i++ )
{
*collisions_index = cloth_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd,
overlap+i, *collisions_index, dt );
}
-#endif
+#endif /* WITH_ELTOPO */
}
@@ -2327,13 +2327,13 @@
if ( collmd->bvhtree )
{
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
result += cloth_collision_response_moving(clmd, collmd, collisions, collisions_index);
result += cloth_edge_collision_response_moving(clmd, collmd, collisions, collisions_index);
#else
result += cloth_collision_response_static ( clmd, collmd, collisions, collisions_index );
#endif
-#ifdef USE_ELTOPO
+#ifdef WITH_ELTOPO
{
#else
// apply impulses in parallel
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2011-05-02 03:44:02 UTC (rev 36423)
@@ -1753,7 +1753,7 @@
(edge distance constraints) in a lagrangian solver. then add forces to help
guide the implicit solver to that state. this function is called after
collisions*/
-int cloth_calc_helper_forces(Object *ob, ClothModifierData * clmd, float (*initial_cos)[3], float step, float dt)
+int cloth_calc_helper_forces(Object *UNUSED(ob), ClothModifierData * clmd, float (*initial_cos)[3], float UNUSED(step), float dt)
{
Cloth *cloth= clmd->clothObject;
float (*cos)[3] = MEM_callocN(sizeof(float)*3*cloth->numverts, "cos cloth_calc_helper_forces");
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-05-02 03:11:39 UTC (rev 36422)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-05-02 03:44:02 UTC (rev 36423)
@@ -816,7 +816,7 @@
bf_intern_mikktspace
)
- if(WITH_ELTOPO)
+ if(WITH_MOD_CLOTH_ELTOPO)
list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
endif()
More information about the Bf-blender-cvs
mailing list