Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-06 17:38:33 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-06 17:38:33 +0400
commit3d8e58751c3801a6ad2e00ed7c35059e827059b2 (patch)
tree9eb8ec613a1dad477b9607a6371b723d0be25650 /source/blender/modifiers/intern/MOD_decimate.c
parent900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff)
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_decimate.c')
-rw-r--r--source/blender/modifiers/intern/MOD_decimate.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index e1a8e221476..b28a4a942ac 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -56,26 +56,26 @@
static void initData(ModifierData *md)
{
- DecimateModifierData *dmd = (DecimateModifierData*) md;
+ DecimateModifierData *dmd = (DecimateModifierData *) md;
dmd->percent = 1.0;
}
static void copyData(ModifierData *md, ModifierData *target)
{
- DecimateModifierData *dmd = (DecimateModifierData*) md;
- DecimateModifierData *tdmd = (DecimateModifierData*) target;
+ DecimateModifierData *dmd = (DecimateModifierData *) md;
+ DecimateModifierData *tdmd = (DecimateModifierData *) target;
tdmd->percent = dmd->percent;
}
#ifdef WITH_MOD_DECIMATE
static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
- DerivedMesh *derivedData,
- int UNUSED(useRenderParams),
- int UNUSED(isFinalCalc))
+ DerivedMesh *derivedData,
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
{
- DecimateModifierData *dmd = (DecimateModifierData*) md;
+ DecimateModifierData *dmd = (DecimateModifierData *) md;
DerivedMesh *dm = derivedData, *result = NULL;
MVert *mvert;
MFace *mface;
@@ -91,59 +91,59 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
totface = dm->getNumTessFaces(dm);
numTris = 0;
- for (a=0; a<totface; a++) {
+ for (a = 0; a < totface; a++) {
MFace *mf = &mface[a];
numTris++;
if (mf->v4) numTris++;
}
- if (numTris<3) {
+ 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;
+ 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++) {
+ 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];
+ 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++) {
+ 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;
+ 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;
+ 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) ) {
+ 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;
+ while (lod.face_num > numTris * dmd->percent) {
+ if (LOD_CollapseEdge(&lod) == 0) break;
}
- if (lod.vertex_num>2) {
+ if (lod.vertex_num > 2) {
result = CDDM_new(lod.vertex_num, 0, lod.face_num, 0, 0);
dmd->faceCount = lod.face_num;
}
@@ -151,18 +151,18 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
result = CDDM_new(lod.vertex_num, 0, 0, 0, 0);
mvert = CDDM_get_verts(result);
- for (a=0; a<lod.vertex_num; a++) {
+ for (a = 0; a < lod.vertex_num; a++) {
MVert *mv = &mvert[a];
- float *vbCo = &lod.vertex_buffer[a*3];
+ float *vbCo = &lod.vertex_buffer[a * 3];
copy_v3_v3(mv->co, vbCo);
}
- if (lod.vertex_num>2) {
+ 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];
+ int *tri = &lod.triangle_index_buffer[a * 3];
mf->v1 = tri[0];
mf->v2 = tri[1];
mf->v3 = tri[2];
@@ -195,9 +195,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
}
#else // WITH_MOD_DECIMATE
static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
- DerivedMesh *derivedData,
- int UNUSED(useRenderParams),
- int UNUSED(isFinalCalc))
+ DerivedMesh *derivedData,
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
{
return derivedData;
}