Differential D16083 Diff 56395 source/blender/editors/sculpt_paint/sculpt_smooth.c

Changeset View

Standalone View

source/blender/editors/sculpt_paint/sculpt_smooth.c

Show First 20 Lines • Show All 211 Lines • ▼ Show 20 Lines	static void do_enhance_details_brush_task_cb_ex(void *__restrict userdata,
float bstrength = ss->cache->bstrength;		float bstrength = ss->cache->bstrength;
CLAMP(bstrength, -1.0f, 1.0f);		CLAMP(bstrength, -1.0f, 1.0f);

SculptBrushTest test;		SculptBrushTest test;
SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(		SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(
ss, &test, data->brush->falloff_shape);		ss, &test, data->brush->falloff_shape);

const int thread_id = BLI_task_parallel_thread_id(tls);		const int thread_id = BLI_task_parallel_thread_id(tls);
		AutomaskingNodeData automask_data;
		SCULPT_automasking_node_begin(
		data->ob, ss, ss->cache->automasking, &automask_data, data->nodes[n]);

BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {		BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {
if (!sculpt_brush_test_sq_fn(&test, vd.co)) {		if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
continue;		continue;
}		}

		SCULPT_automasking_node_update(ss, &automask_data, &vd);

const float fade = bstrength * SCULPT_brush_strength_factor(ss,		const float fade = bstrength * SCULPT_brush_strength_factor(ss,
brush,		brush,
vd.co,		vd.co,
sqrtf(test.dist),		sqrtf(test.dist),
vd.no,		vd.no,
vd.fno,		vd.fno,
vd.mask ? *vd.mask : 0.0f,		vd.mask ? *vd.mask : 0.0f,
vd.vertex,		vd.vertex,
thread_id);		thread_id,
		&automask_data);

float disp[3];		float disp[3];
madd_v3_v3v3fl(disp, vd.co, ss->cache->detail_directions[vd.index], fade);		madd_v3_v3v3fl(disp, vd.co, ss->cache->detail_directions[vd.index], fade);
SCULPT_clip(sd, ss, vd.co, disp);		SCULPT_clip(sd, ss, vd.co, disp);

if (vd.mvert) {		if (vd.mvert) {
BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);		BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}		}
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Lines	static void do_smooth_brush_task_cb_ex(void *__restrict userdata,

CLAMP(bstrength, 0.0f, 1.0f);		CLAMP(bstrength, 0.0f, 1.0f);

SculptBrushTest test;		SculptBrushTest test;
SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(		SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(
ss, &test, data->brush->falloff_shape);		ss, &test, data->brush->falloff_shape);

const int thread_id = BLI_task_parallel_thread_id(tls);		const int thread_id = BLI_task_parallel_thread_id(tls);
		AutomaskingNodeData automask_data;
		SCULPT_automasking_node_begin(
		data->ob, ss, ss->cache->automasking, &automask_data, data->nodes[n]);

BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {		BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {
if (!sculpt_brush_test_sq_fn(&test, vd.co)) {		if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
continue;		continue;
}		}

		SCULPT_automasking_node_update(ss, &automask_data, &vd);

const float fade = bstrength * SCULPT_brush_strength_factor(		const float fade = bstrength * SCULPT_brush_strength_factor(
ss,		ss,
brush,		brush,
vd.co,		vd.co,
sqrtf(test.dist),		sqrtf(test.dist),
vd.no,		vd.no,
vd.fno,		vd.fno,
smooth_mask ? 0.0f : (vd.mask ? *vd.mask : 0.0f),		smooth_mask ? 0.0f : (vd.mask ? *vd.mask : 0.0f),
vd.vertex,		vd.vertex,
thread_id);		thread_id,
		&automask_data);
if (smooth_mask) {		if (smooth_mask) {
float val = SCULPT_neighbor_mask_average(ss, vd.vertex) - *vd.mask;		float val = SCULPT_neighbor_mask_average(ss, vd.vertex) - *vd.mask;
val = fade bstrength;		val = fade bstrength;
*vd.mask += val;		*vd.mask += val;
CLAMP(*vd.mask, 0.0f, 1.0f);		CLAMP(*vd.mask, 0.0f, 1.0f);
}		}
else {		else {
float avg[3], val[3];		float avg[3], val[3];
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Lines	static void SCULPT_do_surface_smooth_brush_laplacian_task_cb_ex(
SculptOrigVertData orig_data;		SculptOrigVertData orig_data;

SculptBrushTest test;		SculptBrushTest test;
SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(		SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(
ss, &test, data->brush->falloff_shape);		ss, &test, data->brush->falloff_shape);
const int thread_id = BLI_task_parallel_thread_id(tls);		const int thread_id = BLI_task_parallel_thread_id(tls);

SCULPT_orig_vert_data_init(&orig_data, data->ob, data->nodes[n], SCULPT_UNDO_COORDS);		SCULPT_orig_vert_data_init(&orig_data, data->ob, data->nodes[n], SCULPT_UNDO_COORDS);
		AutomaskingNodeData automask_data;
		SCULPT_automasking_node_begin(
		data->ob, ss, ss->cache->automasking, &automask_data, data->nodes[n]);

BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {		BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {
SCULPT_orig_vert_data_update(&orig_data, &vd);		SCULPT_orig_vert_data_update(&orig_data, &vd);
if (!sculpt_brush_test_sq_fn(&test, vd.co)) {		if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
continue;		continue;
}		}

		SCULPT_automasking_node_update(ss, &automask_data, &vd);

const float fade = bstrength * SCULPT_brush_strength_factor(ss,		const float fade = bstrength * SCULPT_brush_strength_factor(ss,
brush,		brush,
vd.co,		vd.co,
sqrtf(test.dist),		sqrtf(test.dist),
vd.no,		vd.no,
vd.fno,		vd.fno,
vd.mask ? *vd.mask : 0.0f,		vd.mask ? *vd.mask : 0.0f,
vd.vertex,		vd.vertex,
thread_id);		thread_id,
		&automask_data);

float disp[3];		float disp[3];
SCULPT_surface_smooth_laplacian_step(		SCULPT_surface_smooth_laplacian_step(
ss, disp, vd.co, ss->cache->surface_smooth_laplacian_disp, vd.vertex, orig_data.co, alpha);		ss, disp, vd.co, ss->cache->surface_smooth_laplacian_disp, vd.vertex, orig_data.co, alpha);
madd_v3_v3fl(vd.co, disp, clamp_f(fade, 0.0f, 1.0f));		madd_v3_v3fl(vd.co, disp, clamp_f(fade, 0.0f, 1.0f));
if (vd.mvert) {		if (vd.mvert) {
BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);		BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}		}
Show All 11 Lines	static void SCULPT_do_surface_smooth_brush_displace_task_cb_ex(
const float beta = brush->surface_smooth_current_vertex;		const float beta = brush->surface_smooth_current_vertex;

PBVHVertexIter vd;		PBVHVertexIter vd;

SculptBrushTest test;		SculptBrushTest test;
SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(		SculptBrushTestFn sculpt_brush_test_sq_fn = SCULPT_brush_test_init_with_falloff_shape(
ss, &test, data->brush->falloff_shape);		ss, &test, data->brush->falloff_shape);
const int thread_id = BLI_task_parallel_thread_id(tls);		const int thread_id = BLI_task_parallel_thread_id(tls);
		AutomaskingNodeData automask_data;
		SCULPT_automasking_node_begin(
		data->ob, ss, ss->cache->automasking, &automask_data, data->nodes[n]);

BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {		BKE_pbvh_vertex_iter_begin (ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE) {
if (!sculpt_brush_test_sq_fn(&test, vd.co)) {		if (!sculpt_brush_test_sq_fn(&test, vd.co)) {
continue;		continue;
}		}

		SCULPT_automasking_node_update(ss, &automask_data, &vd);

const float fade = bstrength * SCULPT_brush_strength_factor(ss,		const float fade = bstrength * SCULPT_brush_strength_factor(ss,
brush,		brush,
vd.co,		vd.co,
sqrtf(test.dist),		sqrtf(test.dist),
vd.no,		vd.no,
vd.fno,		vd.fno,
vd.mask ? *vd.mask : 0.0f,		vd.mask ? *vd.mask : 0.0f,
vd.vertex,		vd.vertex,
thread_id);		thread_id,
		&automask_data);
SCULPT_surface_smooth_displace_step(		SCULPT_surface_smooth_displace_step(
ss, vd.co, ss->cache->surface_smooth_laplacian_disp, vd.vertex, beta, fade);		ss, vd.co, ss->cache->surface_smooth_laplacian_disp, vd.vertex, beta, fade);
}		}
BKE_pbvh_vertex_iter_end;		BKE_pbvh_vertex_iter_end;
}		}

void SCULPT_do_surface_smooth_brush(Sculpt sd, Object ob, PBVHNode **nodes, int totnode)		void SCULPT_do_surface_smooth_brush(Sculpt sd, Object ob, PBVHNode **nodes, int totnode)
{		{
Show All 19 Lines