From 4964b2c7f6127dfd8fd890f5180d92127493ae65 Mon Sep 17 00:00:00 2001
From: TheSaminator <thesaminator@users.noreply.github.com>
Date: Mon, 4 Jul 2022 10:27:16 -0400
Subject: [PATCH] Pre-render 3d UI

---
 .../kotlin/net/starshipfights/campaign/campaign_main.kt       | 4 +++-
 src/jsMain/kotlin/net/starshipfights/game/client_game.kt      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/jsMain/kotlin/net/starshipfights/campaign/campaign_main.kt b/src/jsMain/kotlin/net/starshipfights/campaign/campaign_main.kt
index 6e7bbc2..5254ec3 100644
--- a/src/jsMain/kotlin/net/starshipfights/campaign/campaign_main.kt
+++ b/src/jsMain/kotlin/net/starshipfights/campaign/campaign_main.kt
@@ -67,6 +67,9 @@ suspend fun campaignMain(playingAs: Id<InGameAdmiral>, admirals: Map<Id<InGameAd
 		
 		CampaignUI.initCampaignUI(uiResponder(clusterView, scene))
 		
+		CampaignUI.renderCampaignUI(cameraControls)
+		CampaignUI.fitLabels()
+		
 		addSelectionHandler(clusterView, camera, scene)
 		
 		delay(500L)
@@ -75,7 +78,6 @@ suspend fun campaignMain(playingAs: Id<InGameAdmiral>, admirals: Map<Id<InGameAd
 			cameraControls.update(dt)
 			renderer.render(scene, camera)
 			CampaignUI.renderCampaignUI(cameraControls)
-			CampaignUI.fitLabels()
 			
 			scene.traverse { obj3d ->
 				obj3d.celestialObjectRenderImmediate?.let { ptr ->
diff --git a/src/jsMain/kotlin/net/starshipfights/game/client_game.kt b/src/jsMain/kotlin/net/starshipfights/game/client_game.kt
index 0466bf3..44a7528 100644
--- a/src/jsMain/kotlin/net/starshipfights/game/client_game.kt
+++ b/src/jsMain/kotlin/net/starshipfights/game/client_game.kt
@@ -71,6 +71,8 @@ suspend fun GameRenderInteraction.execute(scope: CoroutineScope) {
 	})
 	
 	GameRender.renderGameState(scene, gameState.value)
+	GameUI.renderGameUI(cameraControls)
+	GameUI.fitLabels()
 	
 	window.addEventListener("resize", {
 		camera.aspect = window.aspectRatio
@@ -87,7 +89,6 @@ suspend fun GameRenderInteraction.execute(scope: CoroutineScope) {
 				cameraControls.update(dt)
 				renderer.render(scene, camera)
 				GameUI.renderGameUI(cameraControls)
-				GameUI.fitLabels()
 			}
 		}
 		
-- 
2.25.1