[Bf-blender-cvs] [e75530e] fracture_modifier: cleanup: automatic code styling with uncrustify_clean.sh
Martin Felke
noreply at git.blender.org
Thu Oct 9 16:50:30 CEST 2014
Commit: e75530e4354c30d70df090069b5d41e4633c07d6
Author: Martin Felke
Date: Thu Oct 9 13:52:13 2014 +0200
Branches: fracture_modifier
https://developer.blender.org/rBe75530e4354c30d70df090069b5d41e4633c07d6
cleanup: automatic code styling with uncrustify_clean.sh
===================================================================
M source/blender/blenkernel/BKE_fracture.h
M source/blender/blenkernel/intern/fracture.c
M source/blender/blenkernel/intern/fracture_util.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/makesdna/DNA_fracture_types.h
M source/blender/makesrna/intern/rna_rigidbody.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 0ffb4e6..d0c1897 100644
--- a/source/blender/blenkernel/BKE_fracture.h
+++ b/source/blender/blenkernel/BKE_fracture.h
@@ -53,28 +53,28 @@ typedef struct FracPoint {
} FracPoint;
typedef struct FracPointCloud {
- struct FracPoint *points; /* just a bunch of positions in space*/
+ struct FracPoint *points; /* just a bunch of positions in space*/
int totpoints; /* number of positions */
} FracPointCloud;
/* direct access */
-struct Shard* BKE_shard_by_id(struct FracMesh* mesh, ShardID id, struct DerivedMesh *dm);
+struct Shard *BKE_shard_by_id(struct FracMesh *mesh, ShardID id, struct DerivedMesh *dm);
/* detailed info to the particular shards */
-void BKE_get_shard_minmax(struct FracMesh* mesh, ShardID id, float min_r[3], float max_r[3], 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(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);
+struct Shard *BKE_custom_data_to_shard(struct Shard *s, struct DerivedMesh *dm);
/* 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]);
float BKE_shard_calc_minmax(struct Shard *shard);
-void BKE_fracmesh_free(struct FracMesh* fm, bool doCustomData);
-void BKE_shard_free(struct Shard* s, bool doCustomData);
+void BKE_fracmesh_free(struct FracMesh *fm, bool doCustomData);
+void BKE_shard_free(struct Shard *s, bool doCustomData);
/* DerivedMesh */
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 59895f9..5b57ef7 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -81,24 +81,24 @@ static void parse_cell_neighbors(cell c, int *neighbors, int totpoly);
static void add_shard(FracMesh *fm, Shard *s)
{
- fm->shard_map = MEM_reallocN(fm->shard_map, sizeof(Shard*) * (fm->shard_count+1));
+ fm->shard_map = MEM_reallocN(fm->shard_map, sizeof(Shard *) * (fm->shard_count + 1));
fm->shard_map[fm->shard_count] = s;
s->shard_id = fm->shard_count;
fm->shard_count++;
}
-static BMesh* shard_to_bmesh(Shard* s)
+static BMesh *shard_to_bmesh(Shard *s)
{
- DerivedMesh* dm_parent;
+ DerivedMesh *dm_parent;
BMesh *bm_parent;
BMIter iter;
- BMFace* f;
+ BMFace *f;
dm_parent = BKE_shard_create_dm(s, true);
bm_parent = DM_to_bmesh(dm_parent, true);
BM_mesh_elem_table_ensure(bm_parent, BM_FACE);
- BM_ITER_MESH(f, &iter, bm_parent, BM_FACES_OF_MESH)
+ BM_ITER_MESH (f, &iter, bm_parent, BM_FACES_OF_MESH)
{
BM_elem_flag_disable(f, BM_ELEM_SELECT);
}
@@ -110,7 +110,7 @@ static BMesh* shard_to_bmesh(Shard* s)
return bm_parent;
}
-static void shard_boundbox(Shard* s, float r_loc[3], float r_size[3])
+static void shard_boundbox(Shard *s, float r_loc[3], float r_size[3])
{
float min[3], max[3];
float mloc[3], msize[3];
@@ -134,10 +134,10 @@ 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)
+static int shard_sortsize(const void *s1, const void *s2, void *context)
{
- Shard** sh1 = (Shard**)s1;
- Shard** sh2 = (Shard**)s2;
+ Shard **sh1 = (Shard **)s1;
+ Shard **sh2 = (Shard **)s2;
float size1[3], size2[3], loc[3];
float val_a, val_b;
@@ -153,12 +153,12 @@ static int shard_sortsize(const void *s1, const void *s2, void* context)
val_b = size2[0] * size2[1] * size2[2];
/* sort descending */
- if (val_a < val_b) return 1;
+ if (val_a < val_b) return 1;
else if (val_a > val_b) return -1;
- return 0;
+ return 0;
}
-Shard* BKE_custom_data_to_shard(Shard* s, DerivedMesh* dm)
+Shard *BKE_custom_data_to_shard(Shard *s, DerivedMesh *dm)
{
CustomData_reset(&s->vertData);
CustomData_reset(&s->loopData);
@@ -171,15 +171,15 @@ Shard* BKE_custom_data_to_shard(Shard* s, DerivedMesh* dm)
/*XXX TODO how do i use customdata PROPERLY ? */
/*CustomData_copy(&dm->vertData, &s->vertData, CD_MASK_MDEFORMVERT, CD_CALLOC, s->totvert);
- CustomData_copy_data(&dm->vertData, &s->vertData,
+ CustomData_copy_data(&dm->vertData, &s->vertData,
0, 0, s->totvert);
- CustomData_copy(&dm->loopData, &s->loopData, CD_MASK_MLOOPUV, CD_CALLOC, s->totloop);
- CustomData_copy_data(&dm->loopData, &s->loopData,
+ CustomData_copy(&dm->loopData, &s->loopData, CD_MASK_MLOOPUV, CD_CALLOC, s->totloop);
+ CustomData_copy_data(&dm->loopData, &s->loopData,
0, 0, s->totloop);
- CustomData_copy(&dm->polyData, &s->polyData, CD_MASK_MTEXPOLY, CD_CALLOC, s->totpoly);
- CustomData_copy_data(&dm->polyData, &s->polyData,
+ CustomData_copy(&dm->polyData, &s->polyData, CD_MASK_MTEXPOLY, CD_CALLOC, s->totpoly);
+ CustomData_copy_data(&dm->polyData, &s->polyData,
0, 0, s->totpoly);*/
return s;
@@ -280,15 +280,15 @@ float BKE_shard_calc_minmax(Shard *shard)
/*access shard directly by index / id*/
-Shard *BKE_shard_by_id(FracMesh* mesh, ShardID id, DerivedMesh* dm) {
+Shard *BKE_shard_by_id(FracMesh *mesh, ShardID id, DerivedMesh *dm) {
if ((id < mesh->shard_count) && (id >= 0)) {
return mesh->shard_map[id];
}
else if (id == -1)
{
/* create temporary shard covering the entire mesh */
- Shard* s = BKE_create_fracture_shard(dm->getVertArray(dm), dm->getPolyArray(dm), dm->getLoopArray(dm),
- dm->numVertData, dm->numPolyData, dm->numLoopData, true);
+ Shard *s = BKE_create_fracture_shard(dm->getVertArray(dm), dm->getPolyArray(dm), dm->getLoopArray(dm),
+ dm->numVertData, dm->numPolyData, dm->numLoopData, true);
s = BKE_custom_data_to_shard(s, dm);
s->flag = SHARD_INTACT;
s->shard_id = -2;
@@ -298,9 +298,9 @@ Shard *BKE_shard_by_id(FracMesh* mesh, ShardID id, DerivedMesh* dm) {
return NULL;
}
-void BKE_get_shard_minmax(FracMesh* mesh, ShardID id, float min_r[3], float max_r[3], DerivedMesh *dm)
+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);
+ Shard *shard = BKE_shard_by_id(mesh, id, dm);
if (shard != NULL) {
copy_v3_v3(min_r, shard->min);
copy_v3_v3(max_r, shard->max);
@@ -314,7 +314,7 @@ void BKE_get_shard_minmax(FracMesh* mesh, ShardID id, float min_r[3], float max_
Shard *BKE_create_fracture_shard(MVert *mvert, MPoly *mpoly, MLoop *mloop, int totvert, int totpoly, int totloop, bool copy)
{
- Shard* shard = MEM_mallocN(sizeof(Shard), __func__);
+ Shard *shard = MEM_mallocN(sizeof(Shard), __func__);
shard->totvert = totvert;
shard->totpoly = totpoly;
shard->totloop = totloop;
@@ -347,11 +347,11 @@ Shard *BKE_create_fracture_shard(MVert *mvert, MPoly *mpoly, MLoop *mloop, int t
FracMesh *BKE_create_fracture_container(void)
{
- FracMesh* fmesh;
+ FracMesh *fmesh;
fmesh = MEM_mallocN(sizeof(FracMesh), __func__);
- fmesh->shard_map = MEM_mallocN(sizeof(Shard*), __func__); /* allocate in chunks ?, better use proper blender functions for this*/
+ fmesh->shard_map = MEM_mallocN(sizeof(Shard *), __func__); /* allocate in chunks ?, better use proper blender functions for this*/
fmesh->shard_count = 0;
fmesh->cancel = 0;
fmesh->running = 0;
@@ -362,27 +362,27 @@ FracMesh *BKE_create_fracture_container(void)
/* parse the voro++ cell data */
-static void parse_cells(cell* cells, int expected_shards, ShardID parent_id, FracMesh *fm, int algorithm, Object* obj, DerivedMesh *dm, short inner_material_index)
+static void parse_cells(cell *cells, int expected_shards, ShardID parent_id, FracMesh *fm, int algorithm, Object *obj, DerivedMesh *dm, short inner_material_index)
{
/*Parse voronoi raw data*/
int i = 0;
- Shard* s = NULL, *p = BKE_shard_by_id(fm, parent_id, dm);
+ Shard *s = NULL, *p = BKE_shard_by_id(fm, parent_id, dm);
float obmat[4][4]; /* use unit matrix for now */
float centroid[3];
- BMesh* bm_parent = NULL;
+ BMesh *bm_parent = NULL;
DerivedMesh *dm_parent = NULL;
Shard **tempshards;
Shard **tempresults;
- tempshards = MEM_mallocN(sizeof(Shard*) * expected_shards, "tempshards");
- tempresults = MEM_mallocN(sizeof(Shard*) * expected_shards, "tempresults");
+ tempshards = MEM_mallocN(sizeof(Shard *) * expected_shards, "tempshards");
+ tempresults = MEM_mallocN(sizeof(Shard *) * expected_shards, "tempresults");
p->flag = 0;
p->flag |= SHARD_FRACTURED;
unit_m4(obmat);
if (algorithm == MOD_FRACTURE_BOOLEAN) {
- MPoly* mpoly, *mp;
+ MPoly *mpoly, *mp;
int totpoly, i;
dm_parent = BKE_shard_create_dm(p, true);
mpoly = dm_parent->getPolyArray(dm_parent);
@@ -392,7 +392,7 @@ static void parse_cells(cell* cells, int expected_shards, ShardID parent_id, Fra
}
}
else if (algorithm == MOD_FRACTURE_BISECT || algorithm == MOD_FRACTURE_BISECT_FILL ||
- algorithm == MOD_FRACTURE_BISECT_FAST || algorithm == MOD_FRACTURE_BISECT_FAST_FILL)
+ algorithm == MOD_FRACTURE_BISECT_FAST || algorithm == MOD_FRACTURE_BISECT_FAST_FILL)
{
#define MYTAG (1 << 6)
bm_parent = shard_to_bmesh(p);
@@ -413,7 +413,7 @@ static void parse_cells(cell* cells, int expected_shards, ShardID parent_id, Fra
if (algorithm != MOD_FRACTURE_BISECT_FAST && algorithm != MOD_FRACTURE_BISECT_FAST_FILL) {
for (i = 0; i < expected_shards; i++) {
- Shard* t;
+ Shard *t;
if (fm->cancel == 1)
break;
@@ -456,9 +456,9 @@ static void parse_cells(cell* cells, int expected_shards, ShardID parent_id, Fra
}
else {
for (i = 0; i < expected_shards; i++) {
- Shard* s = NULL;
- Shard* s2 = NULL;
- Shard* t;
+ Shard *s = NULL;
+ Shard *s2 = NULL;
+ Shard *t;
int index = 0;
if (fm->cancel == 1) {
@@ -4
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list