Player name connecting screen (#65)

* visual changes and starting on connecting. * changes for connecting view * Connecting Screen
MaxEdwards20 · Apr 10, 2024 · 07ebd6c · 07ebd6c
1 parent b02cb87
commit 07ebd6c
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 36 deletions.
diff --git a/src/Client/ClientMain.cs b/src/Client/ClientMain.cs
@@ -66,7 +66,9 @@ protected override void Initialize()
                 { MenuStateEnum.Help, new HelpView() },
                 { MenuStateEnum.Credits, new AboutView() },
                 { MenuStateEnum.ChooseName, new ChooseNameView(playerName)},
-                { MenuStateEnum.HowToPlay, new HowToPlayView() }
+                { MenuStateEnum.HowToPlay, new HowToPlayView() },
+                { MenuStateEnum.Connecting, new ConnectingView() }
+
             };
 
             // Give all game states a chance to initialize, other than constructor

diff --git a/src/Client/Menu/ChooseNameView.cs b/src/Client/Menu/ChooseNameView.cs
@@ -81,8 +81,10 @@ public override void render(GameTime gameTime)
                 (m_graphics.PreferredBackBufferHeight - textSize.Y) / 2);
 
             // Draw "Enter Your Name" text
+
             m_spriteBatch.DrawString(font, enterNameText, textPosition, Colors.displayColor);
 
+
             // Draw "Press Enter to proceed" below the name text if a name has been entered
             if (playerName.Length > 0)
             {
@@ -92,6 +94,7 @@ public override void render(GameTime gameTime)
                     (m_graphics.PreferredBackBufferWidth - proceedTextSize.X) / 2,
                     textPosition.Y + textSize.Y + 20); // 20 pixels below the name text
 
+
                 m_spriteBatch.DrawString(font, proceedText, proceedTextPosition, Colors.displayColor);
             }
 

diff --git a/src/Client/Menu/ConnectingView.cs b/src/Client/Menu/ConnectingView.cs
@@ -1,12 +1,70 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using System;
 
 namespace Client.Menu
 {
-    internal class ConnectingView
+    public class ConnectingView : GameStateView
     {
+        private SpriteFont font;
+        private string connectingMessage = "Connecting to Server";
+        private bool isConnected = false;
+        private double elapsedTimeSinceLastAttempt = 0;
+        private const double attemptInterval = 2000; // Attempt to connect every 2 seconds
+        private double periodUpdateTime = 500; // Update period for visual
+
+        public override void loadContent(ContentManager contentManager)
+        {
+            font = contentManager.Load<SpriteFont>("Fonts/menu");
+        }
+
+        public override MenuStateEnum processInput(GameTime gameTime)
+        {
+            if (Keyboard.GetState().IsKeyDown(Keys.Escape))
+            {
+                return MenuStateEnum.MainMenu; // Or another state if cancelling connection attempt
+            }
+            if (isConnected)
+            {
+                return MenuStateEnum.GamePlay; // Transition to GamePlay upon successful connection
+            }
+            return MenuStateEnum.Connecting; // Stay on Connecting view if not yet connected
+        }
+
+        public override void update(GameTime gameTime)
+        {
+            elapsedTimeSinceLastAttempt += gameTime.ElapsedGameTime.TotalMilliseconds;
+
+            // Attempt to connect every 2 seconds
+            if (!isConnected && elapsedTimeSinceLastAttempt >= attemptInterval)
+            {
+                isConnected = connectToServer();
+                elapsedTimeSinceLastAttempt = 0; // Reset timer after each attempt
+            }
+        }
+
+        public override void render(GameTime gameTime)
+        {
+            m_spriteBatch.Begin();
+            Vector2 position = new Vector2(m_graphics.PreferredBackBufferWidth / 2, m_graphics.PreferredBackBufferHeight / 2);
+            Vector2 origin = font.MeasureString(connectingMessage) / 2;
+            m_spriteBatch.DrawString(font, connectingMessage, position - origin, Color.White);
+            m_spriteBatch.End();
+        }
+
+        private bool connectToServer()
+        {
+            // Attempt to connect to the server
+            return MessageQueueClient.instance.initialize("localhost", 3000);
+        }
+
+        public override void RegisterCommands()
+        {
+            throw new NotImplementedException();
+        }
+
     }
 }
diff --git a/src/Client/Menu/GamePlayView.cs b/src/Client/Menu/GamePlayView.cs
@@ -51,36 +51,36 @@ public override MenuStateEnum processInput(GameTime gameTime)
                 m_isKeyboardRegistered = true;
             }
 
-            if (!m_isSetup)
-            {
-                setup(gameTime);
-            }
+            //if (!m_isSetup)
+            //{
+            //    setup(gameTime);
+            //}
 
             MenuKeyboardInput.Update(gameTime); // essentially just checking for whether we have escaped to the main menu
             if (m_newState != MenuStateEnum.GamePlay){return handleSwitchToMainMenu();}
             return MenuStateEnum.GamePlay;
         }
 
-        private void setup(GameTime gameTime)
-        {
-            if (m_connectToServerTime == TimeSpan.Zero)
-            {
-                m_connectToServerTime = TimeSpan.FromSeconds(2); // Try to connect every 2 seconds
-                var res = connectToServer();
-                if (res)
-                {
-                    m_isSetup = true;
-                }
-            }
-            else
-            {
-                m_connectToServerTime -= gameTime.ElapsedGameTime;
-                if (m_connectToServerTime <= TimeSpan.Zero)
-                {
-                    m_connectToServerTime = TimeSpan.Zero;
-                }
-            }
-        }
+        //private void setup(GameTime gameTime)
+        //{
+        //    if (m_connectToServerTime == TimeSpan.Zero)
+        //    {
+        //        m_connectToServerTime = TimeSpan.FromSeconds(2); // Try to connect every 2 seconds
+        //        var res = connectToServer();
+        //        if (res)
+        //        {
+        //            m_isSetup = true;
+        //        }
+        //    }
+        //    else
+        //    {
+        //        m_connectToServerTime -= gameTime.ElapsedGameTime;
+        //        if (m_connectToServerTime <= TimeSpan.Zero)
+        //        {
+        //            m_connectToServerTime = TimeSpan.Zero;
+        //        }
+        //    }
+        //}
 
         public override void update(GameTime gameTime)
         {
@@ -98,10 +98,10 @@ public override void RegisterCommands()
             MenuKeyboardInput.registerCommand(MenuKeyboardInput.Escape, true, escape);
         }
 
-        private bool connectToServer()
-        {
-            return MessageQueueClient.instance.initialize("localhost", 3000);
-        }
+        //private bool connectToServer()
+        //{
+        //    return MessageQueueClient.instance.initialize("localhost", 3000);
+        //}
 
         private void escape(GameTime gameTime, float scale)
         {

diff --git a/src/Client/Menu/HowToPlay.cs b/src/Client/Menu/HowToPlay.cs
@@ -38,7 +38,7 @@ public override MenuStateEnum processInput(GameTime gameTime)
             // Proceed to the next game state if the player presses Enter and enough time has passed since the last Enter press
             if (newState.IsKeyDown(Keys.Enter) && oldState.IsKeyUp(Keys.Enter) && timeSinceLastEnterPress >= enterKeyDelay)
             {
-                return MenuStateEnum.GamePlay; // Transition to the gameplay state
+                return MenuStateEnum.Connecting; // Transition to the gameplay state
             }
             // Update the enter released state
             if (!newState.IsKeyDown(Keys.Enter))
@@ -67,21 +67,25 @@ public override void render(GameTime gameTime)
             Vector2 titleOrigin = font.MeasureString(titleMessage) / 2;
             m_spriteBatch.DrawString(font, titleMessage, titlePosition - (titleOrigin * textScale), Colors.displayColor, 0f, Vector2.Zero, textScale, SpriteEffects.None, 0f);
 
+
             // How to Play Instructions
             Vector2 instructionsPosition = new Vector2(m_graphics.PreferredBackBufferWidth / 2, m_graphics.PreferredBackBufferHeight / 2.5f);
             string[] lines = howToPlayMessage.Split('\n');
             foreach (string line in lines)
             {
                 Vector2 lineSize = font.MeasureString(line) * textScale;
+
                 m_spriteBatch.DrawString(font, line, instructionsPosition - new Vector2(lineSize.X / 2, 0), Colors.displayColor, 0f, Vector2.Zero, textScale, SpriteEffects.None, 0f);
                 instructionsPosition.Y += lineSize.Y + 5; // Adjust spacing between lines if necessary, taking scale into account
             }
 
             // Continue Prompt
             Vector2 continuePosition = new Vector2(m_graphics.PreferredBackBufferWidth / 2, (m_graphics.PreferredBackBufferHeight / 4) * 3);
             Vector2 continueOrigin = font.MeasureString(continueMessage) / 2;
+
             m_spriteBatch.DrawString(font, continueMessage, continuePosition - (continueOrigin * textScale), Colors.displayColor, 0f, Vector2.Zero, textScale, SpriteEffects.None, 0f);
 
+
             m_spriteBatch.End();
         }