diff options
author | Yiming Wu <xp8110@outlook.com> | 2019-01-05 12:29:09 +0300 |
---|---|---|
committer | Yiming Wu <xp8110@outlook.com> | 2019-01-05 12:29:09 +0300 |
commit | 0ed55524f150003a0121c4e7e5f5c26c52184e00 (patch) | |
tree | e4f7cd5a7eea16b7f54dbc861831914ad00e03d3 /source/blender/modifiers | |
parent | 8d78a25ef493fcd7653e9c9dc57468edd666040c (diff) | |
parent | a77b63c56943ebd0046f738e6abbea4c85dc65b6 (diff) |
Merge remote-tracking branch 'origin/master' into soc-2018-npr
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 267 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_build.c | 3 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_curve.c | 1 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 25 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 4 |
7 files changed, 35 insertions, 271 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index ee2b08fe824..e63b5407a74 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -66,12 +66,11 @@ static void initData(ModifierData *md) bmd->lim_flags = 0; bmd->e_flags = 0; bmd->edge_flags = 0; + bmd->face_str_mode = MOD_BEVEL_FACE_STRENGTH_NONE; bmd->mat = -1; bmd->profile = 0.5f; bmd->bevel_angle = DEG2RADF(30.0f); bmd->defgrp_name[0] = '\0'; - bmd->hnmode = MOD_BEVEL_HN_NONE; - bmd->hn_strength = 0.5f; bmd->clnordata.faceHash = NULL; } @@ -95,254 +94,6 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static void bevel_set_weighted_normal_face_strength(BMesh *bm, Scene *scene) -{ - BMFace *f; - BMIter fiter; - const char *wn_layer_id = MOD_WEIGHTEDNORMALS_FACEWEIGHT_CDLAYER_ID; - int cd_prop_int_idx = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT, wn_layer_id); - - if (cd_prop_int_idx == -1) { - BM_data_layer_add_named(bm, &bm->pdata, CD_PROP_INT, wn_layer_id); - cd_prop_int_idx = CustomData_get_named_layer_index(&bm->pdata, CD_PROP_INT, wn_layer_id); - } - cd_prop_int_idx -= CustomData_get_layer_index(&bm->pdata, CD_PROP_INT); - const int cd_prop_int_offset = CustomData_get_n_offset(&bm->pdata, CD_PROP_INT, cd_prop_int_idx); - - const int face_strength = scene->toolsettings->face_strength; - - BM_ITER_MESH(f, &fiter, bm, BM_FACES_OF_MESH) { - if (BM_elem_flag_test(f, BM_ELEM_TAG)) { - int *strength = BM_ELEM_CD_GET_VOID_P(f, cd_prop_int_offset); - *strength = face_strength; - } - } -} - -static void bevel_mod_harden_normals( - BevelModifierData *bmd, BMesh *bm, const float hn_strength, - const int hnmode, MDeformVert *dvert, int vgroup) -{ - if (bmd->res > 20 || bmd->value == 0) - return; - - BM_mesh_normals_update(bm); - BM_lnorspace_update(bm); - BM_normals_loops_edges_tag(bm, true); - - const bool vertex_only = (bmd->flags & MOD_BEVEL_VERT) != 0; - const int cd_clnors_offset = CustomData_get_offset(&bm->ldata, CD_CUSTOMLOOPNORMAL); - const bool do_normal_to_recon = (hn_strength == 1.0f); - - BMFace *f; - BMLoop *l, *l_cur, *l_first; - BMIter fiter; - GHash *faceHash = bmd->clnordata.faceHash; - - /* Iterate throught all loops of a face */ - BM_ITER_MESH(f, &fiter, bm, BM_FACES_OF_MESH) { - - l_cur = l_first = BM_FACE_FIRST_LOOP(f); - do { - if ((!BM_elem_flag_test(l_cur->e, BM_ELEM_TAG)) || - (!BM_elem_flag_test(l_cur, BM_ELEM_TAG) && BM_loop_check_cyclic_smooth_fan(l_cur))) - { - - /* previous and next edge is sharp, accumulate face normals into loop */ - if (!BM_elem_flag_test(l_cur->e, BM_ELEM_TAG) && !BM_elem_flag_test(l_cur->prev->e, BM_ELEM_TAG)) { - const int loop_index = BM_elem_index_get(l_cur); - short *clnors = BM_ELEM_CD_GET_VOID_P(l_cur, cd_clnors_offset); - BKE_lnor_space_custom_normal_to_data(bm->lnor_spacearr->lspacearr[loop_index], f->no, clnors); - } - else { - BMVert *v_pivot = l_cur->v; - BMEdge *e_next; - const BMEdge *e_org = l_cur->e; - BMLoop *lfan_pivot, *lfan_pivot_next; - UNUSED_VARS_NDEBUG(v_pivot); - - lfan_pivot = l_cur; - e_next = lfan_pivot->e; - BLI_SMALLSTACK_DECLARE(loops, BMLoop *); - float cn_wght[3] = { 0.0f, 0.0f, 0.0f }; - int recon_face_count = 0; /* Counts number of reconstructed faces current vert is connected to */ - BMFace *recon_face = NULL; /* Reconstructed face */ - - while (true) { - lfan_pivot_next = BM_vert_step_fan_loop(lfan_pivot, &e_next); - if (lfan_pivot_next) { - BLI_assert(lfan_pivot_next->v == v_pivot); - } - else { - e_next = (lfan_pivot->e == e_next) ? lfan_pivot->prev->e : lfan_pivot->e; - } - - BLI_SMALLSTACK_PUSH(loops, lfan_pivot); - - if (bmd->lim_flags & MOD_BEVEL_WEIGHT) { - int weight = BM_elem_float_data_get(&bm->edata, lfan_pivot->f, CD_BWEIGHT); - if (weight) { - if (hnmode == MOD_BEVEL_HN_FACE) { - float cur[3]; //Add area weighted face normals - mul_v3_v3fl(cur, lfan_pivot->f->no, BM_face_calc_area(lfan_pivot->f)); - add_v3_v3(cn_wght, cur); - } - else - add_v3_v3(cn_wght, lfan_pivot->f->no); //Else simply add face normals - } - else - add_v3_v3(cn_wght, lfan_pivot->f->no); - - } - else if (bmd->lim_flags & MOD_BEVEL_VGROUP) { - const bool has_vgroup = dvert != NULL; - const bool vert_of_group = ( - has_vgroup && - (defvert_find_index(&dvert[BM_elem_index_get(lfan_pivot->v)], vgroup) != NULL)); - - if (vert_of_group && hnmode == MOD_BEVEL_HN_FACE) { - float cur[3]; - mul_v3_v3fl(cur, lfan_pivot->f->no, BM_face_calc_area(lfan_pivot->f)); - add_v3_v3(cn_wght, cur); - } - else - add_v3_v3(cn_wght, lfan_pivot->f->no); - } - else { - float cur[3]; - mul_v3_v3fl(cur, lfan_pivot->f->no, BM_face_calc_area(lfan_pivot->f)); - add_v3_v3(cn_wght, cur); - } - if (!BLI_ghash_haskey(faceHash, lfan_pivot->f)) { - recon_face = lfan_pivot->f; - recon_face_count++; - } - if (!BM_elem_flag_test(e_next, BM_ELEM_TAG) || (e_next == e_org)) { - break; - } - lfan_pivot = lfan_pivot_next; - } - - normalize_v3(cn_wght); - mul_v3_fl(cn_wght, hn_strength); - float n_final[3]; - - while ((l = BLI_SMALLSTACK_POP(loops))) { - const int l_index = BM_elem_index_get(l); - short *clnors = BM_ELEM_CD_GET_VOID_P(l, cd_clnors_offset); - - /* If vertex is edge vert with 1 reconnected face */ - if (recon_face_count == 1 || (recon_face != NULL && do_normal_to_recon)) { - BKE_lnor_space_custom_normal_to_data( - bm->lnor_spacearr->lspacearr[l_index], recon_face->no, clnors); - } - else if (vertex_only == false || recon_face_count == 0) { - copy_v3_v3(n_final, l->f->no); - mul_v3_fl(n_final, 1.0f - hn_strength); - add_v3_v3(n_final, cn_wght); - normalize_v3(n_final); - BKE_lnor_space_custom_normal_to_data( - bm->lnor_spacearr->lspacearr[l_index], n_final, clnors); - } - else if (BLI_ghash_haskey(faceHash, l->f)) { - BKE_lnor_space_custom_normal_to_data( - bm->lnor_spacearr->lspacearr[l_index], l->v->no, clnors); - } - } - } - } - } while ((l_cur = l_cur->next) != l_first); - } -} - -static void bevel_fix_normal_shading_continuity(BevelModifierData *bmd, BMesh *bm) -{ - const bool vertex_only = (bmd->flags & MOD_BEVEL_VERT) != 0; - if (bmd->value == 0 || (bmd->clnordata.faceHash == NULL && vertex_only)) - return; - - BM_mesh_normals_update(bm); - BM_lnorspace_update(bm); - - GHash *faceHash = bmd->clnordata.faceHash; - BMEdge *e; - BMLoop *l; - BMIter liter, eiter; - - const int cd_clnors_offset = CustomData_get_offset(&bm->ldata, CD_CUSTOMLOOPNORMAL); - const float hn_strength = bmd->hn_strength; - float ref = 10.0f; - - BM_ITER_MESH(e, &eiter, bm, BM_EDGES_OF_MESH) { - BMFace *f_a, *f_b; - BM_edge_face_pair(e, &f_a, &f_b); - - bool has_f_a = false, has_f_b = false; - if (f_a) - has_f_a = BLI_ghash_haskey(faceHash, f_a); - if (f_b) - has_f_b = BLI_ghash_haskey(faceHash, f_b); - if (has_f_a ^ has_f_b) { - /* If one of both faces is present in faceHash then we are at a border - * between new vmesh created and reconstructed face */ - - for (int i = 0; i < 2; i++) { - BMVert *v = (i == 0) ? e->v1 : e->v2; - BM_ITER_ELEM(l, &liter, v, BM_LOOPS_OF_VERT) { - - if (l->f == f_a || l->f == f_b) { - const int l_index = BM_elem_index_get(l); - short *clnors = BM_ELEM_CD_GET_VOID_P(l, cd_clnors_offset); - float n_final[3], pow_a[3], pow_b[3]; - - zero_v3(n_final); - copy_v3_v3(pow_a, f_a->no); - copy_v3_v3(pow_b, f_b->no); - if (has_f_a) { - mul_v3_fl(pow_a, bmd->res / ref); - mul_v3_fl(pow_b, ref / bmd->res); - } - else { - mul_v3_fl(pow_b, bmd->res / ref); - mul_v3_fl(pow_a, ref / bmd->res); - } - add_v3_v3(n_final, pow_a); - add_v3_v3(n_final, pow_b); - normalize_v3(n_final); - - BKE_lnor_space_custom_normal_to_data(bm->lnor_spacearr->lspacearr[l_index], n_final, clnors); - } - } - } - } - else if (has_f_a == true && has_f_b == true) { - /* Else if both faces are present we assign clnor corresponding - * to vert normal and face normal */ - for (int i = 0; i < 2; i++) { - BMVert *v = (i == 0) ? e->v1 : e->v2; - BM_ITER_ELEM(l, &liter, v, BM_LOOPS_OF_VERT) { - - if (l->f == f_a || l->f == f_b) { - const int l_index = BM_elem_index_get(l); - short *clnors = BM_ELEM_CD_GET_VOID_P(l, cd_clnors_offset); - float n_final[3], cn_wght[3]; - - copy_v3_v3(n_final, v->no); - mul_v3_fl(n_final, hn_strength); - - copy_v3_v3(cn_wght, l->f->no); - mul_v3_fl(cn_wght, 1.0f - hn_strength); - - add_v3_v3(n_final, cn_wght); - normalize_v3(n_final); - BKE_lnor_space_custom_normal_to_data(bm->lnor_spacearr->lspacearr[l_index], n_final, clnors); - } - } - } - } - } -} - /* * This calls the new bevel code (added since 2.64) */ @@ -365,9 +116,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes const bool loop_slide = (bmd->flags & MOD_BEVEL_EVEN_WIDTHS) == 0; const bool mark_seam = (bmd->edge_flags & MOD_BEVEL_MARK_SEAM); const bool mark_sharp = (bmd->edge_flags & MOD_BEVEL_MARK_SHARP); - const bool set_wn_strength = (bmd->flags & MOD_BEVEL_SET_WN_STR); - - struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); + const bool harden_normals = (bmd->flags & MOD_BEVEL_HARDEN_NORMALS); + const int face_strength_mode = bmd->face_str_mode; bm = BKE_mesh_to_bmesh_ex( mesh, @@ -439,15 +189,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes BM_mesh_bevel(bm, bmd->value, offset_type, bmd->res, bmd->profile, vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp, - dvert, vgroup, mat, loop_slide, mark_seam, mark_sharp, bmd->hnmode, &bmd->clnordata); - - if (bmd->hnmode != BEVEL_HN_FIX_SHA && bmd->hnmode != MOD_BEVEL_HN_NONE) { - bevel_mod_harden_normals(bmd, bm, bmd->hn_strength, bmd->hnmode, dvert, vgroup); - } - if (bmd->hnmode == BEVEL_HN_FIX_SHA) - bevel_fix_normal_shading_continuity(bmd, bm); - if (set_wn_strength) - bevel_set_weighted_normal_face_strength(bm, scene); + dvert, vgroup, mat, loop_slide, mark_seam, mark_sharp, + harden_normals, face_strength_mode); result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0); diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index e2c13d02827..77f607d19a2 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -32,7 +32,6 @@ * \ingroup modifiers */ - #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" @@ -51,6 +50,8 @@ #include "BKE_particle.h" #include "BKE_scene.h" +#include "MOD_modifiertypes.h" + static void initData(ModifierData *md) { BuildModifierData *bmd = (BuildModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 42dd8ebb32b..fc33880e922 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -98,6 +98,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte /* TODO(sergey): Currently path is evaluated as a part of modifier stack, * might be changed in the future. */ + DEG_add_object_relation(ctx->node, cmd->object, DEG_OB_COMP_TRANSFORM, "Curve Modifier"); DEG_add_object_relation(ctx->node, cmd->object, DEG_OB_COMP_GEOMETRY, "Curve Modifier"); DEG_add_special_eval_flag(ctx->node, &cmd->object->id, DAG_EVAL_NEED_CURVE_PATH); } diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 0159edd069b..fff94e0d836 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -45,6 +45,8 @@ #include "BKE_mesh.h" #include "BKE_library.h" +#include "DEG_depsgraph_query.h" + #include "bmesh.h" #include "bmesh_tools.h" @@ -79,6 +81,23 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } +static DecimateModifierData *getOriginalModifierData( + const DecimateModifierData *dmd, const ModifierEvalContext *ctx) +{ + Object *ob_orig = DEG_get_original_object(ctx->object); + return (DecimateModifierData *)modifiers_findByName(ob_orig, dmd->modifier.name); +} + +static void updateFaceCount( + const ModifierEvalContext *ctx, const DecimateModifierData *dmd, int face_count) +{ + if (DEG_is_active(ctx->depsgraph)) { + /* update for display only */ + DecimateModifierData *dmd_orig = getOriginalModifierData(dmd, ctx); + dmd_orig->face_count = face_count; + } +} + static Mesh *applyModifier( ModifierData *md, const ModifierEvalContext *ctx, Mesh *meshData) @@ -94,7 +113,7 @@ static Mesh *applyModifier( #endif /* set up front so we dont show invalid info in the UI */ - dmd->face_count = mesh->totpoly; + updateFaceCount(ctx, dmd, mesh->totpoly); switch (dmd->mode) { case MOD_DECIM_MODE_COLLAPSE: @@ -187,8 +206,8 @@ static Mesh *applyModifier( MEM_freeN(vweights); } - /* update for display only */ - dmd->face_count = bm->totface; + updateFaceCount(ctx, dmd, bm->totface); + result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0); BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index 771ccd31e22..f0cdd2b2899 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -42,8 +42,8 @@ #include "MOD_modifiertypes.h" #ifdef WITH_ALEMBIC -# include "ABC_alembic.h" -# include "BKE_global.h" +# include "ABC_alembic.h" +# include "BKE_global.h" #endif static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index d24f32accf8..ae3f28ab764 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -78,8 +78,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte MirrorModifierData *mmd = (MirrorModifierData *)md; if (mmd->mirror_ob != NULL) { DEG_add_object_relation(ctx->node, mmd->mirror_ob, DEG_OB_COMP_TRANSFORM, "Mirror Modifier"); + DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Mirror Modifier"); } - DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Mirror Modifier"); } static Mesh *doBiscetOnMirrorPlane( diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 0a5b34c90ee..fa305f4c8a7 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -25,14 +25,12 @@ * Campbell Barton * * ***** END GPL LICENSE BLOCK ***** - * */ /** \file blender/modifiers/intern/MOD_particleinstance.c * \ingroup modifiers */ - #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -56,6 +54,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" +#include "MOD_modifiertypes.h" + static void initData(ModifierData *md) { ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md; |