[Bf-blender-cvs] [255fe8a] fracture_modifier: cleanup: removed unused code and quiet some warnings
Martin Felke
noreply at git.blender.org
Wed Oct 8 11:02:08 CEST 2014
Commit: 255fe8a9b12d2e4f4a8a7d18fee7d0c23b7a16bf
Author: Martin Felke
Date: Wed Oct 8 11:01:41 2014 +0200
Branches: fracture_modifier
https://developer.blender.org/rB255fe8a9b12d2e4f4a8a7d18fee7d0c23b7a16bf
cleanup: removed unused code and quiet some warnings
===================================================================
M source/blender/blenkernel/BKE_fracture.h
M source/blender/blenkernel/intern/fracture.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/modifiers/intern/MOD_fracture.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_fracture.h b/source/blender/blenkernel/BKE_fracture.h
index d16f365..0ffb4e6 100644
--- a/source/blender/blenkernel/BKE_fracture.h
+++ b/source/blender/blenkernel/BKE_fracture.h
@@ -48,16 +48,6 @@ struct MLoop;
typedef int ShardID;
-typedef struct ShardIterator {
- struct FracMesh* frac_mesh;
- int current;
-} ShardIterator;
-
-typedef struct FracMeshIterator {
- struct FracHistory* frac_history;
- int current_step;
-} FracMeshIterator;
-
typedef struct FracPoint {
float co[3];
} FracPoint;
@@ -67,32 +57,17 @@ typedef struct FracPointCloud {
int totpoints; /* number of positions */
} FracPointCloud;
-/* iterator functions for efficient looping over shards */
-struct ShardIterator* BKE_shards_begin(struct FracMesh *fmesh);
-struct ShardIterator* BKE_shards_next(struct ShardIterator *iter);
-bool BKE_shards_valid(struct ShardIterator* iter);
-void BKE_shards_end(struct ShardIterator* iter);
-struct Shard* BKE_shard_by_iterator(struct ShardIterator *iter);
-
/* direct access */
struct Shard* BKE_shard_by_id(struct FracMesh* mesh, ShardID id, struct DerivedMesh *dm);
/* detailed info to the particular shards */
-void BKE_get_shard_geometry(struct FracMesh* mesh, ShardID id, struct MVert** vert, int *totvert, struct DerivedMesh *dm);
void BKE_get_shard_minmax(struct FracMesh* mesh, ShardID id, float min_r[3], float max_r[3], struct DerivedMesh *dm);
/* container object handling functions */
-struct FracMesh *BKE_create_fracture_container(struct DerivedMesh* dm);
+struct FracMesh *BKE_create_fracture_container(void);
struct Shard *BKE_create_fracture_shard(struct MVert *mvert, struct MPoly *mpoly, struct MLoop *mloop, int totvert, int totpoly, int totloop, bool copy);
struct Shard *BKE_custom_data_to_shard(struct Shard* s, struct DerivedMesh* dm);
-/* iterator functions for efficient / abstract iterating over fracture history */
-struct FracMeshIterator* BKE_fracture_steps_begin(struct Object *ob);
-struct FracMeshIterator* BKE_fracture_steps_next(struct FracMeshIterator *iter);
-struct FracMeshIterator* BKE_fracture_steps_prev(struct FracMeshIterator *iter);
-bool BKE_fracture_steps_valid(struct FracMeshIterator* iter);
-void BKE_fracture_steps_end(struct FracMeshIterator* iter);
-
/* utility functions */
bool BKE_fracture_shard_center_median(struct Shard *shard, float cent[3]);
bool BKE_fracture_shard_center_centroid(struct Shard *shard, float cent[3]);
@@ -103,12 +78,9 @@ void BKE_shard_free(struct Shard* s, bool doCustomData);
/* DerivedMesh */
-void BKE_fracture_release_dm(struct FractureModifierData *fmd);
void BKE_fracture_create_dm(struct FractureModifierData *fmd, bool doCustomData);
struct DerivedMesh *BKE_shard_create_dm(struct Shard *s, bool doCustomData);
-void BKE_shard_assign_material(struct Shard* s, short mat_nr);
-
/* create shards from base mesh and a liste of points */
void BKE_fracture_shard_by_points(struct FracMesh *fmesh, ShardID id, struct FracPointCloud *points, int algorithm, struct Object *obj, struct DerivedMesh *dm,
short inner_material_index);
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 8d52637..59895f9 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -136,8 +136,8 @@ static void shard_boundbox(Shard* s, float r_loc[3], float r_size[3])
static int shard_sortsize(const void *s1, const void *s2, void* context)
{
- const Shard** sh1 = (Shard**)s1;
- const Shard** sh2 = (Shard**)s2;
+ Shard** sh1 = (Shard**)s1;
+ Shard** sh2 = (Shard**)s2;
float size1[3], size2[3], loc[3];
float val_a, val_b;
@@ -278,37 +278,6 @@ float BKE_shard_calc_minmax(Shard *shard)
return len_v3(diff);
}
-/* iterator functions for efficient looping over shards */
-ShardIterator* BKE_shards_begin(FracMesh *mesh) {
- ShardIterator *iter = MEM_mallocN(sizeof(ShardIterator), __func__);
- iter->frac_mesh = mesh;
- iter->current = 0;
-
- return iter;
-}
-
-ShardIterator* BKE_shards_next(ShardIterator *iter) {
- iter->current++;
- return iter;
-}
-
-bool BKE_shards_valid(ShardIterator* iter) {
- return iter->current < iter->frac_mesh->shard_count;
-}
-
-void BKE_shards_end(ShardIterator* iter) {
- MEM_freeN(iter);
- iter = NULL;
-}
-
-/* access shard during loop */
-Shard* BKE_shard_by_iterator(ShardIterator *iter) {
- if (BKE_shards_valid(iter)) {
- return iter->frac_mesh->shard_map[iter->current];
- }
-
- return NULL;
-}
/*access shard directly by index / id*/
Shard *BKE_shard_by_id(FracMesh* mesh, ShardID id, DerivedMesh* dm) {
@@ -329,16 +298,6 @@ Shard *BKE_shard_by_id(FracMesh* mesh, ShardID id, DerivedMesh* dm) {
return NULL;
}
-void BKE_get_shard_geometry(FracMesh* mesh, ShardID id, MVert** vert, int *totvert, DerivedMesh *dm)
-{
- /* XXX incompatible pointer types, bad! */
- Shard* shard = BKE_shard_by_id(mesh, id, dm);
- if (shard != NULL) {
- *vert = shard->mvert;
- *totvert = shard->totvert;
- }
-}
-
void BKE_get_shard_minmax(FracMesh* mesh, ShardID id, float min_r[3], float max_r[3], DerivedMesh *dm)
{
Shard* shard = BKE_shard_by_id(mesh, id, dm);
@@ -386,7 +345,7 @@ Shard *BKE_create_fracture_shard(MVert *mvert, MPoly *mpoly, MLoop *mloop, int t
return shard;
}
-FracMesh *BKE_create_fracture_container(DerivedMesh* dm)
+FracMesh *BKE_create_fracture_container(void)
{
FracMesh* fmesh;
@@ -1018,13 +977,3 @@ DerivedMesh *BKE_shard_create_dm(Shard *s, bool doCustomData)
return dm;
}
-
-void BKE_shard_assign_material(Shard* s, short mat_nr)
-{
- MPoly* mp;
- int i;
-
- for (i = 0, mp = s->mpoly; i < s->totpoly; ++i, ++mp) {
- mp->mat_nr = mat_nr;
- }
-}
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 8400772..7f93462 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -103,13 +103,6 @@
# include "BLI_winstuff.h"
#endif
-#ifdef WIN32
- #ifndef NAN
- static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
- #define NAN (*(const float *) __nan)
- #endif
-#endif
-
#define PTCACHE_DATA_FROM(data, type, from) \
if (data[type]) { \
memcpy(data[type], from, ptcache_data_size[type]); \
diff --git a/source/blender/modifiers/intern/MOD_fracture.c b/source/blender/modifiers/intern/MOD_fracture.c
index 7c10087..15900e6 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -299,7 +299,7 @@ static void growCluster(FractureModifierData *fmd, Shard* seed, int sindex, List
MEM_freeN(nearest);
}
-static void doClusters(FractureModifierData* fmd, int levels, Object *ob)
+static void doClusters(FractureModifierData* fmd, int levels)
{
/*grow clusters from all shards */
ListBase lbVisit;
@@ -565,7 +565,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
}
if (fmd->frac_mesh == NULL) {
- fmd->frac_mesh = BKE_create_fracture_container(clean_dm);
+ fmd->frac_mesh = BKE_create_fracture_container();
if (fmd->execute_threaded)
{
fmd->frac_mesh->running = 1;
@@ -640,7 +640,7 @@ static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
}
if (fmd->frac_mesh == NULL) {
- fmd->frac_mesh = BKE_create_fracture_container(clean_dm);
+ fmd->frac_mesh = BKE_create_fracture_container();
if (fmd->execute_threaded) {
fmd->frac_mesh->running = 1;
}
@@ -723,7 +723,7 @@ static void points_from_verts(Object** ob, int totobj, FracPointCloud* points, f
}
static void points_from_particles(Object** ob, int totobj, Scene* scene, FracPointCloud* points, float mat[4][4],
- float thresh, FractureModifierData* emd)
+ float thresh)
{
int o, p, pt = points->totpoints;
ParticleSystemModifierData* psmd;
@@ -774,7 +774,7 @@ static void points_from_particles(Object** ob, int totobj, Scene* scene, FracPoi
points->totpoints = pt;
}
-static void points_from_greasepencil(Object** ob, int totobj, FracPointCloud* points, float mat[4][4], float thresh, FractureModifierData* fmd)
+static void points_from_greasepencil(Object** ob, int totobj, FracPointCloud* points, float mat[4][4], float thresh)
{
bGPDlayer* gpl;
bGPDframe* gpf;
@@ -862,7 +862,7 @@ static FracPointCloud get_points_global(FractureModifierData *emd, Object *ob, D
}
if (emd->point_source & (MOD_FRACTURE_OWN_PARTICLES | MOD_FRACTURE_EXTRA_PARTICLES)) {
- points_from_particles(go, totgroup, scene, &points, ob->obmat, thresh, emd);
+ points_from_particles(go, totgroup, scene, &points, ob->obmat, thresh);
}
if (emd->point_source & (MOD_FRACTURE_OWN_VERTS | MOD_FRACTURE_EXTRA_VERTS)) {
@@ -870,7 +870,7 @@ static FracPointCloud get_points_global(FractureModifierData *emd, Object *ob, D
}
if (emd->point_source & MOD_FRACTURE_GREASEPENCIL) {
- points_from_greasepencil(go, totgroup, &points, ob->obmat, thresh, emd);
+ points_from_greasepencil(go, totgroup, &points, ob->obmat, thresh);
}
@@ -935,7 +935,7 @@ static void do_fracture(FractureModifierData *fracmd, ShardID id, Object* obj, D
{
fracmd->frac_mesh->running = 0;
fracmd->refresh = true;
- freeData(fracmd);
+ freeData((ModifierData*)fracmd);
fracmd->frac_mesh = NULL;
fracmd->refresh = false;
MEM_freeN(points.points);
@@ -944,7 +944,7 @@ static void do_fracture(FractureModifierData *fracmd, ShardID id, Object* obj, D
if (fracmd->frac_mesh->shard_count > 0)
{
- doClusters(fracmd, 1, obj);
+ doClusters(fracmd, 1);
}
/* here we REALLY need to fracture so deactivate the shards to islands flag and activate afterwards */
@@ -1076,23 +1076,8 @@ void freeMeshIsland(FractureModifierData* rmd, MeshIsland* mi, bool remove_rigid
mi = NULL;
}
-static int dm_minmax(DerivedMesh* dm, float min[3], float max[3])
-{
- int verts = dm->getNumVerts(dm);
- MVert *mverts = dm->getVertArray(dm);
- MVert *mvert;
- int i = 0;
-
- INIT_MINMAX(min, max);
- for (i = 0; i < verts; i++) {
- mvert = &mverts[i];
- minmax_v3v3_v3(min, max, mvert->co);
- }
-
- return (verts != 0);
-}
-
/* mi->bb, its for volume fraction calcu
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list