Commit: 1757b381790cd490e14b7ff7b6c4c84e4f1132e9
Author: Rohan Rathi
Date: Sat Jun 23 01:46:42 2018 +0530
Branches: soc-2018-bevel
https://developer.blender.org/rB1757b381790cd490e14b7ff7b6c4c84e4f1132e9
Added UI for harden normals and normal control in bevel modifier
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/bmesh/intern/bmesh_operators.h
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_bevel.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py
b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 581f3ca91bc..b79e594095d 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -143,8 +143,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "mark_seam")
col.prop(md, "mark_sharp")
- col.prop(md, "set_wn_strength")
-
layout.label(text="Limit Method:")
layout.row().prop(md, "limit_method", expand=True)
if md.limit_method == 'ANGLE':
@@ -155,6 +153,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
layout.label(text="Width Method:")
layout.row().prop(md, "offset_type", expand=True)
+
+ layout.label(text="Normal Mode")
+ layout.row().prop(md, "hnmode", expand=True)
+ layout.prop(md, "hn_strength")
+ layout.prop(md, "set_wn_strength")
+
def BOOLEAN(self, layout, ob, md):
split = layout.split()
diff --git a/source/blender/bmesh/intern/bmesh_operators.h
b/source/blender/bmesh/intern/bmesh_operators.h
index 3ae9a77a761..1b5694c3ee8 100644
--- a/source/blender/bmesh/intern/bmesh_operators.h
+++ b/source/blender/bmesh/intern/bmesh_operators.h
@@ -128,6 +128,7 @@ enum {
};
enum {
+ BEVEL_HN_NONE,
BEVEL_HN_FACE,
BEVEL_HN_ADJ,
};
diff --git a/source/blender/editors/mesh/editmesh_bevel.c
b/source/blender/editors/mesh/editmesh_bevel.c
index 1daf020dc7b..40be91aada1 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -752,6 +752,7 @@ void MESH_OT_bevel(wmOperatorType *ot)
};
static EnumPropertyItem harden_normals_items[] = {
+ { BEVEL_HN_NONE, "HN_NONE", 0, "Off", "Do not use Harden
Normals" },
{ BEVEL_HN_FACE, "HN_FACE", 0, "Face Area", "Use faces as
weight" },
{ BEVEL_HN_ADJ, "HN_ADJ", 0, "Vertex average", "Use adjacent
vertices as weight" },
{ 0, NULL, 0, NULL, NULL },
diff --git a/source/blender/makesdna/DNA_modifier_types.h
b/source/blender/makesdna/DNA_modifier_types.h
index 891f854c9eb..83f98c1181e 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -376,6 +376,7 @@ enum {
/* BevelModifierData->hnmode */
enum {
+ MOD_BEVEL_HN_NONE,
MOD_BEVEL_HN_FACE,
MOD_BEVEL_HN_ADJ,
};
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index c29e40cba56..497125476a2 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -3025,6 +3025,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
};
static EnumPropertyItem prop_harden_normals_items[] = {
+ { MOD_BEVEL_HN_NONE, "HN_NONE", 0, "Off", "Do not use Harden
Normals" },
{ MOD_BEVEL_HN_FACE, "HN_FACE", 0, "Face Area", "Use faces as
weight" },
{ MOD_BEVEL_HN_ADJ, "HN_ADJ", 0, "Vertex average", "Use
adjacent vertices as weight" },
{ 0, NULL, 0, NULL, NULL },
@@ -3123,8 +3124,8 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "hn_strength", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, 0, 10);
- RNA_def_property_ui_range(prop, 0, 10, 1, 2);
+ RNA_def_property_range(prop, 0, 1);
+ RNA_def_property_ui_range(prop, 0, 1, 1, 2);
RNA_def_property_ui_text(prop, "Normal Strength", "Strength of
calculated normal");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
diff --git a/source/blender/modifiers/intern/MOD_bevel.c
b/source/blender/modifiers/intern/MOD_bevel.c
index 6902b811c26..77b306466c3 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -32,11 +32,14 @@
* \ingroup modifiers
*/
+#include "MEM_guardedalloc.h"
+
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
#include "DNA_scene_types.h"
#include "BLI_utildefines.h"
+#include "BLI_linklist_stack.h"
#include "BLI_math.h"
#include "BLI_string.h"
@@ -102,6 +105,109 @@ static void bevel_set_weighted_normal_face_strength(BMesh
*bm, Scene *scene)
}
}
+static void bevel_mod_harden_normals(BevelModifierData *bmd, BMesh *bm, float
hn_strength, int hnmode, MDeformVert *dvert, int vgroup)
+{
+ if (bmd->res > 20)
+ return;
+ BM_mesh_normals_update(bm);
+ BM_lnorspace_update(bm);
+ BM_normals_loops_edges_tag(bm, true);
+
+ int cd_clnors_offset = CustomData_get_offset(&bm->ldata,
CD_CUSTOMLOOPNORMAL);
+
+ BMFace *f;
+ BMLoop *l, *l_cur, *l_first;
+ BMIter fiter;
+
+ 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)))) {
+
+ 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;
+
+ lfan_pivot = l_cur;
+ e_next = lfan_pivot->e;
+ BLI_SMALLSTACK_DECLARE(loops, BMLoop *);
+ float cn_wght[3] = { 0.0f, 0.0f, 0.0f };
+
+ 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 (bmd->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
+
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(l->v)], vgroup) != NULL;
+ if (vert_of_group &&
bmd->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 (!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);
+ 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);
+ }
+ }
+ }
+ } while ((l_cur = l_cur->next) != l_first);
+ }
+}
+
/*
* This calls the new bevel code (added since 2.64)
*/
@@ -197,6 +303,9 @@ static Mesh *applyModifier(ModifierData *md, const
ModifierEvalContext *ctx, Mes
vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp,
dvert, vgroup, mat, loop_slide, mark_seam, mark_sharp,
bmd->hnmode, NULL);
+ if (bmd->hnmode != MOD_BEVEL_HN_NONE)
+ bevel_mod_harden_normals(bmd, bm, bmd->hn_strength,
bmd->hnmode, dvert, vgroup);
+
if(set_wn_strength)
bevel_set_weighted_normal_face_strength(bm, md->scene);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
