huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-30 23:19:49 +00:00
Code Issues Wiki Activity

Make brush size in draw tools not affect the draw tiles mode

Browse source 
We could change it again if we implement it in a non-confusing way
This commit is contained in:
Emmanouil Papadeas 2024-12-14 16:05:51 +02:00
parent 18e9e2ec56
commit 02d1900dc2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Tools/BaseDraw.gd
View file

@ -212,8 +212,7 @@ func update_brush() -> void:
$DensityValueSlider.visible = _brush.type not in IMAGE_BRUSHES $DensityValueSlider.visible = _brush.type not in IMAGE_BRUSHES
$ColorInterpolation.visible = _brush.type in IMAGE_BRUSHES $ColorInterpolation.visible = _brush.type in IMAGE_BRUSHES
$RotationOptions.visible = _brush.type in IMAGE_BRUSHES $RotationOptions.visible = _brush.type in IMAGE_BRUSHES
var canvas_indicators := Global.canvas.indicators Global.canvas.indicators.queue_redraw()
canvas_indicators.queue_redraw()
func update_random_image() -> void: func update_random_image() -> void:
@ -378,6 +377,8 @@ func _prepare_tool() -> void:
func _draw_tool(pos: Vector2) -> PackedVector2Array: func _draw_tool(pos: Vector2) -> PackedVector2Array:
if !Global.current_project.layers[Global.current_project.current_layer].can_layer_get_drawn(): if !Global.current_project.layers[Global.current_project.current_layer].can_layer_get_drawn():
return PackedVector2Array() # empty fallback return PackedVector2Array() # empty fallback
if Tools.is_placing_tiles():
return _compute_draw_tool_pixel(pos)
match _brush.type: match _brush.type:
Brushes.PIXEL: Brushes.PIXEL:
return _compute_draw_tool_pixel(pos) return _compute_draw_tool_pixel(pos)
@ -428,9 +429,12 @@ func draw_fill_gap(start: Vector2i, end: Vector2i) -> void:
## Compute the array of coordinates that should be drawn ## Compute the array of coordinates that should be drawn
func _compute_draw_tool_pixel(pos: Vector2) -> PackedVector2Array: func _compute_draw_tool_pixel(pos: Vector2) -> PackedVector2Array:
var brush_size := _brush_size_dynamics
if Tools.is_placing_tiles():
brush_size = 1
var result := PackedVector2Array() var result := PackedVector2Array()
var start := pos - Vector2.ONE * (_brush_size_dynamics >> 1) var start := pos - Vector2.ONE * (brush_size >> 1)
var end := start + Vector2.ONE * _brush_size_dynamics var end := start + Vector2.ONE * brush_size
for y in range(start.y, end.y): for y in range(start.y, end.y):
for x in range(start.x, end.x): for x in range(start.x, end.x):
result.append(Vector2(x, y)) result.append(Vector2(x, y))