Changeset 1758

Timestamp:

2011-06-08 14:50:49 (9 years ago)

Author:

tekrjant

Message:

Minor changes

Location:

2011/23/sijoseha/AdventureGame/AdventureGame

Files:

• AdventureGame.cs (modified) (10 diffs)
• Button.cs (modified) (5 diffs)
• HUD.cs (modified) (2 diffs)
• Tile.cs (modified) (1 diff)

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

@@ -20 +20 @@
     public class AdventureGame : Microsoft.Xna.Framework.Game
     {
+        #region PublicStuff
+
         GraphicsDeviceManager graphics;
         
@@ -38 +40 @@
         Viewport mapView, hudView, miniMapView;
 
-        Button saveButton;
+        #endregion
 
         public AdventureGame()
@@ -54 +56 @@
         protected override void Initialize()
         {
-
-
-            //graphics.IsFullScreen = true;
-            //graphics.ApplyChanges();
             IsMouseVisible = true;
             base.Initialize();
@@ -70 +68 @@
             // Create a new SpriteBatch, which can be used to draw textures.
             spriteBatch = new SpriteBatch(GraphicsDevice);
+
+            LoadTextures();
             basicFont = Content.Load<SpriteFont>("Basicfont");
-            selectionBox = Content.Load<Texture2D>("selectionbox");
-            tileImage = Content.Load<Texture2D>("tilet");
-            miniMapBorders = Content.Load<Texture2D>("miniMapBorders");
-
-            mapView = new Viewport(0, 0,
-                graphics.PreferredBackBufferWidth - 200,
-                graphics.PreferredBackBufferHeight);
-            hudView = new Viewport(graphics.PreferredBackBufferWidth - 200,
-                0, 200, graphics.PreferredBackBufferHeight);
-            miniMapView = new Viewport(graphics.PreferredBackBufferWidth - 200,
-                graphics.PreferredBackBufferHeight - 200, 200, 200);
-
-            gameHUD = new HUD();
-            gameHUD.ViewPort = hudView;
-            gameHUD.AddButton(new Button(new Rectangle(10, 10, 150, 40), "Save", Color.YellowGreen, Color.Red, GraphicsDevice));
-            
-            gameHUD.Buttons[0].Clicked += new ButtonClickedHandler(SaveMap);
-
-            gameMap = new Map(this, tileImage, TILE_SIZE, 200, 200);
-            gameHUD.AddMiniMap(new MiniMap(gameMap, miniMapView, miniMapBorders));
+
+            CreateViews();
+            gameMap = new Map(this, tileImage, TILE_SIZE, 20, 20);
+            CreateHUD();
+
             gameCamera = new Camera(mapView);
         }
@@ -102 +87 @@
             // TODO: Unload any non ContentManager content here
         }
+
+        #region Updating
 
         /// <summary>
@@ -114 +101 @@
                 this.Exit();
 
+            UpdateMouse();
+            UpdateKeyboard();
+           
+            base.Update(gameTime);
+        }
+
+        private void UpdateMouse()
+        {
             mouseState = Mouse.GetState();
-            keyState = Keyboard.GetState();
 
             if (previousMouseState.LeftButton == ButtonState.Released && mouseState.LeftButton == ButtonState.Pressed)
@@ -139 +133 @@
                     {
                         if (mousePos.Intersects(button.Boundaries))
-                            button.Pressed();
+                            if (button.Selectable)
+                                gameHUD.Select(button);
+                            else
+                                button.Pressed();
                     }
                 }
             }
 
+            previousMouseState = mouseState;
+        }
+
+        private void UpdateKeyboard()
+        {
+            keyState = Keyboard.GetState();
             if (keyState.IsKeyDown(Keys.D1) && previousKeyState.IsKeyUp(Keys.D1))
                 gameMap.ChangeTileTo(TileType.Grass);
@@ -161 +164 @@
             if (keyState.IsKeyDown(Keys.Down))
                 gameCamera.Move(new Vector2(0, 5));
-            previousMouseState = mouseState;
+
             previousKeyState = keyState;
-            base.Update(gameTime);
-        }
+        }
+
+        private void LoadTextures()
+        {
+            selectionBox = Content.Load<Texture2D>("selectionbox");
+            tileImage = Content.Load<Texture2D>("tilet");
+            miniMapBorders = Content.Load<Texture2D>("miniMapBorders");
+        }
+        #endregion
+
+        #region Drawing
 
         /// <summary>
@@ -173 +185 @@
         {
             GraphicsDevice.Clear(Color.CornflowerBlue);
-            GraphicsDevice.Viewport = mapView;
-            spriteBatch.Begin(SpriteSortMode.Deferred,
-                BlendState.AlphaBlend,
-                null,null,null,null,gameCamera.getTransformation(mapView));
-            gameMap.Draw(spriteBatch, gameCamera);
-            spriteBatch.End();
-            GraphicsDevice.Viewport = gameHUD.ViewPort;
-            spriteBatch.Begin();
-            gameHUD.Draw(spriteBatch);
-            spriteBatch.End();
+            DrawMap();
+            DrawHUD();
+            DrawMiniMap();
+            base.Draw(gameTime);
+        }
+
+        private void DrawMiniMap()
+        {
             GraphicsDevice.Viewport = miniMapView;
             spriteBatch.Begin(SpriteSortMode.Deferred,
@@ -190 +200 @@
             spriteBatch.End();
             spriteBatch.Begin();
-            spriteBatch.Draw(gameHUD.MiniMap.Borders, new Rectangle(0,0,200,200), Color.White);
-            spriteBatch.End();
-            base.Draw(gameTime);
+            spriteBatch.Draw(gameHUD.MiniMap.Borders, new Rectangle(0, 0, 200, 200), Color.White);
+            spriteBatch.End();
+        }
+
+        private void DrawHUD()
+        {
+            GraphicsDevice.Viewport = gameHUD.ViewPort;
+            spriteBatch.Begin();
+            gameHUD.Draw(spriteBatch);
+            spriteBatch.End();
+        }
+
+        private void DrawMap()
+        {
+            GraphicsDevice.Viewport = mapView;
+            spriteBatch.Begin(SpriteSortMode.Deferred,
+                BlendState.AlphaBlend,
+                null, null, null, null, gameCamera.getTransformation(mapView));
+            gameMap.Draw(spriteBatch, gameCamera);
+            spriteBatch.End();
+        }
+
+        #endregion
+
+        private void CreateViews()
+        {
+            mapView = new Viewport(0, 0,
+                graphics.PreferredBackBufferWidth - 200,
+                graphics.PreferredBackBufferHeight);
+            hudView = new Viewport(graphics.PreferredBackBufferWidth - 200,
+                0, 200, graphics.PreferredBackBufferHeight);
+            miniMapView = new Viewport(graphics.PreferredBackBufferWidth - 200,
+                graphics.PreferredBackBufferHeight - 200, 200, 200);
+        }
+
+        private void CreateHUD()
+        {
+            gameHUD = new HUD();
+            gameHUD.ViewPort = hudView;
+            gameHUD.AddButton(new Button
+                (new Rectangle(10, 10, 150, 40),
+                "Save", Color.YellowGreen, Color.Red, GraphicsDevice, SaveMap));
+            
+            gameHUD.AddButton(new Button(
+                new Rectangle(10,60,32,32), gameMap.textureType[TileType.Grass],
+                Color.Red, true, GraphicsDevice));
+            gameHUD.AddMiniMap(new MiniMap(gameMap, miniMapView, miniMapBorders));
+
+        }
+
+        private bool SelectHudTile()
+        {
+            return false;
         }
 

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

@@ -9 +9 @@
 namespace AdventureGame
 {
-
     public delegate void ButtonClickedHandler(object sender, EventArgs e);
 
@@ -21 +20 @@
         public int Height { get { return Boundaries.Height; } private set { } }
         private Texture2D Image { get; set; }
+        private Texture2D SelectedImage { get; set; }
         public Color BackgroundColor { get; set; }
         public Color BorderColor { get; set; }
         public string ButtonText { get; set; }
+        public bool Selectable { get; set; }
+        public bool Selected { get; set; }
 
-        public Button(Rectangle boundaries, string text, Color bgColor, Color borderColor, GraphicsDevice device)
+        public Button(Rectangle boundaries, Texture2D texture, Color borderColor, bool selectable, GraphicsDevice device)
+        {
+            this.Boundaries = boundaries;
+            this.BorderColor = borderColor;
+            this.Image = CreateTexture(borderColor, texture, device);
+            this.SelectedImage = CreateTexture(Color.White, texture, device);
+        }
+
+        public Button(Rectangle boundaries, string text, Color bgColor, Color borderColor, GraphicsDevice device, ButtonClickedHandler clickAction)
         {
             this.Boundaries = boundaries;
@@ -31 +41 @@
             this.BackgroundColor = bgColor;
             this.BorderColor = borderColor;
+            this.Image = CreateTexture(bgColor, borderColor, device);
+            
+        }
+
+        private Texture2D CreateTexture(Color bordercolor, Texture2D baseTexture, GraphicsDevice device)
+        {
+            Texture2D texture = new Texture2D(device, this.Width, this.Height);
             Color[,] tex = new Color[this.Width, this.Height];
+            Color[] baseColors = new Color[this.Width*this.Height];
+            baseTexture.GetData<Color>(baseColors);
             for (int x = 0; x < this.Width; x++)
             {
                 for (int y = 0; y < this.Height; y++)
                 {
-                    if (x == 0 || y == 0 || x == this.Width || y == this.Height)
-                        tex[x, y] = borderColor;
-                    tex[x, y] = bgColor;
+                    if (x == 0 || y == 0 || x == this.Width-1 || y == this.Height-1)
+                        tex[x, y] = bordercolor;
+                    else
+                        tex[x, y] = baseColors[x + y * this.Width];
                 }
             }
@@ -45 +65 @@
                 for (int y = 0; y < this.Height; y++)
                     tex1D[x + y * this.Width] = tex[x, y];
-            this.Image = new Texture2D(device, this.Width, this.Height);
-            this.Image.SetData(tex1D);
+            texture.SetData<Color>(tex1D);
+            return texture;
+        }
+
+        private Texture2D CreateTexture(Color bgcolor, Color bordercolor, GraphicsDevice device)
+        {
+            Color[,] tex = new Color[this.Width, this.Height];
+            for (int x = 0; x < this.Width; x++)
+            {
+                for (int y = 0; y < this.Height; y++)
+                {
+                    if (x == 0 || y == 0 || x == this.Width-1 || y == this.Height-1)
+                        tex[x, y] = bordercolor;
+                    else
+                        tex[x, y] = bgcolor;
+                }
+            }
+            Color[] tex1D = new Color[this.Width * this.Height];
+            for (int x = 0; x < this.Width; x++)
+                for (int y = 0; y < this.Height; y++)
+                    tex1D[x + y * this.Width] = tex[x, y];
+            Texture2D texture = new Texture2D(device, this.Width, this.Height);
+            texture.SetData<Color>(tex1D);
+            return texture;
         }
 
@@ -62 +104 @@
         public void Draw(SpriteBatch sb)
         {
-            sb.Draw(this.Image, this.Boundaries, Color.White);
-            sb.DrawString(AdventureGame.basicFont, this.ButtonText, this.Position, Color.Black);
+            if(this.Selected)
+                sb.Draw(this.SelectedImage, this.Boundaries, Color.White);
+            else
+                sb.Draw(this.Image, this.Boundaries, Color.White);
+            if(this.ButtonText != null)
+                sb.DrawString(AdventureGame.basicFont, this.ButtonText, this.Position, Color.Black);
         }
     }

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

@@ -13 +13 @@
         public List<Button> Buttons { get; set; }
         public MiniMap MiniMap;
+
+        public Button SelectedButton;
 
         public HUD()
@@ -29 +31 @@
         }
 
+        public void Select(Button button)
+        {
+            for (int i = 0; i < Buttons.Count; i++)
+            {
+                Buttons[i].Selected = false;
+            }
+            button.Selected = true;
+            SelectedButton = button;
+        }
+
         public void Draw(SpriteBatch sb)
         {

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

@@ -36 +36 @@
             this.Boundaries = new Rectangle((int)position.X, (int)position.Y, width, height);
         }
-
-        //public void Draw(SpriteBatch sb)
-        //{
-        //    sb.Draw(this.Image, this.Boundaries, Color.White);
-        //    if (this.Selected)
-        //        sb.Draw(AdventureGame.selectionBox, this.Boundaries, Color.White);
-        //}
-
     }
 }