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

Remove drawn_rect from Selection.gd and use draw_preview() in RectSelect.gd instead

Browse source
This commit is contained in:
Manolis Papadeas 2021-05-04 19:26:06 +03:00
parent 5f84629144
commit ea8bfcd25d
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Tools/SelectionTools/RectSelect.gd
View file

@ -32,21 +32,30 @@ func draw_move(position : Vector2) -> void:
_start_pos += position - _offset _start_pos += position - _offset
_rect = _get_result_rect(_start_pos, position) _rect = _get_result_rect(_start_pos, position)
_set_cursor_text(_rect) _set_cursor_text(_rect)
Global.canvas.selection.drawn_rect = _rect
Global.canvas.selection.update()
_offset = position _offset = position
func draw_end(position : Vector2) -> void: func draw_end(position : Vector2) -> void:
.draw_end(position) .draw_end(position)
_rect = Rect2(0, 0, 0, 0) _rect = Rect2(0, 0, 0, 0)
Global.canvas.selection.drawn_rect = _rect
Global.canvas.selection.update()
_square = false _square = false
_expand_from_center = false _expand_from_center = false
_displace_origin = false _displace_origin = false
func draw_preview() -> void:
if !_move:
var canvas : Node2D = Global.canvas.previews
var _position := canvas.position
var _scale := canvas.scale
if Global.mirror_view:
_position.x = _position.x + Global.current_project.size.x
_scale.x = -1
canvas.draw_set_transform(_position, canvas.rotation, _scale)
canvas.draw_rect(_rect, Color.black, false)
canvas.draw_set_transform(canvas.position, canvas.rotation, canvas.scale)
func apply_selection(_position) -> void: func apply_selection(_position) -> void:
if !_add and !_subtract and !_intersect: if !_add and !_subtract and !_intersect:
Global.canvas.selection.clear_selection() Global.canvas.selection.clear_selection()

2
src/UI/Canvas/Selection.gd
View file

@ -54,7 +54,6 @@ var original_offset := Vector2.ZERO
var preview_image := Image.new() var preview_image := Image.new()
var preview_image_texture := ImageTexture.new() var preview_image_texture := ImageTexture.new()
var undo_data : Dictionary var undo_data : Dictionary
var drawn_rect := Rect2(0, 0, 0, 0)
var gizmos := [] # Array of Gizmos var gizmos := [] # Array of Gizmos
var dragged_gizmo : Gizmo = null var dragged_gizmo : Gizmo = null
var prev_angle := 0 var prev_angle := 0
@ -143,7 +142,6 @@ func _draw() -> void:
_position.x = _position.x + Global.current_project.size.x _position.x = _position.x + Global.current_project.size.x
_scale.x = -1 _scale.x = -1
draw_set_transform(_position, rotation, _scale) draw_set_transform(_position, rotation, _scale)
draw_rect(drawn_rect, Color.black, false)
if big_bounding_rectangle.size != Vector2.ZERO: if big_bounding_rectangle.size != Vector2.ZERO:
for gizmo in gizmos: # Draw gizmos for gizmo in gizmos: # Draw gizmos
draw_rect(gizmo.rect, Color.black) draw_rect(gizmo.rect, Color.black)