Made "TimelineSeconds" update when FPS value changes

Also made it a bit smaller
This commit is contained in:
OverloadedOrama 2020-01-04 04:16:50 +02:00
parent 9838a94f83
commit f57ea4d64f
4 changed files with 5 additions and 2 deletions

View file

@ -194,6 +194,7 @@ var current_frame_label : Label
var loop_animation_button : BaseButton
var play_forward : BaseButton
var play_backwards : BaseButton
var timeline_seconds : Control
var frame_container : HBoxContainer
var vbox_layer_container : VBoxContainer
@ -305,6 +306,7 @@ func _ready() -> void:
loop_animation_button = find_node_by_name(root, "LoopAnim")
play_forward = find_node_by_name(root, "PlayForward")
play_backwards = find_node_by_name(root, "PlayBackwards")
timeline_seconds = find_node_by_name(root, "TimelineSeconds")
frame_container = find_node_by_name(root, "FrameContainer")
var layer_stuff_container = find_node_by_name(root, "LayerVBoxContainer")

View file

@ -838,6 +838,7 @@ func _on_AnimationTimer_timeout() -> void:
func _on_FPSValue_value_changed(value) -> void:
fps = float(value)
Global.animation_timer.wait_time = 1 / fps
Global.timeline_seconds.update()
func _on_PastOnionSkinning_value_changed(value) -> void:
Global.onion_skinning_past_rate = int(value)

View file

@ -39,7 +39,7 @@ func _draw() -> void:
first = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(starting_pos)
last = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(rect_size - starting_pos)
for i in range(ceil(first.x), last.x):
for i in range(ceil(first.x), last.x - 1):
var position : Vector2 = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Vector2(i, 0))
if i % (major_subdivision * minor_subdivision) == 0:
draw_line(Vector2(position.x + RULER_WIDTH, 0), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), color)