[Bf-blender-cvs] [4ab8614cd1b] temp_bmesh_multires: Last attempt at fixing boundary brush for now. Unassigned boundary verts now get bend data from their neighbors. Still isn't quite satisfactory but better then before.
Joseph Eagar
noreply at git.blender.org
Thu Apr 15 07:03:17 CEST 2021
Commit: 4ab8614cd1b9014d32e301d5ba4dd1e9d2ea06ee
Author: Joseph Eagar
Date: Wed Apr 14 22:02:32 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB4ab8614cd1b9014d32e301d5ba4dd1e9d2ea06ee
Last attempt at fixing boundary brush for now. Unassigned boundary
verts now get bend data from their neighbors. Still isn't quite
satisfactory but better then before.
===================================================================
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_boundary.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 3faa5bbfae2..511776c4e67 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1073,11 +1073,14 @@ static void sculpt_vertex_neighbors_get_bmesh(SculptSession *ss,
BMVert *v = (BMVert *)index.i;
BMIter liter;
BMLoop *l;
+
+ iter->is_duplicate = false;
iter->size = 0;
iter->num_duplicates = 0;
iter->capacity = SCULPT_VERTEX_NEIGHBOR_FIXED_CAPACITY;
iter->neighbors = iter->neighbors_fixed;
iter->neighbor_indices = iter->neighbor_indices_fixed;
+ iter->i = 0;
#if 1 // note that BM_EDGES_OF_VERT should be faster then BM_LOOPS_OF_VERT
BMEdge *e;
@@ -1115,6 +1118,7 @@ static void sculpt_vertex_neighbors_get_faces(SculptSession *ss,
iter->capacity = SCULPT_VERTEX_NEIGHBOR_FIXED_CAPACITY;
iter->neighbors = iter->neighbors_fixed;
iter->neighbor_indices = iter->neighbor_indices_fixed;
+ iter->is_duplicate = false;
for (int i = 0; i < ss->pmap[index].count; i++) {
const MPoly *p = &ss->mpoly[vert_map->indices[i]];
@@ -1159,6 +1163,8 @@ static void sculpt_vertex_neighbors_get_grids(SculptSession *ss,
SubdivCCGNeighbors neighbors;
BKE_subdiv_ccg_neighbor_coords_get(ss->subdiv_ccg, &coord, include_duplicates, &neighbors);
+ iter->is_duplicate = include_duplicates;
+
iter->size = 0;
iter->num_duplicates = neighbors.num_duplicates;
iter->capacity = SCULPT_VERTEX_NEIGHBOR_FIXED_CAPACITY;
diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.c b/source/blender/editors/sculpt_paint/sculpt_boundary.c
index a0e9e52f7cc..53221169f69 100644
--- a/source/blender/editors/sculpt_paint/sculpt_boundary.c
+++ b/source/blender/editors/sculpt_paint/sculpt_boundary.c
@@ -307,8 +307,8 @@ static bool boundary_floodfill_cb(
boundary->distance[from_v_i] + edge_len :
0.0f;
sculpt_boundary_index_add(ss, boundary, to_v, distance_boundary_to_dst, data->included_vertices);
- //if (!is_duplicate) {
- sculpt_boundary_preview_edge_add(boundary, from_v, to_v);
+ // if (!is_duplicate) {
+ sculpt_boundary_preview_edge_add(boundary, from_v, to_v);
//}
return sculpt_boundary_is_vertex_in_editable_boundary(ss, to_v);
@@ -447,14 +447,15 @@ ATTR_NO_OPT static void sculpt_boundary_edit_data_init(SculptSession *ss,
SculptVertexNeighborIter ni;
SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN (ss, from_v, ni) {
-
const bool is_visible = SCULPT_vertex_visible_get(ss, ni.vertex);
+
if (!is_visible ||
boundary->edit_info[ni.index].num_propagation_steps != BOUNDARY_STEPS_NONE) {
continue;
}
boundary->edit_info[ni.index].original_vertex =
boundary->edit_info[from_v_i].original_vertex;
+
boundary->edit_info[ni.index].original_vertex_i =
boundary->edit_info[from_v_i].original_vertex_i;
@@ -662,25 +663,34 @@ ATTR_NO_OPT static void sculpt_boundary_bend_data_init(SculptSession *ss, Sculpt
boundary->bend.pivot_positions = MEM_calloc_arrayN(
totvert, 4 * sizeof(float) * TSTN, "pivot positions");
- for (int i = 0; i < totvert; i++) {
- SculptVertRef vertex = BKE_pbvh_table_index_to_vertex(ss->pbvh, i);
+ for (int step = 0; step < 1; step++) {
+ bool ok = true;
- if (boundary->edit_info[i].num_propagation_steps != boundary->max_propagation_steps) {
- continue;
- }
+ for (int i = 0; i < totvert; i++) {
+ SculptVertRef vertex = BKE_pbvh_table_index_to_vertex(ss->pbvh, i);
- if (boundary->edit_info[i].original_vertex_i == BOUNDARY_VERTEX_NONE) {
- continue;
- }
+ bool bad = boundary->edit_info[i].num_propagation_steps !=
+ boundary->max_propagation_steps - step;
+ if (step == 2) {
+ bad = false;
+ }
- float dir[3];
- float normal[3];
- SCULPT_vertex_normal_get(ss, vertex, normal);
- sub_v3_v3v3(dir,
- SCULPT_vertex_co_get(ss, boundary->edit_info[i].original_vertex),
- SCULPT_vertex_co_get(ss, vertex));
+ bad = bad || boundary->edit_info[i].original_vertex_i == BOUNDARY_VERTEX_NONE;
+ bad = bad ||
+ boundary->bend.pivot_positions[boundary->edit_info[i].original_vertex_i][3] != 0.0f;
+
+ if (bad && (step != 3 || boundary->edit_info[i].original_vertex_i == i)) {
+ continue;
+ }
+
+ float dir[3];
+ float normal[3];
+ SCULPT_vertex_normal_get(ss, vertex, normal);
+ sub_v3_v3v3(dir,
+ SCULPT_vertex_co_get(ss, boundary->edit_info[i].original_vertex),
+ SCULPT_vertex_co_get(ss, vertex));
- validateVert(ss, boundary->edit_info[i].original_vertex);
+ validateVert(ss, boundary->edit_info[i].original_vertex);
#if 0
/*strategy to increase accuracy for non-quad topologies:
@@ -700,29 +710,121 @@ ATTR_NO_OPT static void sculpt_boundary_bend_data_init(SculptSession *ss, Sculpt
add_v3_v3(dir, cdir);
#endif
- cross_v3_v3v3(
- boundary->bend.pivot_rotation_axis[boundary->edit_info[i].original_vertex_i], dir, normal);
- normalize_v3(boundary->bend.pivot_rotation_axis[boundary->edit_info[i].original_vertex_i]);
- copy_v3_v3(boundary->bend.pivot_positions[i], SCULPT_vertex_co_get(ss, vertex));
+ cross_v3_v3v3(boundary->bend.pivot_rotation_axis[boundary->edit_info[i].original_vertex_i],
+ dir,
+ normal);
+ normalize_v3(boundary->bend.pivot_rotation_axis[boundary->edit_info[i].original_vertex_i]);
+ copy_v3_v3(boundary->bend.pivot_positions[i], SCULPT_vertex_co_get(ss, vertex));
- add_v3_v3(boundary->bend.pivot_positions[boundary->edit_info[i].original_vertex_i],
- SCULPT_vertex_co_get(ss, vertex));
- boundary->bend.pivot_positions[boundary->edit_info[i].original_vertex_i][3] += 1.0f;
- }
+ add_v3_v3(boundary->bend.pivot_positions[boundary->edit_info[i].original_vertex_i],
+ SCULPT_vertex_co_get(ss, vertex));
+ boundary->bend.pivot_positions[boundary->edit_info[i].original_vertex_i][3] += 1.0f;
+ }
- for (int i = 0; i < totvert; i++) {
- if (boundary->bend.pivot_positions[i][3] > 0.0f) {
- float mul = 1.0f / boundary->bend.pivot_positions[i][3];
- boundary->bend.pivot_positions[i][0] *= mul;
- boundary->bend.pivot_positions[i][1] *= mul;
- boundary->bend.pivot_positions[i][2] *= mul;
- boundary->bend.pivot_positions[i][3] = 1.0f;
+ for (int i = 0; i < totvert; i++) {
+ if (boundary->edit_info[i].num_propagation_steps == 0 &&
+ boundary->bend.pivot_positions[i][3] == 0.0f) {
+
+ printf("eek!\n");
+ SculptVertexNeighborIter ni;
+ SculptVertexNeighborIter ni2;
+ const int maxstack = 32;
+ SculptVertRef stack[32];
+ SculptVertRef vertex = BKE_pbvh_table_index_to_vertex(ss->pbvh, i);
+ const float *co1 = SCULPT_vertex_co_get(ss, vertex);
+ int si = 0;
+ stack[si++] = vertex;
+
+ float mindis = 1e17;
+ float pivota[3], pivotb[3];
+ float rota[3], rotb[3];
+ SculptVertRef v_a = {-1}, v_b = {-1};
+
+ copy_v3_v3(pivota, co1);
+ copy_v3_v3(pivotb, co1);
+ zero_v3(rota);
+ zero_v3(rotb);
+
+ float mindis2 = 1e17;
+
+ // do a short walk on mesh to find pivot
+ SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, vertex, ni2) {
+ SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, ni2.vertex, ni) {
+ SculptVertRef v2 = ni.vertex;
+
+ bool ok = ni.vertex.i != vertex.i;
+ ok = ok && boundary->edit_info[ni.index].num_propagation_steps == 0;
+ ok = ok && boundary->bend.pivot_positions[ni.index][3] > 0.0f;
+
+ if (ok) {
+ const float *co2 = SCULPT_vertex_co_get(ss, ni.vertex);
+ float dis = len_squared_v3v3(co1, co2);
+
+ if (dis < mindis) {
+ copy_v3_v3(pivotb, pivota);
+ copy_v3_v3(rotb, rota);
+
+ v_b = v_a;
+ mindis2 = mindis;
+
+ copy_v3_v3(pivota, boundary->bend.pivot_positions[ni.index]);
+ copy_v3_v3(rota, boundary->bend.pivot_rotation_axis[ni.index]);
+
+ v_a = ni.vertex;
+ mindis = dis;
+ }
+ else if (dis < mindis2) {
+ v_b = ni.vertex;
+ copy_v3_v3(pivotb, boundary->bend.pivot_positions[ni.index]);
+ copy_v3_v3(rotb, boundary->bend.pivot_rotation_axis[ni.index]);
+ mindis2 = dis;
+ }
+ }
+ }
+ SCULPT_VERTEX_NEIGHBORS_ITER_END(ni);
+ }
+ SCULPT_VERTEX_NEIGHBORS_ITER_END(ni2);
+
+ float len = len_v3v3(pivota, pivotb);
+ if (len > 0.0) {
+ float vec1[3], vec2[3];
+
+ sub_v3_v3v3(vec1, pivotb, pivota);
+ normalize_v3(vec1);
+
+ sub_v3_v3v3(vec2, co1, pivota);
+
+ float t = dot_v3v3(vec2, vec1) / len;
+
+ interp_v3_v3v3(pivota, pivota, pivotb, t);
+ interp_v3_v3v3(rota, rota, rotb, t);
+
+ copy_v3_v3(boundary->bend.pivot_positions[i], pivota);
+ boundary->bend.pivot_positions[i][3] = 1.0f;
+ copy_v3_v3(boundary->bend.pivot_rotation_axis[i], rota);
+ }
+ }
+
+ if (boundary->bend.pivot_positions[i][3] > 0.0f) {
+ float mul = 1.0f / boundary->bend.pivot_positions[i][3];
+ boundary->bend.pivot_positions[i][0] *= mul;
+ boundary->bend.pivot_positions[i][1] *= mul;
+ boundary->bend.pivot_positions[i][2] *= mul;
+ boundary->bend.pivot_positions[i][3] = 1.0f;
+ }
+ else {
+ SculptVertRef vertex = BKE_pbvh_table_index_to_vertex(ss->pbvh, i);
+ float *co = SCULPT_vertex_co_get(ss, vertex);
+
+ //boundary->bend.pivot_positions[i][0] = co[0];
+ //boundary->bend.pivot_positions[i][1] = co[1];
+ //boundary->bend.pivot_positions[i][2] = co[2];
+ //boundary->bend.pivot_positions[i][3] = 0.0f;
+ }
}
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list