diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/modifiers/intern/MOD_remesh.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/modifiers/intern/MOD_remesh.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 263 |
1 files changed, 128 insertions, 135 deletions
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 345ee6477ac..daf9a615f3f 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -48,188 +48,181 @@ static void initData(ModifierData *md) { - RemeshModifierData *rmd = (RemeshModifierData *) md; - - rmd->scale = 0.9; - rmd->depth = 4; - rmd->hermite_num = 1; - rmd->flag = MOD_REMESH_FLOOD_FILL; - rmd->mode = MOD_REMESH_SHARP_FEATURES; - rmd->threshold = 1; + RemeshModifierData *rmd = (RemeshModifierData *)md; + + rmd->scale = 0.9; + rmd->depth = 4; + rmd->hermite_num = 1; + rmd->flag = MOD_REMESH_FLOOD_FILL; + rmd->mode = MOD_REMESH_SHARP_FEATURES; + rmd->threshold = 1; } #ifdef WITH_MOD_REMESH static void init_dualcon_mesh(DualConInput *input, Mesh *mesh) { - memset(input, 0, sizeof(DualConInput)); + memset(input, 0, sizeof(DualConInput)); - input->co = (void *)mesh->mvert; - input->co_stride = sizeof(MVert); - input->totco = mesh->totvert; + input->co = (void *)mesh->mvert; + input->co_stride = sizeof(MVert); + input->totco = mesh->totvert; - input->mloop = (void *)mesh->mloop; - input->loop_stride = sizeof(MLoop); + input->mloop = (void *)mesh->mloop; + input->loop_stride = sizeof(MLoop); - BKE_mesh_runtime_looptri_ensure(mesh); - input->looptri = (void *)mesh->runtime.looptris.array; - input->tri_stride = sizeof(MLoopTri); - input->tottri = mesh->runtime.looptris.len; + BKE_mesh_runtime_looptri_ensure(mesh); + input->looptri = (void *)mesh->runtime.looptris.array; + input->tri_stride = sizeof(MLoopTri); + input->tottri = mesh->runtime.looptris.len; - INIT_MINMAX(input->min, input->max); - BKE_mesh_minmax(mesh, input->min, input->max); + INIT_MINMAX(input->min, input->max); + BKE_mesh_minmax(mesh, input->min, input->max); } /* simple structure to hold the output: a CDDM and two counters to * keep track of the current elements */ typedef struct { - Mesh *mesh; - int curvert, curface; + Mesh *mesh; + int curvert, curface; } DualConOutput; /* allocate and initialize a DualConOutput */ static void *dualcon_alloc_output(int totvert, int totquad) { - DualConOutput *output; + DualConOutput *output; - if (!(output = MEM_callocN(sizeof(DualConOutput), - "DualConOutput"))) - { - return NULL; - } + if (!(output = MEM_callocN(sizeof(DualConOutput), "DualConOutput"))) { + return NULL; + } - output->mesh = BKE_mesh_new_nomain(totvert, 0, 0, 4 * totquad, totquad); - return output; + output->mesh = BKE_mesh_new_nomain(totvert, 0, 0, 4 * totquad, totquad); + return output; } static void dualcon_add_vert(void *output_v, const float co[3]) { - DualConOutput *output = output_v; - Mesh *mesh = output->mesh; + DualConOutput *output = output_v; + Mesh *mesh = output->mesh; - assert(output->curvert < mesh->totvert); + assert(output->curvert < mesh->totvert); - copy_v3_v3(mesh->mvert[output->curvert].co, co); - output->curvert++; + copy_v3_v3(mesh->mvert[output->curvert].co, co); + output->curvert++; } static void dualcon_add_quad(void *output_v, const int vert_indices[4]) { - DualConOutput *output = output_v; - Mesh *mesh = output->mesh; - MLoop *mloop; - MPoly *cur_poly; - int i; + DualConOutput *output = output_v; + Mesh *mesh = output->mesh; + MLoop *mloop; + MPoly *cur_poly; + int i; - assert(output->curface < mesh->totpoly); + assert(output->curface < mesh->totpoly); - mloop = mesh->mloop; - cur_poly = &mesh->mpoly[output->curface]; + mloop = mesh->mloop; + cur_poly = &mesh->mpoly[output->curface]; - cur_poly->loopstart = output->curface * 4; - cur_poly->totloop = 4; - for (i = 0; i < 4; i++) - mloop[output->curface * 4 + i].v = vert_indices[i]; + cur_poly->loopstart = output->curface * 4; + cur_poly->totloop = 4; + for (i = 0; i < 4; i++) + mloop[output->curface * 4 + i].v = vert_indices[i]; - output->curface++; + output->curface++; } -static Mesh *applyModifier( - ModifierData *md, - const ModifierEvalContext *UNUSED(ctx), - Mesh *mesh) +static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), Mesh *mesh) { - RemeshModifierData *rmd; - DualConOutput *output; - DualConInput input; - Mesh *result; - DualConFlags flags = 0; - DualConMode mode = 0; - - rmd = (RemeshModifierData *)md; - - init_dualcon_mesh(&input, mesh); - - if (rmd->flag & MOD_REMESH_FLOOD_FILL) - flags |= DUALCON_FLOOD_FILL; - - switch (rmd->mode) { - case MOD_REMESH_CENTROID: - mode = DUALCON_CENTROID; - break; - case MOD_REMESH_MASS_POINT: - mode = DUALCON_MASS_POINT; - break; - case MOD_REMESH_SHARP_FEATURES: - mode = DUALCON_SHARP_FEATURES; - break; - } - - output = dualcon(&input, - dualcon_alloc_output, - dualcon_add_vert, - dualcon_add_quad, - flags, - mode, - rmd->threshold, - rmd->hermite_num, - rmd->scale, - rmd->depth); - result = output->mesh; - MEM_freeN(output); - - if (rmd->flag & MOD_REMESH_SMOOTH_SHADING) { - MPoly *mpoly = result->mpoly; - int i, totpoly = result->totpoly; - - /* Apply smooth shading to output faces */ - for (i = 0; i < totpoly; i++) { - mpoly[i].flag |= ME_SMOOTH; - } - } - - BKE_mesh_calc_edges(result, true, false); - result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; - return result; + RemeshModifierData *rmd; + DualConOutput *output; + DualConInput input; + Mesh *result; + DualConFlags flags = 0; + DualConMode mode = 0; + + rmd = (RemeshModifierData *)md; + + init_dualcon_mesh(&input, mesh); + + if (rmd->flag & MOD_REMESH_FLOOD_FILL) + flags |= DUALCON_FLOOD_FILL; + + switch (rmd->mode) { + case MOD_REMESH_CENTROID: + mode = DUALCON_CENTROID; + break; + case MOD_REMESH_MASS_POINT: + mode = DUALCON_MASS_POINT; + break; + case MOD_REMESH_SHARP_FEATURES: + mode = DUALCON_SHARP_FEATURES; + break; + } + + output = dualcon(&input, + dualcon_alloc_output, + dualcon_add_vert, + dualcon_add_quad, + flags, + mode, + rmd->threshold, + rmd->hermite_num, + rmd->scale, + rmd->depth); + result = output->mesh; + MEM_freeN(output); + + if (rmd->flag & MOD_REMESH_SMOOTH_SHADING) { + MPoly *mpoly = result->mpoly; + int i, totpoly = result->totpoly; + + /* Apply smooth shading to output faces */ + for (i = 0; i < totpoly; i++) { + mpoly[i].flag |= ME_SMOOTH; + } + } + + BKE_mesh_calc_edges(result, true, false); + result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; + return result; } #else /* !WITH_MOD_REMESH */ -static Mesh *applyModifier( - ModifierData *UNUSED(md), - const ModifierEvalContext *UNUSED(ctx), - Mesh *mesh) +static Mesh *applyModifier(ModifierData *UNUSED(md), + const ModifierEvalContext *UNUSED(ctx), + Mesh *mesh) { - return mesh; + return mesh; } #endif /* !WITH_MOD_REMESH */ ModifierTypeInfo modifierType_Remesh = { - /* name */ "Remesh", - /* structName */ "RemeshModifierData", - /* structSize */ sizeof(RemeshModifierData), - /* type */ eModifierTypeType_Nonconstructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | - eModifierTypeFlag_AcceptsCVs | - eModifierTypeFlag_SupportsEditmode, - - /* copyData */ modifier_copyData_generic, - - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* applyModifier */ applyModifier, - - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachObjectLink */ NULL, - /* foreachIDLink */ NULL, - /* freeRuntimeData */ NULL, + /* name */ "Remesh", + /* structName */ "RemeshModifierData", + /* structSize */ sizeof(RemeshModifierData), + /* type */ eModifierTypeType_Nonconstructive, + /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + eModifierTypeFlag_SupportsEditmode, + + /* copyData */ modifier_copyData_generic, + + /* deformVerts */ NULL, + /* deformMatrices */ NULL, + /* deformVertsEM */ NULL, + /* deformMatricesEM */ NULL, + /* applyModifier */ applyModifier, + + /* initData */ initData, + /* requiredDataMask */ NULL, + /* freeData */ NULL, + /* isDisabled */ NULL, + /* updateDepsgraph */ NULL, + /* dependsOnTime */ NULL, + /* dependsOnNormals */ NULL, + /* foreachObjectLink */ NULL, + /* foreachIDLink */ NULL, + /* freeRuntimeData */ NULL, }; |