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

Fixed some issues with perspective lines and removed unneeded code from the rotate image dialog (#979)

Browse source 
* fix drag gizmo of perspectice lines

* fix more stuff
This commit is contained in:
Variable 2024-01-22 03:09:57 +05:00 committed by GitHub
parent bec7ceb974
commit ddce0393dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/UI/Dialogs/ImageEffects/RotateImage.gd
View file

@ -250,14 +250,13 @@ func _on_Indicator_draw() -> void:
else: else:
conversion_scale = ratio.y conversion_scale = ratio.y
var pivot_position := pivot * conversion_scale var pivot_position := pivot * conversion_scale
var width = 1 pivot_indicator.draw_arc(pivot_position, 2, 0, 360, 360, Color.YELLOW)
pivot_indicator.draw_arc(pivot_position, 2, 0, 360, 360, Color.YELLOW, width) pivot_indicator.draw_arc(pivot_position, 6, 0, 360, 360, Color.WHITE)
pivot_indicator.draw_arc(pivot_position, 6, 0, 360, 360, Color.WHITE, width)
pivot_indicator.draw_line( pivot_indicator.draw_line(
pivot_position - Vector2.UP * 10, pivot_position - Vector2.DOWN * 10, Color.WHITE, width pivot_position - Vector2.UP * 10, pivot_position - Vector2.DOWN * 10, Color.WHITE
) )
pivot_indicator.draw_line( pivot_indicator.draw_line(
pivot_position - Vector2.RIGHT * 10, pivot_position - Vector2.LEFT * 10, Color.WHITE, width pivot_position - Vector2.RIGHT * 10, pivot_position - Vector2.LEFT * 10, Color.WHITE
) )

10
src/UI/PerspectiveEditor/PerspectiveLine.gd
View file

@ -29,9 +29,11 @@ func deserialize(data: Dictionary):
func initiate(data: Dictionary, vanishing_point: Node): func initiate(data: Dictionary, vanishing_point: Node):
_vanishing_point = vanishing_point _vanishing_point = vanishing_point
width = LINE_WIDTH / Global.camera.zoom.x
Global.canvas.add_child(self) Global.canvas.add_child(self)
deserialize(data) deserialize(data)
# a small delay is needed for Global.camera.zoom to have correct value
await get_tree().process_frame
width = LINE_WIDTH / Global.camera.zoom.x
refresh() refresh()
@ -126,6 +128,7 @@ func try_rotate_scale():
func _draw() -> void: func _draw() -> void:
width = LINE_WIDTH / Global.camera.zoom.x
var mouse_point := Global.canvas.current_pixel var mouse_point := Global.canvas.current_pixel
var arc_points := PackedVector2Array() var arc_points := PackedVector2Array()
draw_circle(points[0], CIRCLE_RAD / Global.camera.zoom.x, default_color) # Starting circle draw_circle(points[0], CIRCLE_RAD / Global.camera.zoom.x, default_color) # Starting circle
@ -150,8 +153,9 @@ func _draw() -> void:
arc_points.append(points[1]) arc_points.append(points[1])
for point in arc_points: for point in arc_points:
draw_arc(point, CIRCLE_RAD * 2 / Global.camera.zoom.x, 0, 360, 360, default_color, 0.5) # if we put width <= -1, then the arc line will automatically adjust itself to remain thin
# in 0.x this behavior was achieved at width <= 1
draw_arc(point, CIRCLE_RAD * 2 / Global.camera.zoom.x, 0, 360, 360, default_color)
width = LINE_WIDTH / Global.camera.zoom.x
if is_hidden: # Hidden line if is_hidden: # Hidden line
return return

2
src/UI/PerspectiveEditor/VanishingPoint.gd
View file

@ -76,7 +76,7 @@ func _input(_event: InputEvent):
Input.is_action_just_pressed("left_mouse") Input.is_action_just_pressed("left_mouse")
and Global.can_draw and Global.can_draw
and Global.has_focus and Global.has_focus
and mouse_point.distance_to(start) < Global.camera.zoom.x * 8 and mouse_point.distance_to(start) < 8 / Global.camera.zoom.x
): ):
if ( if (
!Rect2(Vector2.ZERO, project_size).has_point(Global.canvas.current_pixel) !Rect2(Vector2.ZERO, project_size).has_point(Global.canvas.current_pixel)