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

paint: fix decal mask paint

Browse Source
This commit is contained in:
luboslenco
2026-07-16 19:35:34 +02:00
parent 5533b1db67
commit a232db8e9b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/context.c
+4
View File
@@ -437,6 +437,10 @@ bool context_is_decal_mask_paint() {
operator_shortcut(string("%s+%s", any_map_get(g_keymap, "decal_mask"), any_map_get(g_keymap, "action_paint")), SHORTCUT_TYPE_DOWN);
}
bool context_is_decal_mask_paint_pass() {
return context_is_decal_mask() && (mouse_down("left") || g_context->brush_time > 0);
}
bool context_is_floating_toolbar() {
// Header is off -> floating toolbar
return g_config->layout->buffer[LAYOUT_SIZE_HEADER] == 0 || (!base_view3d_show && ui_view2d_show);
paint/sources/functions.h
+1
View File
@@ -259,6 +259,7 @@ bool context_in_browser();
bool context_is_decal();
bool context_is_decal_mask();
bool context_is_decal_mask_paint();
bool context_is_decal_mask_paint_pass();
bool context_is_brush_camera_align();
bool context_is_floating_toolbar();
void context_set_viewport_mode(viewport_mode_t mode);
paint/sources/uniforms.c
+4 -5
View File
@@ -13,9 +13,8 @@ i32 uniforms_ext_i32_link(object_t *object, material_data_t *mat, char *link) {
f32 uniforms_ext_f32_link(object_t *object, material_data_t *mat, char *link) {
if (string_equals(link, "_brush_radius")) {
bool decal = context_is_decal();
bool decal_mask =
decal && operator_shortcut(string("%s+%s", any_map_get(g_keymap, "decal_mask"), any_map_get(g_keymap, "action_paint")), SHORTCUT_TYPE_DOWN);
bool decal = context_is_decal();
bool decal_mask = context_is_decal_mask_paint_pass();
f32 brush_decal_mask_radius = g_context->brush_decal_mask_radius;
bool paint2d = g_context->paint2d || g_context->paint2d_view;
brush_decal_mask_radius *= 2.0;
@@ -73,7 +72,7 @@ f32 uniforms_ext_f32_link(object_t *object, material_data_t *mat, char *link) {
return val;
}
else if (string_equals(link, "_brush_hardness")) {
bool decal_mask = context_is_decal_mask_paint();
bool decal_mask = context_is_decal_mask_paint_pass();
if (g_context->tool != TOOL_TYPE_BRUSH && g_context->tool != TOOL_TYPE_ERASER && g_context->tool != TOOL_TYPE_CLONE && !decal_mask) {
return 1.0;
}
@@ -299,7 +298,7 @@ vec4_t uniforms_ext_vec4_link(object_t *object, material_data_t *mat, char *link
return v;
}
else if (string_equals(link, "_decal_mask")) {
bool decal_mask = context_is_decal_mask_paint();
bool decal_mask = context_is_decal_mask_paint_pass();
f32 val = (g_context->brush_radius * g_context->brush_nodes_radius) / 15.0;
f32 scale2d = (900 / (float)base_h()) * g_config->window_scale;
val *= g_context->paint2d ? 0.5 * 0.5 * scale2d * ui_view2d_pan_scale : scale2d * 2.0;