[Bf-blender-cvs] [ec8d1b4eaeb] sculpt-dev: Sculpt: Location option for lasso trim and depth info
Pablo Dobarro
noreply at git.blender.org
Sun Feb 7 20:46:27 CET 2021
Commit: ec8d1b4eaeb855dd79a28ace0e697548b4f56d66
Author: Pablo Dobarro
Date: Sun Feb 7 18:57:14 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBec8d1b4eaeb855dd79a28ace0e697548b4f56d66
Sculpt: Location option for lasso trim and depth info
This adds a location option to the trim lasso tool to position the shape
in the middle of the volume of the object instead of in the surface
under the cursor.
{F9349724}
In order to make this work, the SCULPT_cursor_geometry_info_update can
now also get the depth of the geometry from the raycast. The depth is
calculated as the second further intersecting triangle in the raycast
over the entire mesh. This information will also be used to improve and
create new tools.
Differential Revision: https://developer.blender.org/D9622
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/pbvh.c
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/sculpt_paint/paint_mask.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_cloth.c
M source/blender/editors/sculpt_paint/sculpt_detail.c
M source/blender/editors/sculpt_paint/sculpt_face_set.c
M source/blender/editors/sculpt_paint/sculpt_filter_color.c
M source/blender/editors/sculpt_paint/sculpt_filter_mesh.c
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/sculpt_paint/sculpt_mask_expand.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 68cded82ce3..a4574c1ef04 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1395,6 +1395,7 @@ class _defs_sculpt:
props = tool.operator_properties("sculpt.trim_lasso_gesture")
layout.prop(props, "trim_mode", expand=False)
layout.prop(props, "trim_orientation", expand=False)
+ layout.prop(props, "trim_location", expand=False)
layout.prop(props, "use_cursor_depth", expand=False)
return dict(
idname="builtin.lasso_trim",
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 4369f332c35..08c4ccb7f8d 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -526,6 +526,7 @@ typedef struct SculptSession {
/* For Sculpt trimming gesture tools, initial raycast data from the position of the mouse when
* the gesture starts (intersection with the surface and if they ray hit the surface or not). */
+ float gesture_initial_back_location[3];
float gesture_initial_location[3];
float gesture_initial_normal[3];
bool gesture_initial_hit;
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 0fa44067b16..386bbb83763 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -159,7 +159,9 @@ bool BKE_pbvh_node_raycast(PBVH *pbvh,
const float ray_start[3],
const float ray_normal[3],
struct IsectRayPrecalc *isect_precalc,
+ int *hit_count,
float *depth,
+ float *back_depth,
int *active_vertex_index,
int *active_face_grid_index,
float *face_normal);
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 8a98780d918..8cf2c726953 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -2059,6 +2059,59 @@ bool ray_face_intersection_tri(const float ray_start[3],
return false;
}
+bool ray_update_depth_and_hit_count(const float depth_test,
+ float *r_depth,
+ float *r_back_depth,
+ int *hit_count)
+{
+ (*hit_count)++;
+ if (depth_test < *r_depth) {
+ *r_back_depth = *r_depth;
+ *r_depth = depth_test;
+ return true;
+ }
+ else if (depth_test > *r_depth && depth_test <= *r_back_depth) {
+ *r_back_depth = depth_test;
+ return false;
+ }
+
+ return false;
+}
+
+float ray_face_intersection_depth_quad(const float ray_start[3],
+ struct IsectRayPrecalc *isect_precalc,
+ const float t0[3],
+ const float t1[3],
+ const float t2[3],
+ const float t3[3],
+ float *r_depth,
+ float *r_back_depth,
+ int *hit_count)
+{
+ float depth_test;
+ if (!(isect_ray_tri_watertight_v3(ray_start, isect_precalc, t0, t1, t2, &depth_test, NULL) ||
+ isect_ray_tri_watertight_v3(ray_start, isect_precalc, t0, t2, t3, &depth_test, NULL))) {
+ return false;
+ }
+ return ray_update_depth_and_hit_count(depth_test, r_depth, r_back_depth, hit_count);
+}
+
+bool ray_face_intersection_depth_tri(const float ray_start[3],
+ struct IsectRayPrecalc *isect_precalc,
+ const float t0[3],
+ const float t1[3],
+ const float t2[3],
+ float *r_depth,
+ float *r_back_depth,
+ int *hit_count)
+{
+ float depth_test;
+ if (!isect_ray_tri_watertight_v3(ray_start, isect_precalc, t0, t1, t2, &depth_test, NULL)) {
+ return false;
+ }
+ return ray_update_depth_and_hit_count(depth_test, r_depth, r_back_depth, hit_count);
+}
+
/* Take advantage of the fact we know this wont be an intersection.
* Just handle ray-tri edges. */
static float dist_squared_ray_to_tri_v3_fast(const float ray_origin[3],
@@ -2138,7 +2191,9 @@ static bool pbvh_faces_node_raycast(PBVH *pbvh,
const float ray_start[3],
const float ray_normal[3],
struct IsectRayPrecalc *isect_precalc,
+ int *hit_count,
float *depth,
+ float *depth_back,
int *r_active_vertex_index,
int *r_active_face_index,
float *r_face_normal)
@@ -2172,26 +2227,29 @@ static bool pbvh_faces_node_raycast(PBVH *pbvh,
co[2] = vert[mloop[lt->tri[2]].v].co;
}
- if (ray_face_intersection_tri(ray_start, isect_precalc, co[0], co[1], co[2], depth)) {
- hit = true;
+ if (!ray_face_intersection_depth_tri(
+ ray_start, isect_precalc, co[0], co[1], co[2], depth, depth_back, hit_count)) {
+ continue;
+ }
- if (r_face_normal) {
- normal_tri_v3(r_face_normal, co[0], co[1], co[2]);
- }
+ hit = true;
- if (r_active_vertex_index) {
- float location[3] = {0.0f};
- madd_v3_v3v3fl(location, ray_start, ray_normal, *depth);
- for (int j = 0; j < 3; j++) {
- /* Always assign nearest_vertex_co in the first iteration to avoid comparison against
- * uninitialized values. This stores the closest vertex in the current intersecting
- * triangle. */
- if (j == 0 ||
- len_squared_v3v3(location, co[j]) < len_squared_v3v3(location, nearest_vertex_co)) {
- copy_v3_v3(nearest_vertex_co, co[j]);
- *r_active_vertex_index = mloop[lt->tri[j]].v;
- *r_active_face_index = lt->poly;
- }
+ if (r_face_normal) {
+ normal_tri_v3(r_face_normal, co[0], co[1], co[2]);
+ }
+
+ if (r_active_vertex_index) {
+ float location[3] = {0.0f};
+ madd_v3_v3v3fl(location, ray_start, ray_normal, *depth);
+ for (int j = 0; j < 3; j++) {
+ /* Always assign nearest_vertex_co in the first iteration to avoid comparison against
+ * uninitialized values. This stores the closest vertex in the current intersecting
+ * triangle. */
+ if (j == 0 ||
+ len_squared_v3v3(location, co[j]) < len_squared_v3v3(location, nearest_vertex_co)) {
+ copy_v3_v3(nearest_vertex_co, co[j]);
+ *r_active_vertex_index = mloop[lt->tri[j]].v;
+ *r_active_face_index = lt->poly;
}
}
}
@@ -2206,7 +2264,9 @@ static bool pbvh_grids_node_raycast(PBVH *pbvh,
const float ray_start[3],
const float ray_normal[3],
struct IsectRayPrecalc *isect_precalc,
+ int *hit_count,
float *depth,
+ float *back_depth,
int *r_active_vertex_index,
int *r_active_grid_index,
float *r_face_normal)
@@ -2251,37 +2311,45 @@ static bool pbvh_grids_node_raycast(PBVH *pbvh,
co[3] = CCG_grid_elem_co(gridkey, grid, x, y + 1);
}
- if (ray_face_intersection_quad(
- ray_start, isect_precalc, co[0], co[1], co[2], co[3], depth)) {
- hit = true;
+ if (ray_face_intersection_depth_quad(ray_start,
+ isect_precalc,
+ co[0],
+ co[1],
+ co[2],
+ co[3],
+ depth,
+ back_depth,
+ hit_count)) {
+ continue;
+ }
+ hit = true;
- if (r_face_normal) {
- normal_quad_v3(r_face_normal, co[0], co[1], co[2], co[3]);
- }
+ if (r_face_normal) {
+ normal_quad_v3(r_face_normal, co[0], co[1], co[2], co[3]);
+ }
- if (r_active_vertex_index) {
- float location[3] = {0.0};
- madd_v3_v3v3fl(location, ray_start, ray_normal, *depth);
+ if (r_active_vertex_index) {
+ float location[3] = {0.0};
+ madd_v3_v3v3fl(location, ray_start, ray_normal, *depth);
- const int x_it[4] = {0, 1, 1, 0};
- const int y_it[4] = {0, 0, 1, 1};
+ const int x_it[4] = {0, 1, 1, 0};
+ const int y_it[4] = {0, 0, 1, 1};
- for (int j = 0; j < 4; j++) {
- /* Always assign nearest_vertex_co in the first iteration to avoid comparison against
- * uninitialized values. This stores the closest vertex in the current intersecting
- * quad. */
- if (j == 0 || len_squared_v3v3(location, co[j]) <
- len_squared_v3v3(location, nearest_vertex_co)) {
- copy_v3_v3(nearest_vertex_co, co[j]);
+ for (int j = 0; j < 4; j++) {
+ /* Always assign nearest_vertex_co in the first iteration to avoid comparison against
+ * uninitialized values. This stores the closest vertex in the current intersecting
+ * quad. */
+ if (j =
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list