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

paint: lazy brush fixes

Browse Source
This commit is contained in:
luboslenco
2026-06-02 12:40:51 +02:00
parent 88222b1d83
commit 16136e26a9
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/base.c
+1 -1
View File
@@ -1686,7 +1686,7 @@ void ui_base_render_cursor(void *_) {
draw_filled_rect(mx - 1, my - 1, 2, 2);
mx = g_context->brush_lazy_x * base_w() + base_x();
my = g_context->brush_lazy_y * base_h() + base_y();
f32 radius = g_context->brush_lazy_radius * 180;
f32 radius = g_context->brush_lazy_radius * util_layer_brush_screen_radius() * 3.0 * 2.0 * sys_h();
draw_set_color(0xff666666);
draw_scaled_image(cursor_img, mx - radius / 2.0, my - radius / 2.0, radius, radius);
draw_set_color(0xffffffff);
paint/sources/brush_nodes/input_node.c
+7 -6
View File
@@ -154,10 +154,11 @@ void input_node_update(float_node_t *self) {
}
if (g_context->brush_lazy_radius > 0 && !slot_layer_is_path(g_context->layer)) {
vec4_t v1 = (vec4_t){g_context->brush_lazy_x * sys_w(), g_context->brush_lazy_y * sys_h(), 0.0, 1.0};
vec4_t v2 = (vec4_t){input_node_coords.x * sys_w(), input_node_coords.y * sys_h(), 0.0, 1.0};
f32 d = vec4_dist(v1, v2);
f32 r = g_context->brush_lazy_radius * 85;
f32 aspect = sys_w() / (f32)sys_h();
vec4_t v1 = (vec4_t){g_context->brush_lazy_x * aspect, g_context->brush_lazy_y, 0.0, 1.0};
vec4_t v2 = (vec4_t){input_node_coords.x * aspect, input_node_coords.y, 0.0, 1.0};
f32 d = vec4_dist(v1, v2);
f32 r = g_context->brush_lazy_radius * util_layer_brush_screen_radius() * 3.0;
if (d > r) {
vec4_t v3 = (vec4_t){0.0, 0.0, 0.0, 1.0};
v3 = vec4_sub(v2, v1);
@@ -165,8 +166,8 @@ void input_node_update(float_node_t *self) {
v3 = vec4_mult(v3, 1.0 - g_context->brush_lazy_step);
v3 = vec4_mult(v3, r);
v2 = vec4_add(v1, v3);
input_node_coords.x = v2.x / (float)sys_w();
input_node_coords.y = v2.y / (float)sys_h();
input_node_coords.x = v2.x / aspect;
input_node_coords.y = v2.y;
// Parse brush inputs once on next draw
g_context->painted = -1;
}
paint/sources/util_layer.c
+30 -13
View File
@@ -35,6 +35,25 @@ static f32 bezier_eval(f32 p0, f32 pc, f32 p1, f32 t) {
return t1 * t1 * t1 * p0 + 3.0f * t * t1 * pc + t * t * t * p1;
}
f32 util_layer_brush_screen_radius() {
f32 r_world = g_context->brush_radius * g_context->brush_nodes_radius / 15.0f * 2.0f;
bool on_mesh = math_abs(g_context->posx_picked) < 50.0f && math_abs(g_context->posy_picked) < 50.0f && math_abs(g_context->posz_picked) < 50.0f;
if (!on_mesh) {
return r_world;
}
vec4_t c_w = (vec4_t){g_context->posx_picked, g_context->posy_picked, g_context->posz_picked, 1.0f};
vec4_t right = camera_object_right_world(scene_camera);
vec4_t e_w = vec4_add(c_w, vec4_mult(right, r_world));
f32 cx, cy, ex, ey;
if (!project_to_screen(c_w, &cx, &cy) || !project_to_screen(e_w, &ex, &ey)) {
return r_world;
}
f32 aspect = sys_w() / (f32)sys_h();
f32 dx = (ex - cx) * aspect;
f32 dy = ey - cy;
return sqrtf(dx * dx + dy * dy);
}
static void path_push_camera(f32_array_t *ar) {
vec4_t loc = scene_camera->base->transform->loc;
quat_t rot = scene_camera->base->transform->rot;
@@ -127,20 +146,15 @@ static void path_paint_curved(f32_array_t *points, f32_array_t *points_world, f3
sby[0] = wy0;
sbz[0] = wz0;
slen[0] = 0.0f;
f32 psx = prev_px, psy = prev_py;
for (i32 k = 1; k <= 32; k++) {
f32 kt = k / 32.0f;
sbx[k] = bezier_eval(wx0, wcx, wx1, kt);
sby[k] = bezier_eval(wy0, wcy, wy1, kt);
sbz[k] = bezier_eval(wz0, wcz, wz1, kt);
f32 sx = psx, sy = psy;
project_to_screen((vec4_t){sbx[k], sby[k], sbz[k], 1.0f}, &sx, &sy);
f32 dx = (sx - psx) * (f32)sys_w(), dy = (sy - psy) * (f32)sys_h();
slen[k] = slen[k - 1] + sqrtf(dx * dx + dy * dy);
psx = sx;
psy = sy;
f32 dx = sbx[k] - sbx[k - 1], dy = sby[k] - sby[k - 1], dz = sbz[k] - sbz[k - 1];
slen[k] = slen[k - 1] + sqrtf(dx * dx + dy * dy + dz * dz);
}
i32 n = dot_spacing > 0.5f ? (i32)ceilf(slen[32] / dot_spacing) : 17;
i32 n = dot_spacing > 0.0f ? (i32)ceilf(slen[32] / dot_spacing) : 17;
n = n < 2 ? 2 : n > 64 ? 64 : n;
for (i32 s = 1; s <= n; s++) {
f32 tgt = s / (f32)n * slen[32];
@@ -219,10 +233,11 @@ static void path_paint_straight(f32_array_t *points, f32_array_t *points_world,
project_to_screen((vec4_t){pwx, pwy, pwz, 1.0f}, &ppx, &ppy);
prev_px = ppx;
prev_py = ppy;
f32 dx = (cur_px - ppx) * (f32)sys_w();
f32 dy = (cur_py - ppy) * (f32)sys_h();
f32 len = sqrtf(dx * dx + dy * dy);
i32 n = dot_spacing > 0.5f ? (i32)ceilf(len / dot_spacing) : 17;
f32 dx = cwx - pwx;
f32 dy = cwy - pwy;
f32 dz = cwz - pwz;
f32 len = sqrtf(dx * dx + dy * dy + dz * dz);
i32 n = dot_spacing > 0.0f ? (i32)ceilf(len / dot_spacing) : 17;
n = n < 1 ? 1 : n > 64 ? 64 : n;
g_context->prev_paint_vec_x = ppx;
g_context->prev_paint_vec_y = ppy;
@@ -286,7 +301,9 @@ static void path_repaint(slot_layer_t *l) {
i32 num_camera = points_camera->length / 9;
i32 num_parent = points_parent->length;
bool sphere_mode = g_context->brush_lazy_radius > 0 && g_context->brush_lazy_step > 0;
f32 dot_spacing = sphere_mode ? g_context->brush_lazy_radius * g_context->brush_lazy_step * 85.0f : 0.0f;
// Spacing in world units
f32 r_world = g_context->brush_radius * g_context->brush_nodes_radius / 15.0f * 2.0f;
f32 dot_spacing = sphere_mode ? g_context->brush_lazy_radius * g_context->brush_lazy_step * r_world * 3.0 : 0.0f;
if (l->path_curved && num_world >= 1) {
path_paint_curved(points, points_world, points_camera, points_parent, num_world, num_camera, num_parent, sphere_mode, dot_spacing);