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

Canvas Line2D doesn't get freed and re-created

Browse source 
Make Line2D have the same position for both of its points so it's invisible when the user is not making a straight line
This commit is contained in:
OverloadedOrama 2020-01-15 22:31:02 +02:00
parent 7a3f3eb4f9
commit bac3fdcad6
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Scripts/Canvas.gd
View file

@ -69,6 +69,13 @@ func _ready() -> void:
if Global.canvases[0] == self:
camera_zoom()
line_2d = Line2D.new()
line_2d.width = 0.5
line_2d.default_color = Color.darkgray
line_2d.add_point(previous_mouse_pos_for_lines)
line_2d.add_point(previous_mouse_pos_for_lines)
add_child(line_2d)
func camera_zoom() -> void:
# Set camera zoom based on the sprite size
var bigger = max(size.x, size.y)
@ -278,21 +285,13 @@ func _input(event : InputEvent) -> void:
Global.update_right_custom_brush()
if Global.can_draw && Global.has_focus && Input.is_action_just_pressed("shift") && (["Pencil", "Eraser", "LightenDarken"].has(Global.current_left_tool) || ["Pencil", "Eraser", "LightenDarken"].has(Global.current_right_tool)):
if is_instance_valid(line_2d):
line_2d.queue_free()
line_2d = Line2D.new()
line_2d.width = 0.5
line_2d.default_color = Color.darkgray
line_2d.add_point(previous_mouse_pos_for_lines)
line_2d.add_point(mouse_pos)
add_child(line_2d)
is_making_line = true
line_2d.set_point_position(0, previous_mouse_pos_for_lines)
elif Input.is_action_just_released("shift"):
is_making_line = false
if is_instance_valid(line_2d):
line_2d.queue_free()
line_2d.set_point_position(1, line_2d.points[0])
if is_making_line && is_instance_valid(line_2d):
if is_making_line:
var point0 : Vector2 = line_2d.points[0]
var angle := stepify(rad2deg(mouse_pos.angle_to_point(point0)), 0.01)
if Input.is_action_pressed("ctrl"):

6
Scripts/SelectionRectangle.gd
View file

@ -63,8 +63,7 @@ func _process(delta : float) -> void:
update()
# Makes line2d invisible
if is_instance_valid(Global.canvas.line_2d): # Checks to see if line_2d object still exists
Global.canvas.line_2d.default_color = Color(0, 0, 0, 0)
Global.canvas.line_2d.default_color = Color(0, 0, 0, 0)
else:
get_parent().get_parent().mouse_default_cursor_shape = Input.CURSOR_ARROW
@ -104,8 +103,7 @@ func _process(delta : float) -> void:
Global.canvas.handle_redo("Rectangle Select") # Redo
# Makes line2d visible
if is_instance_valid(Global.canvas.line_2d): # Checks to see if line_2d object still exists
Global.canvas.line_2d.default_color = Color.darkgray
Global.canvas.line_2d.default_color = Color.darkgray
if Global.selected_pixels.size() > 0:
# Handle copy