tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 10:24:44 -04:00
Code Issues Projects Releases Wiki Activity

Fix multiple inferring errors

Browse source
This commit is contained in:
Michael Alexsander 2019-12-27 19:00:24 -03:00
parent d6a199c53f
commit a1ed703b56
7 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Rulers/Guides.gd
View file

@ -56,8 +56,8 @@ func _process(delta : float) -> void:
func _draw() -> void:
if has_focus:
var viewport_size := Global.main_viewport.rect_size
var zoom := Global.camera.zoom
var viewport_size: Vector2 = Global.main_viewport.rect_size
var zoom: Vector2 = Global.camera.zoom
if type == TYPE.HORIZONTAL:
draw_set_transform(Vector2(Global.camera.offset.x - (viewport_size.x / 2) * zoom.x, points[0].y + font.get_height() * zoom.x * 2), rotation, zoom * 2)
draw_string(font, Vector2.ZERO, "%spx" % str(round(mouse_pos.y)))
@ -84,4 +84,4 @@ func outside_canvas(undo := false) -> bool:
return false
func point_in_rectangle(p : Vector2, coord1 : Vector2, coord2 : Vector2) -> bool:
return p.x > coord1.x && p.y > coord1.y && p.x < coord2.x && p.y < coord2.y
return p.x > coord1.x && p.y > coord1.y && p.x < coord2.x && p.y < coord2.y

6
Scripts/Rulers/HorizontalRuler.gd
View file

@ -9,8 +9,8 @@ var minor_subdivision := 4
var first : Vector2
var last : Vector2
onready var _prev_camera_offset := Global.camera.offset
onready var _prev_camera_zoom := Global.camera.zoom
onready var _prev_camera_offset: Vector2 = Global.camera.offset
onready var _prev_camera_zoom: Vector2 = Global.camera.zoom
func _ready() -> void:
Global.main_viewport.connect("item_rect_changed", self, "update")
@ -35,7 +35,7 @@ func _draw() -> void:
var ruler_transform := Transform2D()
var major_subdivide := Transform2D()
var minor_subdivide := Transform2D()
var zoom := 1 / Global.camera.zoom.x
var zoom: float = 1 / Global.camera.zoom.x
transform.x = Vector2(zoom, zoom)
transform.origin = Global.main_viewport.rect_size / 2 + Global.camera.offset * -zoom

6
Scripts/Rulers/VerticalRuler.gd
View file

@ -9,8 +9,8 @@ var minor_subdivision := 4
var first : Vector2
var last : Vector2
onready var _prev_camera_offset := Global.camera.offset
onready var _prev_camera_zoom := Global.camera.zoom
onready var _prev_camera_offset: Vector2 = Global.camera.offset
onready var _prev_camera_zoom: Vector2 = Global.camera.zoom
func _ready() -> void:
Global.main_viewport.connect("item_rect_changed", self, "update")
@ -30,7 +30,7 @@ func _draw() -> void:
var ruler_transform := Transform2D()
var major_subdivide := Transform2D()
var minor_subdivide := Transform2D()
var zoom := 1 / Global.camera.zoom.x
var zoom: float = 1 / Global.camera.zoom.x
transform.y = Vector2(zoom, zoom)
transform.origin = Global.main_viewport.rect_size / 2 + Global.camera.offset * -zoom