[191] Button gemacht! Mit Hover!! Hurra

OctoAwesome · Jul 9, 2015 · fc8f882 · fc8f882
1 parent 526a77f
commit fc8f882
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 8 deletions.
diff --git a/OctoAwesome/OctoAwesome.Client/Components/Hud/ButtonControl.cs b/OctoAwesome/OctoAwesome.Client/Components/Hud/ButtonControl.cs
@@ -0,0 +1,47 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OctoAwesome.Client.Components.Hud
+{
+    internal class ButtonControl : Control
+    {
+        public Brush Background { get; set; }
+
+        public Brush Hovered { get; set; }
+
+        public string Text { get; set; }
+
+        public SpriteFont Font { get; set; }
+
+        public Color Color { get; set; }
+
+        public ButtonControl(IScreenManager screenManager) : base(screenManager) { }
+
+        public override void Draw(SpriteBatch batch, GameTime gameTime)
+        {
+            if (IsHovered)
+            {
+                if (Hovered != null)
+                    Hovered.Draw(batch, new Rectangle(Position.X, Position.Y, Size.X, Size.Y));
+                else if (Background != null)
+                    Background.Draw(batch, new Rectangle(Position.X, Position.Y, Size.X, Size.Y));
+            }
+            else
+            {
+                if (Background != null)
+                    Background.Draw(batch, new Rectangle(Position.X, Position.Y, Size.X, Size.Y));
+            }
+
+            batch.Begin();
+            Vector2 textSize = Font.MeasureString(Text);
+            batch.DrawString(Font, Text, new Vector2(
+                Position.X + ((Size.X - textSize.X) / 2),
+                Position.Y + ((Size.Y - textSize.Y) / 2)), Color);
+            batch.End();
+        }
+    }
+}
diff --git a/OctoAwesome/OctoAwesome.Client/Components/Hud/Control.cs b/OctoAwesome/OctoAwesome.Client/Components/Hud/Control.cs
@@ -17,6 +17,8 @@ internal abstract class Control : UiElement
 
         public bool Visible { get; set; }
 
+        public bool IsHovered { get; internal set; }
+
         public Control(IScreenManager screenManager) : base(screenManager)
         {
             Enabled = true;

diff --git a/OctoAwesome/OctoAwesome.Client/Components/Hud/InventoryScreen.cs b/OctoAwesome/OctoAwesome.Client/Components/Hud/InventoryScreen.cs
@@ -13,6 +13,7 @@ internal class InventoryScreen : Screen
 
         private PanelControl panel;
         private LabelControl headline;
+        private ButtonControl closeButton;
 
         public InventoryScreen(IScreenManager screenManager) : base(screenManager)
         {
@@ -43,6 +44,20 @@ public override void LoadContent()
             };
             Controls.Add(headline);
 
+            closeButton = new ButtonControl(ScreenManager) {
+                Background = new SolidColorBrush(ScreenManager) { Color = Color.DarkBlue },
+                Hovered = new SolidColorBrush(ScreenManager) { Color = Color.Blue },
+                Font = ScreenManager.NormalText,
+                Text = "Close",
+                Color = Color.White,
+                Position = new Index2(
+                    ((ScreenManager.ScreenSize.X - 600) / 2) + 100,
+                    ((ScreenManager.ScreenSize.Y - 400) / 2) + 170),
+                Size = new Index2(200, 50),
+            };
+
+            Controls.Add(closeButton);
+
             foreach (var control in Controls)
                 control.LoadContent();
         }

diff --git a/OctoAwesome/OctoAwesome.Client/Components/Hud/Screen.cs b/OctoAwesome/OctoAwesome.Client/Components/Hud/Screen.cs
@@ -11,7 +11,7 @@ internal abstract class Screen : UiElement
 
         private List<Control> controls = new List<Control>();
 
-        protected List<Control> Controls
+        public List<Control> Controls
         {
             get
             {

diff --git a/OctoAwesome/OctoAwesome.Client/Components/Input/KeyboardScreenInput.cs b/OctoAwesome/OctoAwesome.Client/Components/Input/KeyboardScreenInput.cs
@@ -14,6 +14,7 @@ internal class KeyboardScreenInput : IScreenInputSet
         public Index2 PointerPosition
         {
             get { return Index2.Zero; }
+            set { }
         }
 
         public void Update()

diff --git a/OctoAwesome/OctoAwesome.Client/Components/Input/MouseScreenInput.cs b/OctoAwesome/OctoAwesome.Client/Components/Input/MouseScreenInput.cs
@@ -8,12 +8,21 @@ namespace OctoAwesome.Client.Components.Input
 {
     internal class MouseScreenInput : IScreenInputSet
     {
-        public Index2 PointerPosition { get; private set; }
+        private Index2 mousePointer;
+
+        public Index2 PointerPosition
+        {
+            get { return mousePointer; }
+            set
+            {
+                Mouse.SetPosition(value.X, value.Y);
+            }
+        }
 
         public void Update()
         {
             MouseState state = Mouse.GetState();
-            PointerPosition = new Index2(state.X, state.Y);
+            mousePointer = new Index2(state.X, state.Y);
         }
 
         public event OnKeyChange OnKeyDown;

diff --git a/OctoAwesome/OctoAwesome.Client/Components/InputComponent.cs b/OctoAwesome/OctoAwesome.Client/Components/InputComponent.cs
@@ -15,6 +15,8 @@ internal sealed class InputComponent : GameComponent, IInputSet, IScreenInputSet
         private List<IInputSet> inputDevices;
         private List<IScreenInputSet> screenInputDevices;
 
+        private Index2 mousePointer;
+
         private MouseInput mouse;
         private KeyboardInput keyboard;
         private GamePadInput gamepad;
@@ -23,7 +25,12 @@ internal sealed class InputComponent : GameComponent, IInputSet, IScreenInputSet
         private KeyboardScreenInput screenKeyboard;
 
         public bool ScreenMode { get; set; }
-        public Index2 PointerPosition { get; private set; }
+        public Index2 PointerPosition
+        {
+            get { return mousePointer; }
+            set { screenMouse.PointerPosition = value; }
+        }
+
         public float MoveX { get; private set; }
         public float MoveY { get; private set; }
         public float HeadX { get; private set; }
@@ -89,7 +96,7 @@ public override void Update(GameTime gameTime)
                 Game.IsMouseVisible = true;
                 screenMouse.Update();
                 screenKeyboard.Update();
-                PointerPosition = screenMouse.PointerPosition;
+                mousePointer = screenMouse.PointerPosition;
             }
             else
             {

diff --git a/OctoAwesome/OctoAwesome.Client/Components/ScreenManagerComponent.cs b/OctoAwesome/OctoAwesome.Client/Components/ScreenManagerComponent.cs
@@ -32,12 +32,17 @@ public ScreenManagerComponent(Game game, InputComponent input)
 
         void input_OnKeyUp(Keys key)
         {
-            throw new NotImplementedException();
+            if (key == Keys.Escape)
+            {
+                ActiveScreen = null;
+                input.PointerPosition = ScreenSize / 2;
+                input.ScreenMode = false;
+            }
         }
 
         void input_OnKeyDown(Keys key)
         {
-            throw new NotImplementedException();
+            // throw new NotImplementedException();
         }
 
         protected override void LoadContent()
@@ -60,6 +65,17 @@ public override void Update(GameTime gameTime)
                 input.ScreenMode = true;
             }
 
+            if (ActiveScreen != null)
+            {
+                foreach (var control in ActiveScreen.Controls)
+                {
+                    control.IsHovered = (input.PointerPosition.X >= control.Position.X && 
+                        input.PointerPosition.X <= control.Position.X + control.Size.X && 
+                        input.PointerPosition.Y >= control.Position.Y && 
+                        input.PointerPosition.Y <= control.Position.Y + control.Size.Y);
+                }
+            }
+
             base.Update(gameTime);
         }
 

diff --git a/OctoAwesome/OctoAwesome.Client/OctoAwesome.Client.csproj b/OctoAwesome/OctoAwesome.Client/OctoAwesome.Client.csproj
@@ -48,6 +48,7 @@
     <Compile Include="Components\ChunkRenderer.cs" />
     <Compile Include="Components\CameraComponent.cs" />
     <Compile Include="Components\Hud\Brush.cs" />
+    <Compile Include="Components\Hud\ButtonControl.cs" />
     <Compile Include="Components\Hud\Compass.cs" />
     <Compile Include="Components\Hud\Control.cs" />
     <Compile Include="Components\Hud\DebugInfos.cs" />

diff --git a/OctoAwesome/OctoAwesome/IScreenInputSet.cs b/OctoAwesome/OctoAwesome/IScreenInputSet.cs
@@ -8,7 +8,7 @@ namespace OctoAwesome
 {
     public interface IScreenInputSet
     {
-        Index2 PointerPosition { get; }
+        Index2 PointerPosition { get; set; }
 
         event OnKeyChange OnKeyDown;