diff --git a/DangerousD/Content/Content.mgcb b/DangerousD/Content/Content.mgcb
index 29141fb..ea7bb60 100644
--- a/DangerousD/Content/Content.mgcb
+++ b/DangerousD/Content/Content.mgcb
@@ -200,6 +200,13 @@
/processorParam:TextureFormat=Color
/build:PC_Computer_Dangerous_Dave_In_The_Haunted_Mansion_Death_Sequences.png
+#begin PixelFont.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:PixelFont.spritefont
+
#begin playerAnimation.png
/importer:TextureImporter
/processor:TextureProcessor
diff --git a/DangerousD/Content/PixelFont.spritefont b/DangerousD/Content/PixelFont.spritefont
new file mode 100644
index 0000000..2ee98cd
--- /dev/null
+++ b/DangerousD/Content/PixelFont.spritefont
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+ PublicPixel-z84yD.ttf
+
+
+ 12
+
+
+ 0
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+ ~
+
+
+ а
+ я
+
+
+
+
diff --git a/DangerousD/Content/PublicPixel-z84yD.ttf b/DangerousD/Content/PublicPixel-z84yD.ttf
new file mode 100644
index 0000000..618e5bb
Binary files /dev/null and b/DangerousD/Content/PublicPixel-z84yD.ttf differ
diff --git a/DangerousD/GameCore/GUI/AbstractGui.cs b/DangerousD/GameCore/GUI/AbstractGui.cs
index a8dc9c0..ee65365 100644
--- a/DangerousD/GameCore/GUI/AbstractGui.cs
+++ b/DangerousD/GameCore/GUI/AbstractGui.cs
@@ -1,8 +1,14 @@
+using System;
using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Xml;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
using MonogameLibrary.UI.Base;
+using MonogameLibrary.UI.Elements;
namespace DangerousD.GameCore.GUI;
@@ -10,6 +16,10 @@ public abstract class AbstractGui : IDrawableObject
{
protected UIManager Manager = new();
protected List Elements = new();
+ private List ActiveElements;
+ protected DrawableUIElement SelectedElement;
+ private bool isStartedPrint = false;
+ private bool isPressed = false;
public AbstractGui()
{
@@ -21,6 +31,16 @@ public abstract class AbstractGui : IDrawableObject
{
Manager.Initialize(AppManager.Instance.GraphicsDevice);
CreateUI();
+ ActiveElements = new List();
+ foreach (var element in Elements)
+ {
+ if (CheckOnBadElements(element))
+ {
+ ActiveElements.Add(element);
+ }
+ }
+ if (ActiveElements.Count > 0) { SelectedElement = ActiveElements.First(); }
+
}
public virtual void LoadContent()
@@ -30,11 +50,163 @@ public abstract class AbstractGui : IDrawableObject
public virtual void Update(GameTime gameTime)
{
+ string state = AppManager.Instance.InputManager.currentControlsState;
+
+
+
+ if (ActiveElements.Count != 0)
+ {
+ if (state == "Gamepad")
+ {
+ GamePadState gamePadState = GamePad.GetState(0);
+ GamepadInput(gamePadState);
+ }
+ else if (state == "Keyboard" || state == "Mouse")
+ {
+ KeyboardState keyBoardState = Keyboard.GetState();
+ KeyBoardInput(keyBoardState);
+ }
+
+ }
+
Manager.Update(gameTime);
+
+ if (SelectedElement is not null)
+ {
+ if (SelectedElement is Button)
+ {
+ (SelectedElement as Button).hoverState = MonogameLibrary.UI.Enums.HoverState.Hovering;
+ }
+ if (SelectedElement is ButtonText)
+ {
+ (SelectedElement as ButtonText).hoverState = MonogameLibrary.UI.Enums.HoverState.Hovering;
+ }
+ if (SelectedElement is TextBox)
+ {
+ TextBox box = (TextBox)SelectedElement;
+ box.hoverState = MonogameLibrary.UI.Enums.HoverState.Hovering;
+ if (isStartedPrint)
+ {
+ box.SelectIt();
+ }
+ }
+ }
}
public virtual void Draw(SpriteBatch spriteBatch)
{
Manager.Draw(spriteBatch);
}
+ protected virtual void GamepadInput(GamePadState gamePadState)
+ {
+ if (gamePadState.DPad.Up == ButtonState.Pressed && !isPressed)
+ {
+ isPressed = true;
+ ChangeSelectedElement(-1);
+ Debug.WriteLine("switch");
+ }
+ else if (gamePadState.DPad.Down == ButtonState.Pressed && !isPressed)
+ {
+ isPressed = true;
+ ChangeSelectedElement(1);
+ }
+ else if (gamePadState.Buttons.A == ButtonState.Pressed && !isPressed)
+ {
+ isPressed = true;
+ if (SelectedElement is Button)
+ {
+ Button button = SelectedElement as Button;
+ button.CallLeftBtnEvent();
+ }
+ else if (SelectedElement is TextBox)
+ {
+ TextBox textBox = SelectedElement as TextBox;
+ isStartedPrint = true;
+ }
+ }
+ else if (isPressed && (gamePadState.Buttons.A == ButtonState.Released &&
+ gamePadState.DPad.Down == ButtonState.Released &&
+ gamePadState.DPad.Up == ButtonState.Released))
+ {
+ isPressed = false;
+ }
+ }
+ protected virtual void KeyBoardInput(KeyboardState keyboardState)
+ {
+ if (keyboardState.IsKeyDown(Keys.Up) && !isPressed)
+ {
+ isPressed = true;
+ isStartedPrint = false;
+ ChangeSelectedElement(-1);
+ }
+ else if (keyboardState.IsKeyDown(Keys.Down) && !isPressed)
+ {
+ isPressed = true;
+ isStartedPrint = false;
+ ChangeSelectedElement(1);
+ }
+ else if (keyboardState.IsKeyDown(Keys.Enter) && !isPressed)
+ {
+ isPressed = true;
+ if (SelectedElement is Button)
+ {
+ Button button = SelectedElement as Button;
+ button.CallLeftBtnEvent();
+ }
+ else if (SelectedElement is TextBox)
+ {
+ TextBox textBox = SelectedElement as TextBox;
+ isStartedPrint = true;
+ }
+ }
+ else if (isPressed && (keyboardState.IsKeyUp(Keys.Enter) &&
+ keyboardState.IsKeyUp(Keys.Down) &&
+ keyboardState.IsKeyUp(Keys.Up)))
+ {
+ isPressed = false;
+ }
+ }
+ private void ChangeSelectedElement(int x) // Меняет выбранный элемент
+ {
+ for (int i = 0; i < ActiveElements.Count; i++)
+ {
+ if (ActiveElements[i] == SelectedElement)
+ {
+ if (i + x >= ActiveElements.Count)
+ {
+ SelectedElement = ActiveElements.First();
+ return;
+ }
+ else
+ {
+ if (i + x < 0)
+ {
+ SelectedElement = ActiveElements.Last();
+ return;
+ }
+ else
+ {
+ SelectedElement = ActiveElements[i + x];
+ return;
+ }
+ }
+ }
+ }
+ }
+ private bool CheckOnBadElements(DrawableUIElement element)
+ {
+ if (element is Button)
+ {
+ return true;
+ }
+ else if (element is ButtonText)
+ {
+ return true;
+ }
+ else if (element is TextBox)
+ {
+ return true;
+ }
+ else return false;
+ }
}
\ No newline at end of file
diff --git a/DangerousD/GameCore/GUI/DeathGUI.cs b/DangerousD/GameCore/GUI/DeathGUI.cs
index 5754efa..bb91470 100644
--- a/DangerousD/GameCore/GUI/DeathGUI.cs
+++ b/DangerousD/GameCore/GUI/DeathGUI.cs
@@ -13,17 +13,29 @@ internal class DeathGUI : AbstractGui
{
int wigth = AppManager.Instance.inGameResolution.X;
int height = AppManager.Instance.inGameResolution.Y;
+ float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y;
var menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), textureName = "deathBackground" };
Elements.Add(menuBackground);
menuBackground.LoadTexture(AppManager.Instance.Content);
- Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2, (height - 50) / 2 - 80, 50, 50), text = "You death", mainColor = Color.Transparent, scale = 0.7f, fontName = "ButtonFont", fontColor = Color.White });
- Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2, (height - 50) / 2, 50, 50), text = $"Score = {0}", mainColor = Color.Transparent, scale = 0.7f, fontName = "ButtonFont", fontColor = Color.White });
+ Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2, (height - 50) / 2 - 80, 50, 50), text = "You died", mainColor = Color.Transparent, scale = 0.7f, fontName = "ButtonFont", fontColor = Color.White });
+ Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2, (height - 50) / 2, 50, 50), text = $"Score: {0}", mainColor = Color.Transparent, scale = 0.7f, fontName = "ButtonFont", fontColor = Color.White });
var butMenu = new ButtonText(Manager) { rectangle = new Rectangle((wigth - 300) / 2, (height - 50) / 2 + 80, 300, 50), text = "Back to menu", scale = 0.7f, fontName = "ButtonFont" };
Elements.Add(butMenu);
butMenu.LeftButtonPressed += () =>
{
AppManager.Instance.ChangeGameState(GameState.Menu);
};
+ foreach (var item in Elements)
+ {
+ item.rectangle.X = (int)(scaler * item.rectangle.X);
+ item.rectangle.Y = (int)(scaler * item.rectangle.Y);
+ item.rectangle.Width = (int)(scaler * item.rectangle.Width);
+ item.rectangle.Height = (int)(scaler * item.rectangle.Height);
+ if (item is DrawableTextedUiElement)
+ {
+ (item as DrawableTextedUiElement).scale *= scaler;
+ }
+ }
}
public override void Update(GameTime gameTime)
diff --git a/DangerousD/GameCore/GUI/HUD.cs b/DangerousD/GameCore/GUI/HUD.cs
index ee17186..10a7fc0 100644
--- a/DangerousD/GameCore/GUI/HUD.cs
+++ b/DangerousD/GameCore/GUI/HUD.cs
@@ -6,34 +6,80 @@ using System.Xml.Linq;
using DangerousD.GameCore.Managers;
using DangerousD.GameCore;
using System.Collections.Generic;
+using Microsoft.Xna.Framework.Graphics;
+using static System.Formats.Asn1.AsnWriter;
+using static System.Net.Mime.MediaTypeNames;
namespace DangerousD.GameCore.GUI
{
- public class HUD : AbstractGui
- {
- List rects = new List { };
+ public class HUD : IDrawableObject
+ {
int wigth = AppManager.Instance.inGameResolution.X;
int height = AppManager.Instance.inGameResolution.Y;
- protected override void CreateUI()
- {
- DrawableUIElement background = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), mainColor = Color.Transparent };
- Elements.Add(background);
- Rect rect = new Rect(Manager) { rectangle = new Rectangle(wigth / 35, height / 35, 120, 70), mainColor = Color.DarkRed };
- Elements.Add(rect);
- Label label = new Label(Manager) { rectangle = new Rectangle(wigth / 34, height / 30, 120, 20), text = "ammout", fontName = "font2", scale = 0.2f, mainColor = Color.Transparent, fontColor = Color.Black };
- Elements.Add(label);
+ float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y;
+ Texture2D texture;
+ SpriteFont spriteFont;
- }
- public override void Update(GameTime gameTime)
- {
- rects.Clear();
- for (int i = 0; i < AppManager.Instance.GameManager.GetPlayer1.Bullets; i++)
+ public void Draw(SpriteBatch spriteBatch)
+ {
+ spriteBatch.Begin();
+ spriteBatch.Draw(texture, new Rectangle(wigth / 35 - 2, height / 35 - 2, 120 + 2, 70 + 2), Color.DarkRed);
+ spriteBatch.DrawString(spriteFont, "AMMO", new Vector2(wigth / 34 + 4, height / 30 - 6), Color.Gray, 0, Vector2.Zero, 1.8f, SpriteEffects.None, 0);
+ spriteBatch.DrawString(spriteFont, "AMMO", new Vector2(wigth / 34 + 1, height / 30 - 6), Color.White, 0, Vector2.Zero, 1.8f, SpriteEffects.None, 0);
+ for (int i = 0; i < 5; i++)
{
- rects.Add(new Rect(Manager) { rectangle = new Rectangle(wigth / 29 + i * 13, height / 17, 5, 20), mainColor = Color.Yellow });
- rects[i].LoadTexture(AppManager.Instance.Content);
+ if (i <= AppManager.Instance.GameManager.players[0].Bullets)
+ {
+ spriteBatch.Draw(texture, new Rectangle(wigth / 30 + i * 13 + 2, height / 17 + 4, 5, 20), new Color(0.8f, 0.8f, 0, 1f));
+ spriteBatch.Draw(texture, new Rectangle(wigth / 30 + i * 13, height / 17 + 4, 5, 20), Color.Yellow);
+ }
+ else
+ {
+ spriteBatch.Draw(texture, new Rectangle(wigth / 30 + i * 13, height / 17 + 4, 7, 20), new Color(0.2f, 0.2f, 0, 1f));
+ }
}
- base.Update(gameTime);
+ spriteBatch.End();
+ }
+
+ public void Initialize()
+ {
+ }
+
+ public void LoadContent()
+ {
+ texture = new Texture2D(AppManager.Instance.GraphicsDevice, 1, 1);
+ texture.SetData(new Color[] { Color.White });
+ spriteFont = AppManager.Instance.Content.Load("PixelFont");
+ }
+
+ public void Update(GameTime gameTime)
+ {
}
}
+ //public class HUD1 : AbstractGui
+ //{
+ //
+ // protected override void CreateUI()
+ // {
+ // DrawableUIElement background = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), mainColor = Color.Transparent };
+ // Elements.Add(background);
+ // Rect rect = new Rect(Manager) { rectangle = new Rectangle(wigth / 35, height / 35, 120, 70), mainColor = Color.DarkRed };
+ // Elements.Add(rect);
+ // Label label = new Label(Manager) { rectangle = new Rectangle(wigth / 34, height / 30, 120, 20), text = "ammout", fontName = "font2", scale = 0.2f, mainColor = Color.Transparent, fontColor = Color.Black };
+ // Elements.Add(label);
+
+ // }
+ // public override void Update(GameTime gameTime)
+ // {
+ //
+ // rects.Clear();
+ // for (int i = 0; i < ammout; i++)
+ // {
+ // rects.Add(new Rect(Manager) { rectangle = new Rectangle(wigth / 29 + i * 13, height / 17, 5, 20), mainColor = Color.Yellow });
+ // rects[i].LoadTexture(AppManager.Instance.Content);
+ // }
+ // base.Update(gameTime);
+ // }
+ //}
}
diff --git a/DangerousD/GameCore/GUI/LobbyGUI.cs b/DangerousD/GameCore/GUI/LobbyGUI.cs
index 9136760..3b8b9ab 100644
--- a/DangerousD/GameCore/GUI/LobbyGUI.cs
+++ b/DangerousD/GameCore/GUI/LobbyGUI.cs
@@ -25,6 +25,7 @@ namespace DangerousD.GameCore.GUI
{
int screenWidth = AppManager.Instance.inGameResolution.X;
int screenHeight = AppManager.Instance.inGameResolution.Y;
+ float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y;
var lobbyBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, screenWidth, screenHeight), textureName = "menuFon3" };
Elements.Add(lobbyBackground);
@@ -51,6 +52,7 @@ namespace DangerousD.GameCore.GUI
textureName = "textboxbackground6-1"
};
+ Elements.Add(searchBarTextBox);
searchBarTextBox.TextChanged += input => {
if (searchBarTextBox.fontColor == Color.Gray)
{
@@ -73,6 +75,7 @@ namespace DangerousD.GameCore.GUI
fontName = "font2",
textureName = "textboxbackground1-1"
};
+ Elements.Add(backButton);
backButton.LeftButtonPressed += () => {
AppManager.Instance.ChangeGameState(GameState.Menu);
};
@@ -86,6 +89,7 @@ namespace DangerousD.GameCore.GUI
fontName = "buttonFont",
textureName = "textboxbackground2-1"
};
+ Elements.Add(hostButton);
hostButton.LeftButtonPressed += () => {
AppManager.Instance.ChangeGameState(GameState.Game);
AppManager.Instance.NetworkManager.HostInit(AppManager.Instance.IpAddress);
@@ -101,6 +105,7 @@ namespace DangerousD.GameCore.GUI
fontName = "buttonFont",
textureName = "textboxbackground2-1"
};
+ Elements.Add(refreshButton);
refreshButton.LeftButtonPressed += () => {
};
@@ -114,6 +119,7 @@ namespace DangerousD.GameCore.GUI
fontName = "buttonFont",
textureName = "textboxbackground2-1"
};
+ Elements.Add(joinSelectedButton);
joinSelectedButton.LeftButtonPressed += () => {
AppManager.Instance.ChangeGameState(GameState.Game);
AppManager.Instance.NetworkManager.ClientInit(AppManager.Instance.IpAddress);
@@ -127,10 +133,25 @@ namespace DangerousD.GameCore.GUI
fontName = "buttonFont",
textureName = "textboxbackground2-1"
};
+ Elements.Add(joinByIpButton);
joinByIpButton.LeftButtonPressed += () => {
AppManager.Instance.NetworkManager.ClientInit(searchBarTextBox.text);
};
}
+
+
+
+ foreach (var item in Elements)
+ {
+ item.rectangle.X = (int)(scaler * item.rectangle.X);
+ item.rectangle.Y = (int)(scaler * item.rectangle.Y);
+ item.rectangle.Width = (int)(scaler * item.rectangle.Width);
+ item.rectangle.Height = (int)(scaler * item.rectangle.Height);
+ if (item is DrawableTextedUiElement)
+ {
+ (item as DrawableTextedUiElement).scale *= scaler;
+ }
+ }
}
}
}
diff --git a/DangerousD/GameCore/GUI/LoginGUI.cs b/DangerousD/GameCore/GUI/LoginGUI.cs
index 37a62eb..5b7f972 100644
--- a/DangerousD/GameCore/GUI/LoginGUI.cs
+++ b/DangerousD/GameCore/GUI/LoginGUI.cs
@@ -26,6 +26,7 @@ namespace DangerousD.GameCore.GUI
{
int screenWidth = AppManager.Instance.inGameResolution.X;
int screenHeight = AppManager.Instance.inGameResolution.Y;
+ float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y;
var loginBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, screenWidth, screenHeight), textureName = "menuFon2" };
Elements.Add(loginBackground);
@@ -40,6 +41,19 @@ namespace DangerousD.GameCore.GUI
fontName = "ButtonFont"
});
+ Button backButton = new Button(Manager)
+ {
+ rectangle = new Rectangle(screenWidth / 20, screenHeight / 15, (int)(40 * 2.4), (int)(40 * 2.4)),
+ fontColor = Color.Black,
+ fontName = "font2",
+ textureName = "textboxbackground1-1"
+ };
+ backButton.LeftButtonPressed += () => {
+ AppManager.Instance.ChangeGameState(GameState.Menu);
+ };
+ Elements.Add(backButton);
+
+
// TextBox-ы
{
TextBox loginTextBox = new TextBox(Manager)
@@ -53,6 +67,7 @@ namespace DangerousD.GameCore.GUI
textureName = "textboxbackground6-1"
};
+ Elements.Add(loginTextBox);
loginTextBox.LoadTexture(AppManager.Instance.Content);
loginTextBox.TextChanged += input => {
if (loginTextBox.fontColor == Color.Gray)
@@ -67,6 +82,7 @@ namespace DangerousD.GameCore.GUI
loginTextBox.fontColor = Color.Gray;
}
};
+ Elements.Add(loginTextBox);
TextBox passwordTextBox = new TextBox(Manager)
{
@@ -78,6 +94,7 @@ namespace DangerousD.GameCore.GUI
textAligment = TextAligment.Left,
textureName = "textboxbackground6-1"
};
+ Elements.Add(passwordTextBox);
passwordTextBox.LoadTexture(AppManager.Instance.Content);
passwordTextBox.TextChanged += input => {
if (passwordTextBox.fontColor == Color.Gray)
@@ -92,6 +109,7 @@ namespace DangerousD.GameCore.GUI
passwordTextBox.fontColor = Color.Gray;
}
};
+ Elements.Add(passwordTextBox);
}
// Кнопки
@@ -104,12 +122,14 @@ namespace DangerousD.GameCore.GUI
fontName = "ButtonFont",
textureName = "textboxbackground2-1"
};
+ Elements.Add(logButton);
logButton.LeftButtonPressed += () => {
if (CheckUser())
{
AppManager.Instance.ChangeGameState(GameState.Lobby);
}
};
+ Elements.Add(logButton);
Button regButton = new Button(Manager)
{
@@ -120,20 +140,22 @@ namespace DangerousD.GameCore.GUI
fontName = "ButtonFont",
textureName = "textboxbackground2-1"
};
+ Elements.Add(regButton);
regButton.LeftButtonPressed += GoToRegWebServer;
+ Elements.Add(regButton);
- Button backButton = new Button(Manager)
+
+ }
+ foreach (var item in Elements)
+ {
+ item.rectangle.X = (int)(scaler * item.rectangle.X);
+ item.rectangle.Y = (int)(scaler * item.rectangle.Y);
+ item.rectangle.Width = (int)(scaler * item.rectangle.Width);
+ item.rectangle.Height = (int)(scaler * item.rectangle.Height);
+ if (item is DrawableTextedUiElement)
{
- rectangle = new Rectangle(screenWidth / 20, screenHeight / 15, (int)(40 * 2.4), (int)(40 * 2.4)),
- text = "<-",
- scale = 0.72f,
- fontColor = Color.Black,
- fontName = "font2",
- textureName = "textboxbackground1-1"
- };
- backButton.LeftButtonPressed += () => {
- AppManager.Instance.ChangeGameState(GameState.Menu);
- };
+ (item as DrawableTextedUiElement).scale *= scaler;
+ }
}
}
diff --git a/DangerousD/GameCore/GUI/MenuGUI.cs b/DangerousD/GameCore/GUI/MenuGUI.cs
index fedaacb..214e747 100644
--- a/DangerousD/GameCore/GUI/MenuGUI.cs
+++ b/DangerousD/GameCore/GUI/MenuGUI.cs
@@ -22,9 +22,10 @@ internal class MenuGUI : AbstractGui
List BigLetterPositions = new List();
protected override void CreateUI()
{
- int wigth = AppManager.Instance.inGameResolution.X;
- int height = AppManager.Instance.inGameResolution.Y;
-
+ int wigth = AppManager.Instance.inGameHUDHelperResolution.X;
+ int height = AppManager.Instance.inGameHUDHelperResolution.Y;
+ float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y;
+
var menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), textureName = "menuFon" };
Elements.Add(menuBackground);
menuBackground.LoadTexture(AppManager.Instance.Content);
@@ -50,6 +51,7 @@ internal class MenuGUI : AbstractGui
{
AppManager.Instance.ChangeGameState(GameState.Game);
AppManager.Instance.SetMultiplayerState(MultiPlayerStatus.SinglePlayer);
+
};
var butMulti = new ButtonText(Manager) { rectangle = new Rectangle((wigth - (int)(300 * 2.4)) / 2, 470, (int)(300 * 2.4), (int)(50 * 2.4)), text = "Multiplayer", scale = 1.2f, fontName = "ButtonFont" };
@@ -57,7 +59,7 @@ internal class MenuGUI : AbstractGui
Elements.Add(butMulti);
butMulti.LeftButtonPressed += () =>
{
- AppManager.Instance.ChangeGameState(GameState.Login);
+ AppManager.Instance.ChangeGameState(GameState.Login);
};
var butOption = new ButtonText(Manager) { rectangle = new Rectangle((wigth - (int)(160 * 2.4)) / 2, 590, (int)(160 * 2.4), (int)(50 * 2.4)), text = "Option", scale = 1.2f, fontName = "ButtonFont" };
Elements.Add(butOption);
@@ -72,6 +74,18 @@ internal class MenuGUI : AbstractGui
{
AppManager.Instance.Exit();
};
+
+ foreach ( var item in Elements)
+ {
+ item.rectangle.X = (int)(scaler * item.rectangle.X);
+ item.rectangle.Y = (int)(scaler * item.rectangle.Y);
+ item.rectangle.Width = (int)(scaler * item.rectangle.Width);
+ item.rectangle.Height = (int)(scaler * item.rectangle.Height);
+ if (item is DrawableTextedUiElement)
+ {
+ (item as DrawableTextedUiElement).scale *= scaler;
+ }
+ }
}
diff --git a/DangerousD/GameCore/GUI/OptionsGUI.cs b/DangerousD/GameCore/GUI/OptionsGUI.cs
index 6fc95c7..18ccd77 100644
--- a/DangerousD/GameCore/GUI/OptionsGUI.cs
+++ b/DangerousD/GameCore/GUI/OptionsGUI.cs
@@ -13,10 +13,11 @@ namespace DangerousD.GameCore.GUI
int selectedGUI = 0;
protected override void CreateUI()
{
- int wigth = AppManager.Instance.inGameResolution.X;
- int height = AppManager.Instance.inGameResolution.Y;
+ int wigth = AppManager.Instance.inGameHUDHelperResolution.X;
+ int height = AppManager.Instance.inGameHUDHelperResolution.Y;
+ float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y;
var menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), textureName = "optionsBackground" };
- Elements.Add(menuBackground);
+ //Elements.Add(menuBackground);
menuBackground.LoadTexture(AppManager.Instance.Content);
var slider = new Slider(Manager)
@@ -27,6 +28,8 @@ namespace DangerousD.GameCore.GUI
indentation = 5,
textureName = "sliderBackground"
};
+ //Elements.Add(slider);
+ //AppManager.Instance.SettingsManager.SetMainVolume(slider.GetSliderValue);
var cB = new CheckBox(Manager);
cB.rectangle = new Rectangle(wigth / 2 + 440, 405, (int)(40 * 2.4), (int)(40 * 2.4));
@@ -35,26 +38,28 @@ namespace DangerousD.GameCore.GUI
SettingsManager sM = new SettingsManager();
};
cB.LoadTexture(AppManager.Instance.Content);
+ Elements.Add(cB);
var checkBox = new CheckBox(Manager);
checkBox.rectangle = new Rectangle(wigth / 2 + 360, 540, (int)(40 * 2.4), (int)(40 * 2.4));
checkBox.Checked += (newCheckState) =>
{
- SettingsManager sM = new SettingsManager();
+ AppManager.Instance.SettingsManager.SetIsFullScreen(newCheckState);
};
checkBox.LoadTexture(AppManager.Instance.Content);
+ Elements.Add(checkBox);
Label lblOptions = new Label(Manager)
{ fontName = "buttonFont", scale = 1.2f, text = "Options", fontColor = Color.White, rectangle = new Rectangle((wigth - 50) / 2, 40, 50, 50), mainColor = Color.Transparent };
Elements.Add(lblOptions);
Label lblValue = new Label(Manager)
- { fontName = "buttonFont", scale = 1f, text = "Volume", fontColor = Color.White, rectangle = new Rectangle((wigth - 50) / 2, 250, 50, 50), mainColor = Color.Transparent };
+ { fontName = "buttonFont", scale = 1f , text = "Volume", fontColor = Color.White, rectangle = new Rectangle((wigth - 50) / 2, 250, 50, 50), mainColor = Color.Transparent };
Elements.Add(lblValue);
Label lblIsFullScreen = new Label(Manager)
- { fontName = "buttonFont", scale = 1f, text = "Full Screen", fontColor = Color.White, rectangle = new Rectangle((wigth - 50) / 2, 580, 50, 50), mainColor = Color.Transparent };
- Elements.Add(lblOptions);
+ { fontName = "buttonFont", scale = 1f , text = "Full Screen", fontColor = Color.White, rectangle = new Rectangle((wigth - 50) / 2, 580, 50, 50), mainColor = Color.Transparent };
+ Elements.Add(lblIsFullScreen);
Label lblSwitchMode = new Label(Manager)
{ fontName = "buttonFont", scale = 1f, text = "Left/Right Mode", fontColor = Color.White, rectangle = new Rectangle((wigth - 50) / 2, 415, 50, 50), mainColor = Color.Transparent };
@@ -67,6 +72,26 @@ namespace DangerousD.GameCore.GUI
{
AppManager.Instance.ChangeGameState(GameState.Menu);
};
+
+ foreach (var item in Elements)
+ {
+ item.rectangle.X = (int)(scaler * item.rectangle.X);
+ item.rectangle.Y = (int)(scaler * item.rectangle.Y);
+ item.rectangle.Width = (int)(scaler * item.rectangle.Width);
+ item.rectangle.Height = (int)(scaler * item.rectangle.Height);
+ if (item is DrawableTextedUiElement)
+ {
+ (item as DrawableTextedUiElement).scale *= scaler;
+ }
+ }
+ slider.rectangle.X = (int)(scaler * slider.rectangle.X);
+ slider.rectangle.Y = (int)(scaler * slider.rectangle.Y);
+ //slider.rectangle.Width = (int)(scaler * slider.rectangle.Width);
+ //slider.rectangle.Height = (int)(scaler * slider.rectangle.Height);
+ if (slider is DrawableTextedUiElement)
+ {
+ (slider as DrawableTextedUiElement).scale *= scaler;
+ }
}
public override void Update(GameTime gameTime)
{
diff --git a/DangerousD/GameCore/InputManager.cs b/DangerousD/GameCore/InputManager.cs
index ef255ae..edf08bd 100644
--- a/DangerousD/GameCore/InputManager.cs
+++ b/DangerousD/GameCore/InputManager.cs
@@ -32,6 +32,7 @@ namespace DangerousD.GameCore
public Vector2 VectorMovementDirection { get => vectorMovementDirection; }
public ScopeState ScopeState { get => scopeState; }
+ public string currentControlsState;
public InputManager()
{
@@ -205,7 +206,12 @@ namespace DangerousD.GameCore
{
isShoot = false;
}
+ SetState(ControlsState.Keyboard);
}
}
+ public void SetState(ControlsState controlsState)
+ {
+ currentControlsState = controlsState.ToString();
+ }
}
}
diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index ab1b173..9a1e46a 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
namespace DangerousD.GameCore
{
public enum MultiPlayerStatus { SinglePlayer, Host, Client }
- public enum GameState { Menu, Options, Lobby, Game, Login, Death, HUD,
+ public enum GameState { Menu, Options, Lobby, Game, Login, Death,
GameOver
}
public class AppManager : Game
@@ -28,15 +28,17 @@ namespace DangerousD.GameCore
private SpriteBatch _spriteBatch;
public GameState gameState { get; private set; }
public MultiPlayerStatus multiPlayerStatus { get; private set; } = MultiPlayerStatus.SinglePlayer;
- public Point resolution = new Point(1920, 1080);
+ public Point resolution;
public Point inGameResolution = new Point(1920, 1080);
+ public Point inGameHUDHelperResolution = new Point(1920, 1080);
IDrawableObject MenuGUI;
IDrawableObject OptionsGUI;
IDrawableObject LoginGUI;
IDrawableObject LobbyGUI;
IDrawableObject DeathGUI;
- IDrawableObject HUD;
+ //IDrawableObject HUD;
public DebugHUD DebugHUD;
+ public HUD HUD;
public List NetworkTasks = new List();
public GameManager GameManager { get; private set; } = new();
@@ -61,9 +63,7 @@ namespace DangerousD.GameCore
NetworkManager.GetReceivingMessages += NetworkSync;
resolution = SettingsManager.Resolution;
- _graphics.PreferredBackBufferWidth = resolution.X;
- _graphics.PreferredBackBufferHeight = resolution.Y;
- _graphics.IsFullScreen = false;
+
gameState = GameState.Menu;
MenuGUI = new MenuGUI();
LoginGUI = new LoginGUI();
@@ -72,8 +72,8 @@ namespace DangerousD.GameCore
DeathGUI = new DeathGUI();
HUD = new HUD();
DebugHUD = new DebugHUD();
- UIManager.resolution = resolution;
- UIManager.resolutionInGame = inGameResolution;
+ UIManager.resolution = new Point(_graphics.PreferredBackBufferWidth, _graphics.PreferredBackBufferHeight);
+ UIManager.resolutionInGame = resolution;
}
protected override void Initialize()
@@ -104,7 +104,7 @@ namespace DangerousD.GameCore
GameObject.debugTexture.SetData(new Color[] { new Color(1, 0,0,0.25f) });
SoundManager.LoadSounds();
SoundManager.StartAmbientSound("DoomTestSong");
- renderTarget = new RenderTarget2D(GraphicsDevice, inGameResolution.X, inGameResolution.Y);
+ renderTarget = new RenderTarget2D(GraphicsDevice, resolution.X, resolution.Y);
}
protected override void Update(GameTime gameTime)
@@ -133,10 +133,8 @@ namespace DangerousD.GameCore
case GameState.Death:
DeathGUI.Update(gameTime);
break;
- case GameState.HUD:
- HUD.Update(gameTime);
- break;
case GameState.Game:
+ HUD.Update(gameTime);
GameManager.Update(gameTime);
break;
default:
@@ -169,13 +167,11 @@ namespace DangerousD.GameCore
case GameState.Death:
DeathGUI.Draw(_spriteBatch);
break;
- case GameState.HUD:
- HUD.Draw(_spriteBatch);
- break;
case GameState.Game:
_spriteBatch.Begin(SpriteSortMode.Deferred, null, SamplerState.PointClamp);
GameManager.Draw(_spriteBatch);
_spriteBatch.End();
+ HUD.Draw(_spriteBatch);
break;
default:
break;
@@ -289,5 +285,24 @@ namespace DangerousD.GameCore
{
this.multiPlayerStatus = multiPlayerStatus;
}
+ public void SetIsFullScreen(bool fullscrin)
+ {
+ DebugHUD?.Set("resX:", SettingsManager.Resolution.X.ToString());
+ DebugHUD?.Set("resY:", SettingsManager.Resolution.Y.ToString());
+ DebugHUD?.Set("FullScreen:", _graphics.IsFullScreen.ToString());
+ if (fullscrin)
+ {
+ _graphics.PreferredBackBufferWidth = 1920;
+ _graphics.PreferredBackBufferHeight = 1080;
+ }
+ else
+ {
+ _graphics.PreferredBackBufferWidth = SettingsManager.Resolution.X;
+ _graphics.PreferredBackBufferHeight = SettingsManager.Resolution.Y;
+ }
+ UIManager.resolution = new Point(_graphics.PreferredBackBufferWidth, _graphics.PreferredBackBufferHeight);
+ _graphics.IsFullScreen = fullscrin;
+ _graphics.ApplyChanges();
+ }
}
}
diff --git a/DangerousD/GameCore/Managers/SettingsManager.cs b/DangerousD/GameCore/Managers/SettingsManager.cs
index 7a55447..b781ef1 100644
--- a/DangerousD/GameCore/Managers/SettingsManager.cs
+++ b/DangerousD/GameCore/Managers/SettingsManager.cs
@@ -27,22 +27,26 @@ namespace DangerousD.GameCore.Managers
public void SetMainVolume(float volume)
{
settingsContainer.MainVolume = MainVolume;
- ///AppManager.Instance.SoundManager.
+ //AppManager.Instance.SoundManager.
}
public void SetMusicVolume(float volume)
{
settingsContainer.MusicVolume = MainVolume;
+ SaveSettings();
}
public void SetSoundEffectsVolume(float volume)
{
settingsContainer.SoundEffectsVolume = MainVolume;
+ SaveSettings();
}
public void SetIsFullScreen(bool isFullScreen)
{
settingsContainer.IsFullScreen = isFullScreen;
+ AppManager.Instance.SetIsFullScreen(isFullScreen);
+ SaveSettings();
}
public void LoadSettings()
{
diff --git a/MonogameLibrary/UI/Elements/Button.cs b/MonogameLibrary/UI/Elements/Button.cs
index cf7d5ce..769335f 100644
--- a/MonogameLibrary/UI/Elements/Button.cs
+++ b/MonogameLibrary/UI/Elements/Button.cs
@@ -16,7 +16,7 @@ namespace MonogameLibrary.UI.Elements
public delegate void OnButtonPressed();
public event OnButtonPressed? RightButtonPressed;
public event OnButtonPressed? LeftButtonPressed;
- protected HoverState hoverState = HoverState.None;
+ public HoverState hoverState = HoverState.None;
public Button(UIManager manager, int layerIndex = 0) : base(manager, layerIndex)
{
@@ -40,7 +40,7 @@ namespace MonogameLibrary.UI.Elements
if (mouseState.LeftButton != prevmouseState.LeftButton)
{
hoverState = HoverState.Pressing;
- LeftButtonPressed?.Invoke();
+ CallLeftBtnEvent();
return true;
}
}
@@ -77,5 +77,9 @@ namespace MonogameLibrary.UI.Elements
DrawText(_spriteBatch);
}
+ public void CallLeftBtnEvent()
+ {
+ LeftButtonPressed?.Invoke();
+ }
}
}
diff --git a/MonogameLibrary/UI/Elements/TextBox.cs b/MonogameLibrary/UI/Elements/TextBox.cs
index 3649692..87534eb 100644
--- a/MonogameLibrary/UI/Elements/TextBox.cs
+++ b/MonogameLibrary/UI/Elements/TextBox.cs
@@ -26,9 +26,13 @@ namespace MonogameLibrary.UI.Elements
public event OnTextChange? StopChanging;
public event OnTextChange? OnEnter;
- protected HoverState hoverState = HoverState.None;
+ public HoverState hoverState = HoverState.None;
protected IsSelected isSelected = IsSelected.NotSelected;
public bool shouldEndOnEnter;
+ public void SelectIt()
+ {
+ isSelected = IsSelected.Selected;
+ }
public virtual bool InteractUpdate(MouseState mouseState, MouseState prevmouseState)
{