From aaeecb139cbd9615216f32083032f889f8beb2a6 Mon Sep 17 00:00:00 2001
From: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Date: Mon, 10 May 2021 15:32:22 +0200
Subject: [PATCH] Close #8 - Fix loading value progress

---
 scenes/Global.gd       | 10 ++++++----
 scenes/UI/Loading.tscn | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/scenes/Global.gd b/scenes/Global.gd
index fdb2abc..cdd1d8a 100644
--- a/scenes/Global.gd
+++ b/scenes/Global.gd
@@ -10,7 +10,7 @@ func _ready():
 	var root = get_tree().get_root()
 	current_scene = root.get_child(root.get_child_count() - 1)
 	if current_scene.name != "Main":
-			get_node("/root/Loading").hide()
+		get_node("/root/Loading").hide()
 
 func goto_scene(path):
 	print("[global#goto_scene]")
@@ -22,6 +22,8 @@ func goto_scene(path):
 	set_process(true)
 	current_scene.queue_free()
 	wait_frames = 1
+	Loading.get_node("ColorRect/CenterContainer/VBoxContainer/ProgressBar").set_max(loader.get_stage_count())
+
 
 func _process(_delta):
 	print("[global#_process]")
@@ -52,9 +54,9 @@ func _process(_delta):
 			break
 
 func update_progress():
-	var progress = float(loader.get_stage()) / loader.get_stage_count()
-	print("[global#update_progress] " + String(progress))
-	get_node("/root/Loading").visible = true
+	print("[global#update_progress]")
+	Loading.visible = true
+	Loading.get_node("ColorRect/CenterContainer/VBoxContainer/ProgressBar").set_value(loader.get_stage())
 
 func set_new_scene(scene_resource):
 	print("[global#set_new_scene]")
diff --git a/scenes/UI/Loading.tscn b/scenes/UI/Loading.tscn
index ce533df..bd96c26 100644
--- a/scenes/UI/Loading.tscn
+++ b/scenes/UI/Loading.tscn
@@ -20,19 +20,32 @@ __meta__ = {
 }
 
 [node name="CenterContainer" type="CenterContainer" parent="ColorRect"]
+margin_top = 282.0
 margin_right = 1024.0
-margin_bottom = 600.0
+margin_bottom = 282.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="ColorRect/CenterContainer"]
 margin_left = 479.0
-margin_top = 293.0
 margin_right = 544.0
-margin_bottom = 307.0
+margin_bottom = 32.0
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Label" type="Label" parent="ColorRect/CenterContainer/VBoxContainer"]
 margin_right = 65.0
 margin_bottom = 14.0
 text = "Loading ..."
+align = 1
+
+[node name="ProgressBar" type="ProgressBar" parent="ColorRect/CenterContainer/VBoxContainer"]
+margin_top = 18.0
+margin_right = 65.0
+margin_bottom = 32.0
+max_value = 1.0
+step = 0.1
+rounded = true