Add loading screen

GlorifiedPig · May 24, 2020 · 13995f3 · 13995f3
1 parent 0953f01
commit 13995f3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/lua/entities/glorifiedbanking_cardreader/cl_init.lua b/lua/entities/glorifiedbanking_cardreader/cl_init.lua
@@ -74,15 +74,15 @@ ENT.Screens[2].drawFunction = function(self) --Transaction confirm screen
 
     if imgui.IsHovering(scrw * .075, 550, scrw * .85, 120) then
         hovering = true
-        draw.RoundedBox(12, scrw * .075, 550, scrw * .85, 120, theme.Data.Colors.readerConfirmBgHoverCol)
+        draw.RoundedBox(10, scrw * .075, 550, scrw * .85, 120, theme.Data.Colors.readerConfirmBgHoverCol)
 
         if imgui.IsPressed() then
             net.Start("GlorifiedBanking.CardReader.ConfirmTransaction")
              net.WriteEntity(self)
             net.SendToServer()
         end
     else
-        draw.RoundedBox(12, scrw * .075, 550, scrw * .85, 120, theme.Data.Colors.readerConfirmBgCol)
+        draw.RoundedBox(10, scrw * .075, 550, scrw * .85, 120, theme.Data.Colors.readerConfirmBgCol)
     end
 
     local iconsize = 55
@@ -99,6 +99,17 @@ ENT.Screens[2].drawFunction = function(self) --Transaction confirm screen
     return hovering
 end
 
+ENT.Screens[3].drawFunction = function(self) --Loading screen
+    surface.SetDrawColor(theme.Data.Colors.readerBgCol)
+    surface.DrawRect(0, 0, scrw, scrh)
+
+    surface.SetDrawColor(theme.Data.Colors.readerLoadingSpinnerCol)
+    surface.SetMaterial(theme.Data.Materials.loading)
+    surface.DrawTexturedRectRotated(scrw * .5, scrh * .5 - 50, 200, 200, -CurTime() * 100)
+
+    draw.SimpleText(i18n.GetPhrase("gbReaderLoading"), "GlorifiedBanking.ReaderEntity.Loading", scrw * .5, scrh * .5 + 100, theme.Data.Colors.readerLoadingTextCol, TEXT_ALIGN_CENTER, TEXT_ALIGN_CENTER)
+end
+
 function ENT:DrawTranslucent()
     self:DrawModel()
 

diff --git a/lua/glorifiedbanking/localization/sh_glorifiedbanking_english.lua b/lua/glorifiedbanking/localization/sh_glorifiedbanking_english.lua
@@ -49,6 +49,7 @@ i18n.RegisterPhrases( "en", {
     gbCantPaySelf = "You can't pay yourself!",
     gbNeedCard = "You need to have your card in hand to make this payment!",
     gbConfirm = "CONFIRM",
+    gbReaderLoading = "PLEASE WAIT",
     gbEnterAmount = "ENTER AMOUNT",
     gbAdminMenuPlayers = "PLAYERS",
     gbAdminMenuLogs = "LOGS",

diff --git a/lua/glorifiedbanking/modules/core/sv_glorifiedbanking_net.lua b/lua/glorifiedbanking/modules/core/sv_glorifiedbanking_net.lua
@@ -188,9 +188,6 @@ net.Receive("GlorifiedBanking.CardReader.ConfirmTransaction", function( len, ply
     readerEntity:EmitSound("GlorifiedBanking.Beep_Reader_Normal")
 
     readerEntity:Transfer(ply)
-
-    readerEntity:SetTransactionAmount( 0 )
-    readerEntity:SetScreenID( 1 )
 end)
 
 net.Receive( "GlorifiedBanking.AdminPanel.SetPlayerBalance", function( len, ply )

diff --git a/materials/glorified_banking/loading_spinner.png b/materials/glorified_banking/loading_spinner.png