diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-22 06:39:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-22 06:39:26 +0400 |
commit | 226a5ee83446f91cfeccc73912de85e89fe2169f (patch) | |
tree | c06afdbfae2a0f1f8b0ede3a43c912a0ef4a0c6e /source | |
parent | 91ceb8f552c4619d57b47957da0fbfd7628ac200 (diff) |
remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
-rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/modifiers/SConscript | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 152 | ||||
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_BucketManager.cpp | 1 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_BucketManager.h | 1 |
10 files changed, 3 insertions, 177 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index d4e7f09b5f1..c5dc7da8edf 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -356,12 +356,6 @@ if(WITH_MOD_OCEANSIM) add_definitions(-DWITH_OCEANSIM) endif() -if(WITH_MOD_DECIMATE) - list(APPEND INC - ../../../intern/decimation/extern - ) -endif() - if(WITH_MOD_BOOLEAN) list(APPEND INC ../../../intern/bsp/extern diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index d1a35b122e8..f7b8f59fa57 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -10,7 +10,7 @@ sources_mask = env.Glob('intern/mask*.c') incs = '. #/intern/guardedalloc #/intern/memutil' incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' -incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' +incs += ' ../render/extern/include ../makesrna' incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' incs += ' #/intern/iksolver/extern ../blenloader' incs += ' #/extern/bullet2/src' diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 83e7ea81ca5..2d07dda7895 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -117,13 +117,6 @@ if(WITH_MOD_REMESH) ) endif() -if(WITH_MOD_DECIMATE) - add_definitions(-DWITH_MOD_DECIMATE) - list(APPEND INC - ../../../intern/decimation/extern - ) -endif() - if(WITH_MOD_FLUID) add_definitions(-DWITH_MOD_FLUID) endif() diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 2b506cce2cf..9059ae210e3 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('intern/*.c') incs = '. ./intern' -incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include' +incs += ' #/intern/guardedalloc #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include' incs += ' ../render/extern/include ../blenloader ../bmesh' incs += ' ../include ../blenlib ../blenfont ../makesdna ../makesrna ../blenkernel ../blenkernel/intern' incs += ' ../gpu' @@ -20,9 +20,6 @@ if env['WITH_BF_REMESH']: incs += ' #/intern/dualcon' defs.append('WITH_MOD_REMESH') -if env ['WITH_BF_DECIMATE']: - defs.append('WITH_MOD_DECIMATE') - if env['WITH_BF_FLUID']: defs.append('WITH_MOD_FLUID') diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 54c31148405..7bcf56a1bfc 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -32,7 +32,6 @@ * \ingroup modifiers */ - #include "DNA_meshdata_types.h" #include "BLI_math.h" @@ -48,19 +47,12 @@ #include "BKE_cdderivedmesh.h" #include "BKE_tessmesh.h" +#include "bmesh.h" -// #define USE_TIMEIT - -/* testing only! - Campbell */ -#define USE_DECIMATE_BMESH #ifdef USE_TIMEIT # include "PIL_time.h" #endif -#ifdef WITH_MOD_DECIMATE -#include "LOD_decimation.h" -#endif - #include "MOD_util.h" static void initData(ModifierData *md) @@ -78,11 +70,6 @@ static void copyData(ModifierData *md, ModifierData *target) tdmd->percent = dmd->percent; } -#ifdef WITH_MOD_DECIMATE -#ifdef USE_DECIMATE_BMESH - -#include "bmesh.h" - static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), DerivedMesh *derivedData, ModifierApplyFlag UNUSED(flag)) @@ -123,143 +110,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), return result; } -#else -static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), - DerivedMesh *derivedData, - ModifierApplyFlag UNUSED(flag)) -{ - DecimateModifierData *dmd = (DecimateModifierData *) md; - DerivedMesh *dm = derivedData, *result = NULL; - MVert *mvert; - MFace *mface; - LOD_Decimation_Info lod; - int totvert, totface; - int a, numTris; - - // TIMEIT_START(decim); - - DM_ensure_tessface(dm); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */ - - mvert = dm->getVertArray(dm); - mface = dm->getTessFaceArray(dm); - totvert = dm->getNumVerts(dm); - totface = dm->getNumTessFaces(dm); - - numTris = 0; - for (a = 0; a < totface; a++) { - MFace *mf = &mface[a]; - numTris++; - if (mf->v4) numTris++; - } - - if (numTris < 3) { - modifier_setError(md, "%s", TIP_("Modifier requires more than 3 input faces (triangles)")); - dm = CDDM_copy(dm); - return dm; - } - - lod.vertex_buffer = MEM_mallocN(3 * sizeof(float) * totvert, "vertices"); - lod.vertex_normal_buffer = MEM_mallocN(3 * sizeof(float) * totvert, "normals"); - lod.triangle_index_buffer = MEM_mallocN(3 * sizeof(int) * numTris, "trias"); - lod.vertex_num = totvert; - lod.face_num = numTris; - - for (a = 0; a < totvert; a++) { - MVert *mv = &mvert[a]; - float *vbCo = &lod.vertex_buffer[a * 3]; - float *vbNo = &lod.vertex_normal_buffer[a * 3]; - - copy_v3_v3(vbCo, mv->co); - normal_short_to_float_v3(vbNo, mv->no); - } - - numTris = 0; - for (a = 0; a < totface; a++) { - MFace *mf = &mface[a]; - int *tri = &lod.triangle_index_buffer[3 * numTris++]; - tri[0] = mf->v1; - tri[1] = mf->v2; - tri[2] = mf->v3; - - if (mf->v4) { - tri = &lod.triangle_index_buffer[3 * numTris++]; - tri[0] = mf->v1; - tri[1] = mf->v3; - tri[2] = mf->v4; - } - } - - dmd->faceCount = 0; - if (LOD_LoadMesh(&lod) ) { - if (LOD_PreprocessMesh(&lod) ) { - /* we assume the decim_faces tells how much to reduce */ - - while (lod.face_num > numTris * dmd->percent) { - if (LOD_CollapseEdge(&lod) == 0) break; - } - - if (lod.vertex_num > 2) { - result = CDDM_new(lod.vertex_num, 0, lod.face_num, 0, 0); - dmd->faceCount = lod.face_num; - } - else - result = CDDM_new(lod.vertex_num, 0, 0, 0, 0); - - mvert = CDDM_get_verts(result); - for (a = 0; a < lod.vertex_num; a++) { - MVert *mv = &mvert[a]; - float *vbCo = &lod.vertex_buffer[a * 3]; - - copy_v3_v3(mv->co, vbCo); - } - - if (lod.vertex_num > 2) { - mface = CDDM_get_tessfaces(result); - for (a = 0; a < lod.face_num; a++) { - MFace *mf = &mface[a]; - int *tri = &lod.triangle_index_buffer[a * 3]; - mf->v1 = tri[0]; - mf->v2 = tri[1]; - mf->v3 = tri[2]; - test_index_face(mf, NULL, 0, 3); - } - } - - CDDM_calc_edges_tessface(result); - } - else - modifier_setError(md, "%s", TIP_("Out of memory")); - - LOD_FreeDecimationData(&lod); - } - else - modifier_setError(md, "%s", TIP_("Non-manifold mesh as input")); - - MEM_freeN(lod.vertex_buffer); - MEM_freeN(lod.vertex_normal_buffer); - MEM_freeN(lod.triangle_index_buffer); - - // TIMEIT_END(decim); - - if (result) { - CDDM_tessfaces_to_faces(result); /*builds ngon faces from tess (mface) faces*/ - - return result; - } - else { - return dm; - } -} -#endif // USE_DECIMATE_BMESH -#else // WITH_MOD_DECIMATE -static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob), - DerivedMesh *derivedData, - ModifierApplyFlag UNUSED(flag)) -{ - return derivedData; -} -#endif // WITH_MOD_DECIMATE - ModifierTypeInfo modifierType_Decimate = { /* name */ "Decimate", /* structName */ "DecimateModifierData", diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 04d4be05034..6eccd2ade63 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -169,10 +169,6 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_colamd) - if(WITH_MOD_DECIMATE) - list(APPEND BLENDER_SORTED_LIBS bf_intern_decimate) - endif() - if(WITH_MOD_BOOLEAN) list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 909f5dc1158..4731b868816 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -60,7 +60,6 @@ struct Image; struct ImageUser; struct KeyingSet; struct KeyingSetInfo; -struct LOD_Decimation_Info; struct MCol; struct MTex; struct Main; diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1880957ff8b..1d5f762d706 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -898,7 +898,6 @@ endif() bf_imbuf_dds bf_collada bf_intern_bsp - bf_intern_decimate bf_intern_elbeem bf_intern_memutil bf_intern_guardedalloc diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp index b251fd6314c..f24e3397801 100644 --- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp +++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp @@ -34,7 +34,6 @@ # pragma warning (disable:4786) #endif -#include "CTR_Map.h" #include "RAS_MaterialBucket.h" #include "STR_HashedString.h" #include "RAS_MeshObject.h" diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h index c85a9f65d27..78125a7bbb3 100644 --- a/source/gameengine/Rasterizer/RAS_BucketManager.h +++ b/source/gameengine/Rasterizer/RAS_BucketManager.h @@ -34,7 +34,6 @@ #include "MT_Transform.h" #include "RAS_MaterialBucket.h" -#include "CTR_Map.h" #include <vector> |