From: brady <brady@92bb83a3-7c8f-8a45-bc97-515c4e399668>
Date: Fri, 19 Mar 2010 07:43:26 +0000 (+0000)
Subject: player list graphics and stuff added
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=commitdiff_plain;h=10d5e89c133423a44f112a1b16cbec0d393fcf2f

player list graphics and stuff added


git-svn-id: https://bd85.net/svn/cs3505_group@11 92bb83a3-7c8f-8a45-bc97-515c4e399668
---

diff --git a/Project06/lobbyTest/lobbyTest/Content/Content.contentproj b/Project06/lobbyTest/lobbyTest/Content/Content.contentproj
index 6305bbe..9877d52 100644
--- a/Project06/lobbyTest/lobbyTest/Content/Content.contentproj
+++ b/Project06/lobbyTest/lobbyTest/Content/Content.contentproj
@@ -34,13 +34,6 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="background.png">
-      <Name>background</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="cs.png">
       <Name>cs</Name>
@@ -69,6 +62,41 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="background.png">
+      <Name>background</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="checkedBox.png">
+      <Name>checkedBox</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="deselectBox.png">
+      <Name>deselectBox</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="emptySelectBox.png">
+      <Name>emptySelectBox</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="menuItem.png">
+      <Name>menuItem</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v3.0\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Project06/lobbyTest/lobbyTest/Content/background.png b/Project06/lobbyTest/lobbyTest/Content/background.png
deleted file mode 100644
index 4f6616a..0000000
Binary files a/Project06/lobbyTest/lobbyTest/Content/background.png and /dev/null differ
diff --git a/Project06/lobbyTest/lobbyTest/Content/checkedBox.png b/Project06/lobbyTest/lobbyTest/Content/checkedBox.png
new file mode 100644
index 0000000..3462dc3
Binary files /dev/null and b/Project06/lobbyTest/lobbyTest/Content/checkedBox.png differ
diff --git a/Project06/lobbyTest/lobbyTest/Content/deselectBox.png b/Project06/lobbyTest/lobbyTest/Content/deselectBox.png
new file mode 100644
index 0000000..cb4d2d0
Binary files /dev/null and b/Project06/lobbyTest/lobbyTest/Content/deselectBox.png differ
diff --git a/Project06/lobbyTest/lobbyTest/Content/emptySelectBox.png b/Project06/lobbyTest/lobbyTest/Content/emptySelectBox.png
new file mode 100644
index 0000000..5373a1b
Binary files /dev/null and b/Project06/lobbyTest/lobbyTest/Content/emptySelectBox.png differ
diff --git a/Project06/lobbyTest/lobbyTest/Content/menuItem.png b/Project06/lobbyTest/lobbyTest/Content/menuItem.png
new file mode 100644
index 0000000..cf45ebd
Binary files /dev/null and b/Project06/lobbyTest/lobbyTest/Content/menuItem.png differ
diff --git a/Project06/lobbyTest/lobbyTest/LobbyGUI.cs b/Project06/lobbyTest/lobbyTest/LobbyGUI.cs
index a5f3c5c..49702d5 100644
--- a/Project06/lobbyTest/lobbyTest/LobbyGUI.cs
+++ b/Project06/lobbyTest/lobbyTest/LobbyGUI.cs
@@ -11,6 +11,8 @@ namespace lobbyTest
 {
     public class lobbyGUI
     {
+        float scale;
+
         Texture2D background;
         Texture2D spotLight;
         Texture2D cs;
@@ -29,6 +31,13 @@ namespace lobbyTest
         int MaxY;
         int MinY;
 
+        Texture2D checkedBox;
+        Texture2D deselectBox;
+        Texture2D emptySelectBox;
+        Texture2D menuItem;
+
+        Boolean ready;
+
         SpriteFont menuFont;
         string selected;
         Vector2 createGamePos;
@@ -76,6 +85,15 @@ namespace lobbyTest
             MaxY = graphics.GraphicsDevice.Viewport.Height;
             MinY = 100;
 
+            scale = MaxX / 1600f;
+            //playerlist stuff
+            checkedBox = contentManager.Load<Texture2D>("checkedBox");
+            deselectBox = contentManager.Load<Texture2D>("deselectBox");
+            emptySelectBox = contentManager.Load<Texture2D>("emptySelectBox");
+            menuItem = contentManager.Load<Texture2D>("menuItem");
+
+            ready = false;
+
             //menu fonts
             menuFont = contentManager.Load<SpriteFont>("menuFont");
             createGamePos = new Vector2(100f, MaxY / 3);
@@ -87,6 +105,8 @@ namespace lobbyTest
 
             returnToMainPos = new Vector2(MaxX / 2, MaxY - 120);
             returnToMainText = "press [ X ] to return to main menu";
+
+
         }
 
         public void UnloadContent()
@@ -119,18 +139,26 @@ namespace lobbyTest
                     break;
                 case lobbyState.CreateGame:
                     if (currentKeyboardState.IsKeyDown(Keys.X) && previousKeyboardState.IsKeyUp(Keys.X))
+                    {
                         currentState = lobbyState.Welcome;
-
+                        ready = false;
+                    }
+                    if (currentKeyboardState.IsKeyDown(Keys.R) && previousKeyboardState.IsKeyUp(Keys.R))
+                        ready = true;
                     break;
                 case lobbyState.FindGame:
                     if (currentKeyboardState.IsKeyDown(Keys.X) && previousKeyboardState.IsKeyUp(Keys.X))
+                    {
                         currentState = lobbyState.Welcome;
+                        ready = false;
+                    }
 
                     break;
                 case lobbyState.Connected:
                     if (currentKeyboardState.IsKeyDown(Keys.X) && previousKeyboardState.IsKeyUp(Keys.X))
                         currentState = lobbyState.Welcome;
-
+                    if (currentKeyboardState.IsKeyDown(Keys.R) && previousKeyboardState.IsKeyUp(Keys.R))
+                        ready = true;
                     break;
 
             }
@@ -144,7 +172,7 @@ namespace lobbyTest
         /// </summary>
         public long Draw(SpriteBatch spriteBatch)
         {
-            spriteBatch.Draw(background, backgroundPos, null, Color.White, 0, zero, 0.5f, SpriteEffects.None, 0);
+            spriteBatch.Draw(background, backgroundPos, null, Color.White, 0, zero, scale, SpriteEffects.None, 0);
             spriteBatch.Draw(cs, csPos, null, Color.White, 0, zero, 0.5f, SpriteEffects.None, 0);
             spriteBatch.Draw(spotLight, spotLightPos, null, Color.White, 0, spotLightCenter, 1f, SpriteEffects.None, 0);
             switch (currentState)
@@ -162,16 +190,17 @@ namespace lobbyTest
                     break;
                 
                 case lobbyState.CreateGame:
-                    
+                    DrawPlayerList(spriteBatch);
+
                     break;
                 case lobbyState.FindGame:
-                    spriteBatch.Draw(selectGameScreen, backgroundPos, null, Color.White, 0, zero, 0.5f, SpriteEffects.None, 0);
+                    spriteBatch.Draw(selectGameScreen, backgroundPos, null, Color.White, 0, zero, scale, SpriteEffects.None, 0);
                     //spriteBatch.DrawString(menuFont, "Select Game", new Vector2(100, 100), Color.Gray, 0, zero, 1f, SpriteEffects.None, 0.5f);
 
                     //spriteBatch.DrawString(menuFont, returnToMainText, returnToMainPos, Color.Gray, 0, new Vector2(180 , 0), .6f, SpriteEffects.None, 0.5f);
                     break;
                 case lobbyState.Connected:
-                    
+                    DrawPlayerList(spriteBatch);
                     break;
             }
 
@@ -192,5 +221,77 @@ namespace lobbyTest
                 spotLightVelocity = new Vector2(spotLightVelocity.X, spotLightVelocity.Y * -1);
             }
         }
+
+
+        private void DrawPlayerList(SpriteBatch spriteBatch)
+        {
+            
+            Vector2 topOfList = new Vector2(MaxX / 8, MaxY / 4);
+            spriteBatch.DrawString(menuFont, "Current Players", new Vector2(topOfList.X + 15, topOfList.Y - 25), Color.White);
+            
+            //top player
+            spriteBatch.Draw(menuItem, topOfList, null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "****Player 1****", new Vector2(topOfList.X + 10, topOfList.Y + 10), Color.White, 0f, zero, .75f, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "Ready", new Vector2(topOfList.X + 5, topOfList.Y + 45), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            if(!ready)
+                spriteBatch.Draw(emptySelectBox, new Vector2(topOfList.X - 32, topOfList.Y + 35), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X - 32, topOfList.Y + 30), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            
+            spriteBatch.DrawString(menuFont, "Chat with", new Vector2(topOfList.X + 152, topOfList.Y + 45), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            Boolean chatwith = false;  // change to reflect info from network, move to update and create one for each player
+            if (!chatwith)
+                spriteBatch.Draw(deselectBox, new Vector2(topOfList.X +218, topOfList.Y + 35), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X + 218, topOfList.Y + 30), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+
+            //player 2
+            spriteBatch.Draw(menuItem, new Vector2(topOfList.X, topOfList.Y + 65), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "****Player 1****", new Vector2(topOfList.X + 10, topOfList.Y + 75), Color.White, 0f, zero, .75f, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "Ready", new Vector2(topOfList.X + 5, topOfList.Y + 110), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            if (!ready)
+                spriteBatch.Draw(emptySelectBox, new Vector2(topOfList.X - 32, topOfList.Y + 100), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X - 32, topOfList.Y + 95), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+
+            spriteBatch.DrawString(menuFont, "Chat with", new Vector2(topOfList.X + 152, topOfList.Y + 110), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            // change to reflect info from network
+            if (!chatwith)
+                spriteBatch.Draw(deselectBox, new Vector2(topOfList.X + 218, topOfList.Y + 100), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X + 218, topOfList.Y + 95), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            
+            //player 3
+            spriteBatch.Draw(menuItem, new Vector2(topOfList.X, topOfList.Y + 130), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "****Player 1****", new Vector2(topOfList.X + 10, topOfList.Y + 140), Color.White, 0f, zero, .75f, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "Ready", new Vector2(topOfList.X + 5, topOfList.Y + 175), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            if (!ready)
+                spriteBatch.Draw(emptySelectBox, new Vector2(topOfList.X - 32, topOfList.Y + 165), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X - 32, topOfList.Y + 160), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+
+            spriteBatch.DrawString(menuFont, "Chat with", new Vector2(topOfList.X + 152, topOfList.Y + 175), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            
+            if (!chatwith)
+                spriteBatch.Draw(deselectBox, new Vector2(topOfList.X + 218, topOfList.Y + 165), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X + 218, topOfList.Y + 160), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            
+            //player 4
+            spriteBatch.Draw(menuItem, new Vector2(topOfList.X, topOfList.Y + 195), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "****Player 1****", new Vector2(topOfList.X + 10, topOfList.Y + 205), Color.White, 0f, zero, .75f, SpriteEffects.None, 1f);
+            spriteBatch.DrawString(menuFont, "Ready", new Vector2(topOfList.X + 5, topOfList.Y + 240), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            if (!ready)
+                spriteBatch.Draw(emptySelectBox, new Vector2(topOfList.X - 32, topOfList.Y + 230), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X - 32, topOfList.Y + 225), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+
+            spriteBatch.DrawString(menuFont, "Chat with", new Vector2(topOfList.X + 152, topOfList.Y + 240), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);
+            if (!chatwith)
+                spriteBatch.Draw(deselectBox, new Vector2(topOfList.X + 218, topOfList.Y + 230), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            else
+                spriteBatch.Draw(checkedBox, new Vector2(topOfList.X + 218, topOfList.Y + 225), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);
+            
+        }
     }
 }