edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

paint: tweak brush hardness

Browse Source
This commit is contained in:
luboslenco
2026-03-30 18:30:48 +02:00
parent 1c90c6a073
commit 75f7eaeb52
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/context.c
+1 -1
View File
@@ -175,7 +175,7 @@ void context_init() {
context_raw->color_picker_previous_tool = TOOL_TYPE_BRUSH;
context_raw->brush_radius = 0.5;
context_raw->brush_radius_handle->f = 0.5;
context_raw->brush_hardness = 0.8;
context_raw->brush_hardness = 1.0;
}
bool context_use_deferred() {
paint/sources/make_paint.c
+8 -9
View File
@@ -442,10 +442,9 @@ node_shader_context_t *make_paint_run(material_t *data, material_context_t *matc
make_particle_mask(kong);
}
else { // Brush cursor mask
node_shader_write_frag(kong, "var str: float = clamp((constants.brush_radius - dist) * constants.brush_hardness * 400.0, 0.0, 1.0) * opacity;");
// node_shader_write_frag(kong, "var str: float = pow(clamp(1.0 - (dist / constants.brush_radius), 0.0, 1.0), 1.0 - constants.brush_hardness) *
// opacity;"); node_shader_write_frag(kong, "var t: float = clamp(dist / constants.brush_radius, 0.0, 1.0); var falloff: float = 1.0 -
// smoothstep(0.0, 1.0, t); var str: float = pow(falloff, 1.0 / max(constants.brush_hardness, 0.01)) * opacity;");
node_shader_write_frag(kong, "var t: float = dist / constants.brush_radius;");
node_shader_write_frag(kong, "var t2: float = clamp((t - constants.brush_hardness) / max(1.0 - constants.brush_hardness, 0.001), 0.0, 1.0);");
node_shader_write_frag(kong, "var str: float = (1.0 - t2 * t2 * (3.0 - 2.0 * t2)) * opacity;");
}
// Manual blending to preserve memory
@@ -455,8 +454,8 @@ node_shader_context_t *make_paint_run(material_t *data, material_context_t *matc
node_shader_write_frag(kong, "sample_tc.y = 1.0 - sample_tc.y;");
node_shader_add_texture(kong, "paintmask", NULL);
node_shader_write_frag(kong, "var sample_mask: float = sample_lod(paintmask, sampler_linear, sample_tc, 0.0).r;");
node_shader_write_frag(kong, "str = max(str, sample_mask);");
// node_shader_write_frag(kong, "str = clamp(str + sample_mask, 0.0, 1.0);");
node_shader_write_frag(kong, "var base_str: float = max(str, sample_mask);");
node_shader_write_frag(kong, "str = base_str + str * (1.0 - base_str) * 0.1;");
node_shader_add_texture(kong, "texpaint_undo", "_texpaint_undo");
node_shader_write_frag(kong, "var sample_undo: float4 = sample_lod(texpaint_undo, sampler_linear, sample_tc, 0.0);");
@@ -494,7 +493,7 @@ node_shader_context_t *make_paint_run(material_t *data, material_context_t *matc
node_shader_write_frag(kong, "matid = 0.0;");
}
else if (context_raw->tool == TOOL_TYPE_PARTICLE || decal || context_raw->brush_mask_image != NULL) {
node_shader_write_frag(kong, string("output[0] = float4(%s, max(str, sample_undo.a));",
node_shader_write_frag(kong, string("output[0] = float4(%s, str + sample_undo.a * (1.0 - str));",
make_material_blend_mode(kong, context_raw->brush_blending, "sample_undo.rgb", "basecol", "str")));
}
else {
@@ -503,7 +502,7 @@ node_shader_context_t *make_paint_run(material_t *data, material_context_t *matc
make_material_blend_mode(kong, context_raw->brush_blending, "sample_undo.rgb", "basecol", "opacity")));
}
else {
node_shader_write_frag(kong, string("output[0] = float4(%s, max(str, sample_undo.a));",
node_shader_write_frag(kong, string("output[0] = float4(%s, str + sample_undo.a * (1.0 - str));",
make_material_blend_mode(kong, context_raw->brush_blending, "sample_undo.rgb", "basecol", "opacity")));
}
}
@@ -544,7 +543,7 @@ node_shader_context_t *make_paint_run(material_t *data, material_context_t *matc
make_material_blend_mode(kong, context_raw->brush_blending, "sample_undo.rgb", "basecol", "str")));
}
else {
node_shader_write_frag(kong, string("output[0] = float4(%s, max(str, sample_undo.a));",
node_shader_write_frag(kong, string("output[0] = float4(%s, str + sample_undo.a * (1.0 - str));",
make_material_blend_mode(kong, context_raw->brush_blending, "sample_undo.rgb", "basecol", "str")));
}
}
paint/sources/uniforms_ext.c
+1 -1
View File
@@ -84,7 +84,7 @@ f32 uniforms_ext_f32_link(object_t *object, material_data_t *mat, char *link) {
if (context_raw->tool != TOOL_TYPE_BRUSH && context_raw->tool != TOOL_TYPE_ERASER && context_raw->tool != TOOL_TYPE_CLONE && !decal_mask) {
return 1.0;
}
f32 val = context_raw->brush_hardness * context_raw->brush_nodes_hardness;
f32 val = fmaxf((context_raw->brush_hardness * context_raw->brush_nodes_hardness) - 0.02, 0.0);
if (config_raw->pressure_hardness && pen_down("tip")) {
val *= pen_pressure * config_raw->pressure_sensitivity;
}
paint/sources/util_render.c
+1 -1
View File
@@ -316,7 +316,7 @@ void util_render_make_brush_preview() {
f32 _brush_hardness = context_raw->brush_hardness;
context_raw->brush_radius = 0.33;
context_raw->brush_opacity = 1.0;
context_raw->brush_hardness = 0.8;
context_raw->brush_hardness = 1.0;
f32 _x = context_raw->paint_vec.x;
f32 _y = context_raw->paint_vec.y;
f32 _last_x = context_raw->last_paint_vec_x;