Changeset 1734

Timestamp:

2011-06-07 15:08:33 (12 years ago)

Author:

tekrjant

Message:

• Map and HUD are no separeted
• Button works with events
• Lots of minor stuff

Location:

2011/23/sijoseha/AdventureGame/AdventureGame

Files:

• AdventureGame.cs (modified) (7 diffs)
• AdventureGame.csproj (modified) (1 diff)
• Button.cs (modified) (2 diffs)
• HUD.cs (added)

2011/23/sijoseha/AdventureGame/AdventureGame/AdventureGame.cs

@@ -22 +22 @@
         GraphicsDeviceManager graphics;
         
-        
-
         SpriteBatch spriteBatch;
 
-        
         static public int TILE_SIZE = 32;
         static public Texture2D selectionBox;
@@ -36 +33 @@
         Map gameMap;
         Camera gameCamera;
+        HUD gameHUD;
 
         Viewport mapView, hudView;
@@ -75 +73 @@
             tileImage = Content.Load<Texture2D>("tilet");
 
+            gameHUD = new HUD();
+            gameHUD.ViewPort = new Viewport(graphics.PreferredBackBufferWidth - 200, 0, 200, graphics.PreferredBackBufferHeight);
+            gameHUD.AddButton(new Button(new Rectangle(10, 10, 150, 40), "Save", Color.YellowGreen, Color.Red, GraphicsDevice));
+            gameHUD.Buttons[0].Clicked += new ButtonClickedHandler(SaveMap);
             mapView = new Viewport(0, 0, graphics.PreferredBackBufferWidth - 200, graphics.PreferredBackBufferHeight);
-            hudView = new Viewport(graphics.PreferredBackBufferWidth - 200, 0, 200, graphics.PreferredBackBufferHeight);
 
             gameMap = new Map(this, tileImage, TILE_SIZE, 50, 20);
             gameCamera = new Camera();
-            saveButton = new Button(new Rectangle(10, 10, 150, 40), "Save", Color.YellowGreen, Color.Red, GraphicsDevice);
         }
 
@@ -108 +108 @@
             if (previousMouseState.LeftButton == ButtonState.Released && mouseState.LeftButton == ButtonState.Pressed)
             {
-                if (mouseState.X < graphics.PreferredBackBufferWidth - 200)
+                if (mouseState.X < gameHUD.ViewPort.X)
                 {
                     Vector2 mouseWorldPos = gameCamera.getMouseWorldPos(new Vector2(mouseState.X, mouseState.Y), mapView);
@@ -123 +123 @@
                 else
                 {
-                    Vector2 mouseWorldPos = gameCamera.getMouseWorldPos(new Vector2(mouseState.X - hudView.X, mouseState.Y), hudView);
+                    Vector2 mouseWorldPos = gameCamera.getMouseWorldPos(new Vector2(mouseState.X - gameHUD.ViewPort.X, mouseState.Y), gameHUD.ViewPort);
                     Rectangle mousePos = new Rectangle((int)mouseWorldPos.X, (int)mouseWorldPos.Y, 1, 1);
-                    if (mousePos.Intersects(saveButton.Boundaries))
-                        SaveMap();
+                    foreach (Button button in gameHUD.Buttons)
+                    {
+                        if (mousePos.Intersects(button.Boundaries))
+                            button.Pressed();
+                    }
                 }
             }
@@ -165 +168 @@
             gameMap.Draw(spriteBatch);
             spriteBatch.End();
-            GraphicsDevice.Viewport = hudView;
+            GraphicsDevice.Viewport = gameHUD.ViewPort;
             spriteBatch.Begin();
-            saveButton.Draw(spriteBatch);
+            gameHUD.Draw(spriteBatch);
             spriteBatch.End();
 
@@ -173 +176 @@
         }
 
-        private void SaveMap()
+        private void SaveMap(object sender, EventArgs e)
         {
             //FileStream mapFile = File.Create("savedMap,xml");

2011/23/sijoseha/AdventureGame/AdventureGame/AdventureGame.csproj

@@ -110 +110 @@
     <Compile Include="Button.cs" />
     <Compile Include="Camera.cs" />
+    <Compile Include="HUD.cs" />
     <Compile Include="Map.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

2011/23/sijoseha/AdventureGame/AdventureGame/Button.cs

@@ -9 +9 @@
 namespace AdventureGame
 {
+
+    public delegate void ButtonClickedHandler(object sender, EventArgs e);
+
     public class Button
     {
+        public event ButtonClickedHandler Clicked;
+
         public Vector2 Position { get { return new Vector2(Boundaries.X, Boundaries.Y); } set { } }
         public Rectangle Boundaries { get; set; }
@@ -44 +49 @@
         }
 
+        protected void OnClicked(EventArgs e)
+        {
+            if (Clicked != null)
+                Clicked(this, e);
+        }
+
+        public void Pressed()
+        {
+            OnClicked(EventArgs.Empty);
+        }
+
         public void Draw(SpriteBatch sb)
         {