fix: prevent drawing diagonal blocks if others edges intersect cell

Author: sphamba

lua/smear_cursor/config.lua

@@ -121,12 +121,14 @@ M.max_slope_horizontal = (1 / 3) / 1.5
 M.min_slope_vertical = 2 * 1.5
 M.max_angle_difference_diagonal = math.pi / 16 -- radians
 M.max_offset_diagonal = 0.2 -- cell widths
+M.min_shade_no_diagonal = 0.2 -- 0: less diagonal blocks, 1: more diagonal blocks
+M.min_shade_no_diagonal_vertical_bar = 0.5
 
 M.color_levels = 16 -- Minimum 1, don't set manually if using cterm_cursor_colors
 M.gamma = 2.2 -- For color blending
 M.max_shade_no_matrix = 0.75 -- 0: more overhangs, 1: more matrices
 M.matrix_pixel_threshold = 0.7 -- 0: all pixels, 1: no pixel
-M.matrix_pixel_threshold_vertical_bar = 0.3 -- 0: all pixels, 1: no pixel
+M.matrix_pixel_threshold_vertical_bar = 0.25 -- 0: all pixels, 1: no pixel
 M.matrix_pixel_min_factor = 0.5 -- 0: all pixels, 1: no pixel
 M.volume_reduction_exponent = 0.3 -- 0: no reduction, 1: full reduction
 M.minimum_volume_factor = 0.7 -- 0: no limit, 1: no reduction

lua/smear_cursor/draw.lua

@@ -713,6 +713,8 @@ M.draw_quad = function(corners, target_position, vertical_bar)
 	bulge_above = not bulge_above
 	corners = ensure_clockwise(corners)
 	local G = precompute_quad_geometry(corners)
+	local min_shade_no_diagonal = vertical_bar and config.min_shade_no_diagonal_vertical_bar
+		or config.min_shade_no_diagonal
 
 	for row = G.top, G.bottom do
 		for col = G.left, G.right do
@@ -732,18 +734,22 @@ M.draw_quad = function(corners, target_position, vertical_bar)
 			for i = 1, 4 do
 				local intersection = get_edge_cell_intersection(i, row, col, G)
 				local edge_type = G.edge_types[i]
-				if edge_type == LEFT_DIAGONAL or edge_type == RIGHT_DIAGONAL then edge_type = DIAGONAL end
-				if edge_type ~= DIAGONAL and intersection >= 1 then goto continue end
 
-				if edge_type == DIAGONAL then
+				if edge_type == LEFT_DIAGONAL or edge_type == RIGHT_DIAGONAL then
+					edge_type = DIAGONAL
 					local intersection_low = get_edge_cell_intersection(i, row, col, G, true)
 					if intersection_low >= 1 then goto continue end
-					-- if intersections[DIAGONAL] ~= nil and intersection > 0 then single_diagonal = false end
+					if intersection > min_shade_no_diagonal and intersections[DIAGONAL] ~= nil then
+						single_diagonal = false
+					end
 				else
-					if intersection > 0 then single_diagonal = false end
+					if intersection >= 1 then goto continue end
+					if intersection > min_shade_no_diagonal then single_diagonal = false end
 				end
 
-				if intersections[edge_type] == nil or intersection > intersections[edge_type] then
+				if
+					intersection > 0 and (intersections[edge_type] == nil or intersection > intersections[edge_type])
+				then
 					intersections[edge_type] = intersection
 					if edge_type == DIAGONAL then diagonal_edge_index = i end
 				end