Merge pull request #197 from Tom3s/load-placement-in-medal-menu

[#196] Show Placement after completing runs

GameScene.gd

@@ -54,6 +54,7 @@ func setup(
 		map.bestLapTime,
 		totalTimePB,
 		lapTimePB,
+		map.trackId
 	)
 
 	%GameEventListener.replayGhost.setTimeMultiplier(timeMultiplier)

GameScene.tscn

@@ -57,6 +57,8 @@ visible = false
 [node name="IngameMedalMenu" parent="UniversalCanvas" instance=ExtResource("6_64ltm")]
 unique_name_in_owner = true
 visible = false
+currentTime = null
+currentLap = null
 
 [node name="RaceInputHandler" type="Node3D" parent="."]
 unique_name_in_owner = true

Global/RequestHandler.gd

@@ -0,0 +1,33 @@
+extends Node
+
+func sendRequest(
+	requesterNodeName: String,
+	requestUrl: String,
+	headers: Array,
+	method: int,
+	payload: String,
+	timeout: float,
+	onRequestSuccess: Callable,
+) -> void:
+	var request = HTTPRequest.new()
+	add_child(request)
+	request.timeout = timeout
+
+	request.request_completed.connect(func(_result, response_code, _headers, _body):
+		if response_code != 200:
+			print("[" + requesterNodeName + "'s request] Error with response: " + _body.get_string_from_utf8())
+			return
+		onRequestSuccess.call(_body)
+	)
+
+	headers.append("Content-Type: application/json")
+
+	var httpError = request.request(
+		requestUrl,
+		headers,
+		method,
+		payload
+	)
+
+	if httpError != OK:
+		print("[" + requesterNodeName + "'s request] Error while sending request: " + error_string(httpError))

Global/VersionCheck.gd

@@ -2,7 +2,7 @@ extends Control
 
 var offline = true
 
-var currentVersion = "v1.2.0"
+var currentVersion = "v1.2.1"
 
 var versionCheckComplete = false
 

Menu/IngameMedalMenu.gd

@@ -99,6 +99,8 @@ var currentTime: int = 0
 @export
 var currentLap: int = 0
 
+var trackId: String = ""
+
 signal closePressed()
 signal restartPressed()
 signal leaderboardPressed()
@@ -154,11 +156,18 @@ func _ready():
 
 	set_physics_process(true)
 
-func setup(initChronoTime: int, initBlitzTime: int, initTotalTimePB: int, initLapTimePB: int) -> void:
+func setup(
+	initChronoTime: int, 
+	initBlitzTime: int, 
+	initTotalTimePB: int, 
+	initLapTimePB: int,
+	initTrackId: String
+) -> void:
 	chronoTime = initChronoTime
 	blitzTime = initBlitzTime
 	totalTimePB = initTotalTimePB
 	lapTimePB = initLapTimePB
+	trackId = initTrackId
 
 	totalPBContainer.visible = false
 	totalBeatenContainer.visible = false
@@ -190,6 +199,21 @@ signal totalLabelAnimationFinished()
 var inLabelAnimation: bool = false
 
 func setTotalTimePB(time: int) -> void:
+	RequestHandler.sendRequest(
+		"IngameMedalMenu.gd",
+		Backend.BACKEND_IP_ADRESS + "/api/leaderboard/placement/" + trackId,
+		[
+			'Session-Token: ' + GlobalProperties.SESSION_TOKEN,
+		],
+		HTTPClient.METHOD_GET,
+		"",
+		5,
+		func(body: PackedByteArray) -> void:
+			totalPlacement.text = body.get_string_from_utf8()
+	)
+
+	totalPlacementContainer.modulate = Color(1, 1, 1, 0)
+
 	var tween = create_tween().set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_EXPO)
 
 	if totalTimePB == 9223372036854775807 || time <= totalTimePB:
@@ -313,7 +337,6 @@ func setTotalTimePB(time: int) -> void:
 		totalNextMedal.text = IngameHUD.getTimeStringFromTicks(floori(chronoTime * MedalMenu.BRONZE_MULTIPLIER))
 		totalNextDiff.text = IngameHUD.getTimeStringFromTicks(time - floori(chronoTime * MedalMenu.BRONZE_MULTIPLIER))
 
-	totalPlacementContainer.modulate = Color(1, 1, 1, 0)
 	inLabelAnimation = true
 	tween.tween_property(totalPlacementContainer, "modulate", Color(1, 1, 1, 1), LABEL_ANIMATION_TIME)
 	tween.tween_callback(playClickSFX)
@@ -387,6 +410,21 @@ func animateInTotalMedals(nrMedals: int) -> void:
 
 
 func setLapTimePB(time: int) -> void:
+	RequestHandler.sendRequest(
+		"IngameMedalMenu.gd",
+		Backend.BACKEND_IP_ADRESS + "/api/leaderboard/placement/" + trackId + "?sortByLap=true",
+		[
+			'Session-Token: ' + GlobalProperties.SESSION_TOKEN,
+		],
+		HTTPClient.METHOD_GET,
+		"",
+		5,
+		func(body: PackedByteArray) -> void:
+			lapPlacement.text = body.get_string_from_utf8()
+	)
+
+	lapPlacementContainer.modulate = Color(1, 1, 1, 0)
+
 	var tween = create_tween().set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_EXPO)
 
 	if inLabelAnimation:
@@ -495,7 +533,6 @@ func setLapTimePB(time: int) -> void:
 		lapNextMedal.text = IngameHUD.getTimeStringFromTicks(floori(blitzTime * MedalMenu.BRONZE_MULTIPLIER))
 		lapNextDiff.text = IngameHUD.getTimeStringFromTicks(time - floori(blitzTime * MedalMenu.BRONZE_MULTIPLIER))
 
-	lapPlacementContainer.modulate = Color(1, 1, 1, 0)
 	tween.tween_property(lapPlacementContainer, "modulate", Color(1, 1, 1, 1), LABEL_ANIMATION_TIME)
 	tween.tween_callback(playClickSFX)
 

Menu/IngameMedalMenu.tscn

@@ -183,6 +183,8 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_otuec")
+currentTime = null
+currentLap = null
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 1

Menu/MapOverviewMenu.gd

@@ -350,7 +350,7 @@ func fetchPersonalBestLap():
 	)
 
 	var httpError = request.request(
-		Backend.BACKEND_IP_ADRESS + "/api/leaderboard/pb/" + trackId + "?bestLap=true",
+		Backend.BACKEND_IP_ADRESS + "/api/leaderboard/pb/" + trackId + "?sortByLap=true",
 		[
 			"Content-Type: application/json",
 			"Session-Token: " + GlobalProperties.SESSION_TOKEN

project.godot

@@ -25,6 +25,7 @@ Leaderboard="*res://Global/Leaderboard.gd"
 AlertManager="*res://Global/AlertManager.gd"
 VersionCheck="*res://Global/VersionCheck.gd"
 BillboardTextureLoader="*res://Global/BillboardTextureLoader.gd"
+RequestHandler="*res://Global/RequestHandler.gd"
 
 [debug]