huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 10:59:49 +00:00
Code Issues Wiki Activity

Remove duplicate circle code from Draw.gd

Browse source
This commit is contained in:
Emmanouil Papadeas 2022-09-08 14:02:33 +03:00
parent e7678ef5cc
commit cd0c7ccdb0
1 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Tools/Draw.gd
View file

@ -234,7 +234,6 @@ func _prepare_tool() -> void:
func _prepare_circle_tool(fill: bool) -> void: func _prepare_circle_tool(fill: bool) -> void:
_circle_tool_shortcut = PoolVector2Array()
var circle_tool_map := _create_circle_indicator(_brush_size, fill) var circle_tool_map := _create_circle_indicator(_brush_size, fill)
# Go through that BitMap and build an Array of the "displacement" from the center of the bits # Go through that BitMap and build an Array of the "displacement" from the center of the bits
# that are true. # that are true.
@ -510,33 +509,9 @@ func _create_pixel_indicator(size: int) -> BitMap:
func _create_circle_indicator(size: int, fill := false) -> BitMap: func _create_circle_indicator(size: int, fill := false) -> BitMap:
var bitmap := BitMap.new() _circle_tool_shortcut = PoolVector2Array()
bitmap.create(Vector2.ONE * (size * 2 + 1)) var diameter := Vector2(size, size) * 2 + Vector2.ONE
var position := Vector2(size, size) return _fill_bitmap_with_points(_compute_draw_tool_circle(Vector2(size, size), fill), diameter)
var r := size
var x := -r
var y := 0
var err := 2 - r * 2
var draw := true
if fill:
bitmap.set_bit(position, true)
while x < 0:
if draw:
for i in range(1 if fill else -x, -x + 1):
bitmap.set_bit(position + Vector2(-i, y), true)
bitmap.set_bit(position + Vector2(-y, -i), true)
bitmap.set_bit(position + Vector2(i, -y), true)
bitmap.set_bit(position + Vector2(y, i), true)
draw = not fill
r = err
if r <= y:
y += 1
err += y * 2 + 1
draw = true
if r > x || err > y:
x += 1
err += x * 2 + 1
return bitmap
func _create_line_indicator(indicator: BitMap, start: Vector2, end: Vector2) -> BitMap: func _create_line_indicator(indicator: BitMap, start: Vector2, end: Vector2) -> BitMap: