huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-22 13:33:13 +00:00
Code Issues Wiki Activity

Fix wrong color picker shortcut in shape tools and remove unneeded method

Browse source
This commit is contained in:
Emmanouil Papadeas 2022-07-04 03:09:43 +03:00
parent feb68a21a5
commit 55935bcfd2
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Tools/ShapeDrawer.gd
View file

@ -84,7 +84,7 @@ func _input(event: InputEvent) -> void:
func draw_start(position: Vector2) -> void: func draw_start(position: Vector2) -> void:
.draw_start(position) .draw_start(position)
if Input.is_action_pressed("shape_displace"): if Input.is_action_pressed("draw_color_picker"):
_picking_color = true _picking_color = true
_pick_color(position) _pick_color(position)
return return
@ -101,8 +101,8 @@ func draw_start(position: Vector2) -> void:
func draw_move(position: Vector2) -> void: func draw_move(position: Vector2) -> void:
.draw_move(position) .draw_move(position)
if _picking_color: # Still return even if we released Alt if _picking_color: # Still return even if we released draw_color_picker (Alt)
if Input.is_action_pressed("shape_displace"): if Input.is_action_pressed("draw_color_picker"):
_pick_color(position) _pick_color(position)
return return
@ -165,7 +165,7 @@ func _draw_shape(origin: Vector2, dest: Vector2) -> void:
# Given an origin point and destination point, returns a rect representing # Given an origin point and destination point, returns a rect representing
# where the shape will be drawn and what is its size # where the shape will be drawn and what is its size
func _get_result_rect(origin: Vector2, dest: Vector2) -> Rect2: func _get_result_rect(origin: Vector2, dest: Vector2) -> Rect2:
var rect := Rect2(Vector2.ZERO, Vector2.ZERO) var rect := Rect2()
# Center the rect on the mouse # Center the rect on the mouse
if Input.is_action_pressed("shape_center"): if Input.is_action_pressed("shape_center"):
@ -198,19 +198,6 @@ func _get_points(size: Vector2) -> PoolVector2Array:
return _get_shape_points_filled(size) if _fill else _get_shape_points(size) return _get_shape_points_filled(size) if _fill else _get_shape_points(size)
func _outline_point(p: Vector2, thickness: int = 1, include_p: bool = true) -> Array:
var array := []
if thickness != 1:
var t_of = thickness - 1
for x in range(-t_of, thickness):
for y in range(-t_of, thickness):
if x == 0 and y == 0 and not include_p:
continue
array.append(p + Vector2(x, y))
return array
func _set_cursor_text(rect: Rect2) -> void: func _set_cursor_text(rect: Rect2) -> void:
cursor_text = "%s, %s" % [rect.position.x, rect.position.y] cursor_text = "%s, %s" % [rect.position.x, rect.position.y]
cursor_text += " -> %s, %s" % [rect.end.x - 1, rect.end.y - 1] cursor_text += " -> %s, %s" % [rect.end.x - 1, rect.end.y - 1]