blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Sculpt: Implement elastic surface falloff

This commit is contained in:
Pablo Dobarro 2021-01-26 20:51:53 +01:00
parent a72cf784a7
commit e779eab729
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/properties_paint_common.py
View File

@ -640,6 +640,7 @@ def brush_settings(layout, context, brush, popover=False):
layout.separator()
layout.prop(brush, "elastic_deform_type")
layout.prop(brush, "elastic_deform_volume_preservation", slider=True)
layout.prop(brush, "use_surface_falloff")
layout.separator()
elif sculpt_tool == 'SNAKE_HOOK':

35
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -4500,28 +4500,39 @@ static void do_elastic_deform_brush_task_cb_ex(void *__restrict userdata,
{
SCULPT_orig_vert_data_update(&orig_data, &vd);
float final_disp[3];
float orig_co[3];
if (brush->flag2 & BRUSH_USE_SURFACE_FALLOFF) {
float disp[3];
sub_v3_v3v3(disp, orig_data.co, ss->cache->initial_location);
normalize_v3(disp);
mul_v3_fl(disp, ss->cache->geodesic_dists[ss->cache->mirror_symmetry_pass][vd.index]);
add_v3_v3v3(orig_co, ss->cache->initial_location, disp);
}
else {
copy_v3_v3(orig_co, orig_data.co);
}
switch (brush->elastic_deform_type) {
case BRUSH_ELASTIC_DEFORM_GRAB:
BKE_kelvinlet_grab(final_disp, &params, orig_data.co, location, grab_delta);
BKE_kelvinlet_grab(final_disp, &params, orig_co, location, grab_delta);
mul_v3_fl(final_disp, bstrength * 20.0f);
break;
case BRUSH_ELASTIC_DEFORM_GRAB_BISCALE: {
BKE_kelvinlet_grab_biscale(final_disp, &params, orig_data.co, location, grab_delta);
BKE_kelvinlet_grab_biscale(final_disp, &params, orig_co, location, grab_delta);
mul_v3_fl(final_disp, bstrength * 20.0f);
break;
}
case BRUSH_ELASTIC_DEFORM_GRAB_TRISCALE: {
BKE_kelvinlet_grab_triscale(final_disp, &params, orig_data.co, location, grab_delta);
BKE_kelvinlet_grab_triscale(final_disp, &params, orig_co, location, grab_delta);
mul_v3_fl(final_disp, bstrength * 20.0f);
break;
}
case BRUSH_ELASTIC_DEFORM_SCALE:
BKE_kelvinlet_scale(
final_disp, &params, orig_data.co, location, ss->cache->sculpt_normal_symm);
BKE_kelvinlet_scale(final_disp, &params, orig_co, location, ss->cache->sculpt_normal_symm);
break;
case BRUSH_ELASTIC_DEFORM_TWIST:
BKE_kelvinlet_twist(
final_disp, &params, orig_data.co, location, ss->cache->sculpt_normal_symm);
BKE_kelvinlet_twist(final_disp, &params, orig_co, location, ss->cache->sculpt_normal_symm);
break;
}
@ -4552,6 +4563,16 @@ static void do_elastic_deform_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, in
sculpt_project_v3_normal_align(ss, ss->cache->normal_weight, grab_delta);
}
if (brush->flag2 & BRUSH_USE_SURFACE_FALLOFF) {
if (SCULPT_stroke_is_first_brush_step_of_symmetry_pass(ss->cache)) {
const int symm_pass = ss->cache->mirror_symmetry_pass;
float location[3];
flip_v3_v3(location, SCULPT_active_vertex_co_get(ss), symm_pass);
int v = SCULPT_nearest_vertex_get(sd, ob, location, ss->cache->initial_radius, false);
ss->cache->geodesic_dists[symm_pass] = SCULPT_geodesic_from_vertex(ob, v, FLT_MAX);
}
}
SculptThreadedTaskData data = {
.sd = sd,
.ob = ob,