From d5bc77446b26d6a501656829f4b5ed4708bbe2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sun, 13 Dec 2020 19:26:04 +0100 Subject: [PATCH] Rebase to current 3.2 branch --- Autoload/Autoload.gd | 31 +++++++++++++++++-------------- MainScenes/Control.gd | 2 +- MainScenes/Node2D.gd | 2 +- MainScenes/Other.gd | 2 +- MainScenes/Spatial.gd | 2 +- Start.gd | 9 ++++----- Text/Text.tscn | 1 + 7 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Autoload/Autoload.gd b/Autoload/Autoload.gd index fb0df40..bc8c8a0 100644 --- a/Autoload/Autoload.gd +++ b/Autoload/Autoload.gd @@ -2,15 +2,15 @@ extends Node const screen_size = Vector2(1024, 600) -const RANGE: int = 10 +var start_time : int +var last_time : int -const PRINT_TIME_EVERY_SECONDS : int = 5 -var time_to_print_next_time : int = PRINT_TIME_EVERY_SECONDS -var current_run_time : float = 0.0 +const PRINT_TIME_EVERY_MILISECONDS : int = 5000 +var time_to_print_next_time : int = PRINT_TIME_EVERY_MILISECONDS -var time_to_show: float = 20 # How long test works +var time_to_show: int = 15 * 1000 # How long test works in miliseconds -var time_for_each_step : float = -1.0 +var time_for_each_step : int = -1 # Each scene runs alone const alone_steps : Array = [ @@ -22,7 +22,7 @@ const alone_steps : Array = [ "res://Physics/3D/Physics3D.tscn", "res://Rendering/Lights2D/Lights2D.tscn", "res://Rendering/Lights3D/Lights3D.tscn", - "res://Text/Text.tscn", + "res://Text/Text.tscn" ] # All scenes run in one step @@ -32,24 +32,27 @@ const all_in_one : Array = [ ] func _init(): + start_time = OS.get_ticks_msec() + # In case when user doesn't provide time time_for_each_step = time_to_show / (alone_steps.size() + 1) for argument in OS.get_cmdline_args(): var rr: String = argument - if rr.find("tscn") != -1: # Ignore all tscn scenes/names + if rr.ends_with("tscn"): # Ignore all tscn scenes/names continue - time_to_show = argument.to_float() + time_to_show = int(argument.to_float() * 1000) time_for_each_step = time_to_show / (alone_steps.size() + 1) - print("Time set to: " + str(time_to_show) + " seconds with "+ str(alone_steps.size() + 1) + " steps, each step will take " + str(time_for_each_step) + " seconds.") - break + print("Time set to: " + str(time_to_show / 1000.0) + " seconds with "+ str(alone_steps.size() + 1) + " steps, each step will take " + str(time_for_each_step / 1000.0) + " seconds.") func _process(delta: float) -> void: - current_run_time += delta + var current_run_time : int = OS.get_ticks_msec() - start_time + if current_run_time > time_to_print_next_time: - print("Test is running now " + str(time_to_print_next_time) + " seconds") - time_to_print_next_time += PRINT_TIME_EVERY_SECONDS + print("Test is running now " + str(int(time_to_print_next_time / 1000)) + " seconds") + time_to_print_next_time += PRINT_TIME_EVERY_MILISECONDS if current_run_time > time_to_show: + print("Ending test") get_tree().quit() diff --git a/MainScenes/Control.gd b/MainScenes/Control.gd index d1df9c9..59405ea 100644 --- a/MainScenes/Control.gd +++ b/MainScenes/Control.gd @@ -2,7 +2,7 @@ extends GridContainer func _ready(): - for _i in range(Autoload.RANGE): + for _i in range(5): add_child(Control.new()) add_child(Popup.new()) add_child(AcceptDialog.new()) diff --git a/MainScenes/Node2D.gd b/MainScenes/Node2D.gd index f83350a..a6236a0 100644 --- a/MainScenes/Node2D.gd +++ b/MainScenes/Node2D.gd @@ -2,7 +2,7 @@ extends Node2D func _ready(): - for _i in range(Autoload.RANGE): + for _i in range(5): add_child(Node2D.new()) add_child(AnimatedSprite2D.new()) add_child(Area2D.new()) diff --git a/MainScenes/Other.gd b/MainScenes/Other.gd index 7aad961..6ce244d 100644 --- a/MainScenes/Other.gd +++ b/MainScenes/Other.gd @@ -2,7 +2,7 @@ extends Node func _ready() -> void: - for _i in range(Autoload.RANGE): + for _i in range(5): add_child(AnimationPlayer.new()) add_child(AnimationTree.new()) add_child(AudioStreamPlayer.new()) diff --git a/MainScenes/Spatial.gd b/MainScenes/Spatial.gd index 133f80f..169600e 100644 --- a/MainScenes/Spatial.gd +++ b/MainScenes/Spatial.gd @@ -2,7 +2,7 @@ extends Node3D func _ready(): - for i in range(Autoload.RANGE): + for i in range(5): add_child(Node3D.new()) add_child(XRAnchor3D.new()) add_child(Camera3D.new()) diff --git a/Start.gd b/Start.gd index 34b25ad..d8be7b6 100644 --- a/Start.gd +++ b/Start.gd @@ -1,7 +1,7 @@ extends Control var current_scene : int = -1 -var time_to_switch : float +var time_to_switch : int const NUMBER_OF_INSTANCES : int = 1 # Use more than 1 to stress test, 1 should be optimal for casual CI func _ready(): @@ -14,10 +14,9 @@ func _ready(): print(" - " + path) -func _process(delta): - time_to_switch -= delta - if time_to_switch <= 0: - time_to_switch = Autoload.time_for_each_step +func _process(_delta): + if time_to_switch - OS.get_ticks_msec() <= 0: + time_to_switch = Autoload.time_for_each_step + OS.get_ticks_msec() if current_scene < Autoload.alone_steps.size() - 1: current_scene += 1 diff --git a/Text/Text.tscn b/Text/Text.tscn index fcf3508..d69744a 100644 --- a/Text/Text.tscn +++ b/Text/Text.tscn @@ -28,3 +28,4 @@ bbcode_text = "Roman text = "Roman " custom_effects = [ ] +structured_text_bidi_override_options = [ ]