[Bf-blender-cvs] [01acc2a] master: EditMesh: wireframe tool, add offset and vgroup support (not used yet)
Campbell Barton
noreply at git.blender.org
Sat Dec 21 21:14:16 CET 2013
Commit: 01acc2a7dcb3ba3bd99f75aac77c14619b10c539
Author: Campbell Barton
Date: Sun Dec 22 06:54:37 2013 +1100
http://developer.blender.org/rB01acc2a7dcb3ba3bd99f75aac77c14619b10c539
EditMesh: wireframe tool, add offset and vgroup support (not used yet)
===================================================================
M source/blender/bmesh/CMakeLists.txt
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/operators/bmo_wireframe.c
A source/blender/bmesh/tools/bmesh_wireframe.c
A source/blender/bmesh/tools/bmesh_wireframe.h
M source/blender/editors/mesh/editmesh_tools.c
===================================================================
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index afb8b07..cd8d71b 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -136,6 +136,8 @@ set(SRC
tools/bmesh_path.h
tools/bmesh_triangulate.c
tools/bmesh_triangulate.h
+ tools/bmesh_wireframe.c
+ tools/bmesh_wireframe.h
bmesh_class.h
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index ef43d73..97624ec 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -1694,12 +1694,16 @@ static BMOpDefine bmo_wireframe_def = {
"wireframe",
/* slots_in */
{{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */
+ {"thickness", BMO_OP_SLOT_FLT},
+ {"offset", BMO_OP_SLOT_FLT},
+ {"use_replace", BMO_OP_SLOT_BOOL},
{"use_boundary", BMO_OP_SLOT_BOOL},
{"use_even_offset", BMO_OP_SLOT_BOOL},
{"use_crease", BMO_OP_SLOT_BOOL},
+ {"crease_weight", BMO_OP_SLOT_FLT},
{"thickness", BMO_OP_SLOT_FLT},
{"use_relative_offset", BMO_OP_SLOT_BOOL},
- {"depth", BMO_OP_SLOT_FLT},
+ {"material_offset", BMO_OP_SLOT_INT},
{{'\0'}},
},
/* slots_out */
diff --git a/source/blender/bmesh/operators/bmo_wireframe.c b/source/blender/bmesh/operators/bmo_wireframe.c
index 94b3542..83d6e3a 100644
--- a/source/blender/bmesh/operators/bmo_wireframe.c
+++ b/source/blender/bmesh/operators/bmo_wireframe.c
@@ -28,408 +28,43 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
+#include "DNA_material_types.h"
-#include "BKE_customdata.h"
+#include "BLI_sys_types.h"
+#include "BLI_utildefines.h"
#include "bmesh.h"
-#include "intern/bmesh_operators_private.h" /* own include */
-
-static BMLoop *bm_edge_tag_faceloop(BMEdge *e)
-{
- BMLoop *l, *l_first;
-
- l = l_first = e->l;
- do {
- if (BM_elem_flag_test(l->f, BM_ELEM_TAG)) {
- return l;
- }
- } while ((l = l->radial_next) != l_first);
-
- /* in the case this is used, we know this will never happen */
- return NULL;
-}
-
-static void bm_vert_boundary_tangent(BMVert *v, float r_no[3], float r_no_face[3],
- BMVert **r_va_other, BMVert **r_vb_other)
-{
- BMIter iter;
- BMEdge *e_iter;
-
- BMEdge *e_a = NULL, *e_b = NULL;
- BMVert *v_a, *v_b;
-
- BMLoop *l_a, *l_b;
-
- float no_face[3], no_edge[3];
- float tvec_a[3], tvec_b[3];
-
- /* get 2 boundary edges, there should only _be_ 2,
- * in case there are more - results wont be valid of course */
- BM_ITER_ELEM (e_iter, &iter, v, BM_EDGES_OF_VERT) {
- if (BM_elem_flag_test(e_iter, BM_ELEM_TAG)) {
- if (e_a == NULL) {
- e_a = e_iter;
- }
- else {
- e_b = e_iter;
- break;
- }
- }
- }
-
- if (e_a && e_b) {
- /* note, with an incorrectly flushed selection this can crash */
- l_a = bm_edge_tag_faceloop(e_a);
- l_b = bm_edge_tag_faceloop(e_b);
-
- /* average edge face normal */
- add_v3_v3v3(no_face, l_a->f->no, l_b->f->no);
-
- /* average edge direction */
- v_a = BM_edge_other_vert(e_a, v);
- v_b = BM_edge_other_vert(e_b, v);
-
- sub_v3_v3v3(tvec_a, v->co, v_a->co);
- sub_v3_v3v3(tvec_b, v_b->co, v->co);
- normalize_v3(tvec_a);
- normalize_v3(tvec_b);
- add_v3_v3v3(no_edge, tvec_a, tvec_b); /* not unit length but this is ok */
-
- /* check are we flipped the right way */
- BM_edge_calc_face_tangent(e_a, l_a, tvec_a);
- BM_edge_calc_face_tangent(e_b, l_b, tvec_b);
- add_v3_v3(tvec_a, tvec_b);
-
- *r_va_other = v_a;
- *r_vb_other = v_b;
- }
- else {
- /* degenerate case - vertex connects a boundary edged face to other faces,
- * so we have only one boundary face - only use it for calculations */
- l_a = bm_edge_tag_faceloop(e_a);
-
- copy_v3_v3(no_face, l_a->f->no);
-
- /* edge direction */
- v_a = BM_edge_other_vert(e_a, v);
- v_b = NULL;
-
- sub_v3_v3v3(no_edge, v->co, v_a->co);
-
- /* check are we flipped the right way */
- BM_edge_calc_face_tangent(e_a, l_a, tvec_a);
-
- *r_va_other = NULL;
- *r_vb_other = NULL;
- }
+#include "tools/bmesh_wireframe.h"
- /* find the normal */
- cross_v3_v3v3(r_no, no_edge, no_face);
- normalize_v3(r_no);
-
- if (dot_v3v3(r_no, tvec_a) > 0.0f) {
- negate_v3(r_no);
- }
-
- copy_v3_v3(r_no_face, no_face);
-}
+#include "intern/bmesh_operators_private.h" /* own include */
-/* check if we are the only tagged loop-face around this edge */
-static bool bm_loop_is_radial_boundary(BMLoop *l_first)
-{
- BMLoop *l = l_first->radial_next;
-
- if (l == l_first) {
- return true; /* a real boundary */
- }
- else {
- do {
- if (BM_elem_flag_test(l->f, BM_ELEM_TAG)) {
- return false;
- }
- } while ((l = l->radial_next) != l_first);
- }
- return true;
-}
void bmo_wireframe_exec(BMesh *bm, BMOperator *op)
{
+ const float offset = BMO_slot_float_get(op->slots_in, "thickness");
+ const float offset_fac = BMO_slot_float_get(op->slots_in, "offset");
+ const bool use_replace = BMO_slot_bool_get(op->slots_in, "use_replace");
const bool use_boundary = BMO_slot_bool_get(op->slots_in, "use_boundary");
const bool use_even_offset = BMO_slot_bool_get(op->slots_in, "use_even_offset");
const bool use_relative_offset = BMO_slot_bool_get(op->slots_in, "use_relative_offset");
const bool use_crease = BMO_slot_bool_get(op->slots_in, "use_crease");
- const float depth = BMO_slot_float_get(op->slots_in, "thickness");
- const float inset = depth;
- int cd_edge_crease_offset = use_crease ? CustomData_get_offset(&bm->edata, CD_CREASE) : -1;
- const float crease_weight = 1.0f;
-
- const int totvert_orig = bm->totvert;
-
- BMOIter oiter;
- BMIter iter;
- BMIter itersub;
-
- /* filled only with boundary verts */
- BMVert **verts_src = MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__);
- BMVert **verts_neg = MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__);
- BMVert **verts_pos = MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__);
-
- /* will over-alloc, but makes for easy lookups by index to keep aligned */
- BMVert **verts_boundary = use_boundary ?
- MEM_mallocN(sizeof(BMVert *) * totvert_orig, __func__) : NULL;
-
- float *verts_relfac = use_relative_offset ?
- MEM_mallocN(sizeof(float) * totvert_orig, __func__) : NULL;
-
- /* may over-alloc if not all faces have wire */
- BMVert **verts_loop;
- int verts_loop_tot = 0;
-
- BMVert *v_src;
-
- BMFace *f_src;
- BMLoop *l;
-
- float tvec[3];
- float fac;
-
- int i;
-
- if (use_crease && cd_edge_crease_offset == -1) {
- BM_data_layer_add(bm, &bm->edata, CD_CREASE);
- cd_edge_crease_offset = CustomData_get_offset(&bm->edata, CD_CREASE);
- }
-
- BM_mesh_elem_index_ensure(bm, BM_VERT);
-
- BM_ITER_MESH_INDEX (v_src, &iter, bm, BM_VERTS_OF_MESH, i) {
- BM_elem_flag_disable(v_src, BM_ELEM_TAG);
- verts_src[i] = v_src;
- }
-
- /* setup tags, all faces and verts will be tagged which will be duplicated */
- BM_mesh_elem_hflag_disable_all(bm, BM_FACE | BM_EDGE, BM_ELEM_TAG, false);
-
- BMO_ITER (f_src, &oiter, op->slots_in, "faces", BM_FACE) {
- verts_loop_tot += f_src->len;
- BM_elem_flag_enable(f_src, BM_ELEM_TAG);
- BM_ITER_ELEM (l, &itersub, f_src, BM_LOOPS_OF_FACE) {
- BM_elem_flag_enable(l->v, BM_ELEM_TAG);
-
- /* also tag boundary edges */
- BM_elem_flag_set(l->e, BM_ELEM_TAG, bm_loop_is_radial_boundary(l));
- }
- }
-
- /* duplicate tagged verts */
- for (i = 0; i < totvert_orig; i++) {
- v_src = verts_src[i];
- if (BM_elem_flag_test(v_src, BM_ELEM_TAG)) {
- fac = depth;
-
- if (use_relative_offset) {
- verts_relfac[i] = BM_vert_calc_mean_tagged_edge_length(v_src);
- fac *= verts_relfac[i];
- }
-
- madd_v3_v3v3fl(tvec, v_src->co, v_src->no, -fac);
- verts_neg[i] = BM_vert_create(bm, tvec, v_src, BM_CREATE_NOP);
- madd_v3_v3v3fl(tvec, v_src->co, v_src->no, fac);
- verts_pos[i] = BM_vert_create(bm, tvec, v_src, BM_CREATE_NOP);
- }
- else {
- /* could skip this */
- verts_src[i] = NULL;
- verts_neg[i] = NULL;
- verts_pos[i] = NULL;
- }
-
- /* conflicts with BM_vert_calc_mean_tagged_edge_length */
- if (use_relative_offset == false) {
- BM_elem_flag_disable(v_src, BM_ELEM_TAG);
- }
- }
-
- if (use_relative_offset) {
- BM_mesh_elem_hflag_disable_all(bm, BM_VERT, BM_ELEM_TAG, false);
- }
-
- verts_loop = MEM_mallocN(sizeof(BMVert *) * verts_loop_tot, __func__);
- verts_loop_tot = 0; /* count up again */
-
- BMO_ITER (f_src, &oiter, op->slots_in, "faces", BM_FACE) {
- BM_ITER_ELEM (l, &itersub, f_src, BM_LOOPS_OF_FACE) {
- BM_elem_index_set(l, verts_loop_tot); /* set_loop */
-
- BM_loop_calc_face_tangent(l, tvec);
-
- /* create offset vert */
- fac = inset;
- if (use_even_offset) {
- fac *= shell_angle_to_dist(((float)M_PI - BM_loop_calc_face_angle(l)) * 0.5f);
- }
- if (use_relative_offset) {
- fac *= verts_relfac[BM_elem_index_get(l->v)];
- }
-
- madd_v3_v3v3fl(tvec, l->v->co, tvec, fac);
- verts_loop[verts_loop_tot] = BM_vert_create(bm, tvec, l->v, BM_CREATE_NOP);
-
-
- if (use_boundary) {
- if (BM_elem_flag_test(l->e, BM_ELEM_TAG)) { /* is this a boundary? */
-
- BMLoop *l_pair[2] = {l, l->next};
-
- BM_elem_flag_enable(l->e, BM_ELEM_TAG);
- for (i = 0; i < 2; i++) {
- if (!BM_elem_flag_test(l_pair[i]->v, BM_ELEM_TAG)) {
- float no_face[3];
- BMVert *va_other;
- BMVert *vb_other;
-
- BM_elem_flag_enable(l_pair[i]->v, BM_ELEM_TAG);
-
- bm_vert_boundary_tangent(l_pair[i]->v, tvec, no_face, &va_other, &vb_other);
-
- /* create offset vert */
- /* similar to code above but different angle calc */
- fac = inset;
- if (use_even_offset) {
- if (va_other) { /* for verts with only one boundary edge - this will be NULL */
- fac *= shell_angle_to_dist(((float)M_PI - angle_on_axis_v3v3v3_v3(va_other->co,
- l_pair[i]->v->co,
- vb_other->co,
- no_face)) * 0.5f);
- }
- }
- if (use
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list