X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=ed848fa31d07596d970b868cf8c55336765e1102;hp=ab4a2c302c80e3603ff33e2fde9ce7563d20704a;hb=236bc590ff21370c1139a8c01ff35f7b30af743d;hpb=a250362ff6ad169908a03d69e1b0dac1ef53564b diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs index ab4a2c3..ed848fa 100644 --- a/CarFire/CarFire/CarFire/Display.cs +++ b/CarFire/CarFire/CarFire/Display.cs @@ -1,5 +1,9 @@ #undef SINGLE_TEST +// Define INGAME_ZOOM to allow zooming in and out with +// the PageUp and PageDown keys. +#define INGAME_ZOOM + using System; using System.Collections.Generic; using System.Linq; @@ -16,20 +20,19 @@ namespace CarFire /// public class Display { - bool playerChosen = false; - List mProjectiles = new List(); - //List mCharacters = new List(); - IPlayer[] mCharacters = new IPlayer[4]; Texture2D everything; Texture2D projectile1; - Map mMap; - int currentCenterX = 5; - int currentCenterY = 5; + Game mGame; + GameLogic mGameLogic; + HUD theHUD; #if SINGLE_TEST List mLastPressedKeys = new List(); #endif - public Display() + public Display(Game game) { + mGame = game; + mGameLogic = new GameLogic(game); + theHUD = new HUD(game); /* mMap = aMap; mCharacters = characters; @@ -44,25 +47,7 @@ namespace CarFire { everything = contentManager.Load("cs"); projectile1 = contentManager.Load("projectile"); - mMap = contentManager.Load("Maps/stable"); - Map.DefaultTile = contentManager.Load("default"); - mMap.CenterCell = new Vector2(currentCenterX,currentCenterY); - //Debugging... Spawn eight projectiles. - //Diagonals - /* - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5,5), 10, 10, 300, 300)); - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 5), 10, 10, 300, 300)); - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, -5), 10, 10, 300, 300)); - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, -5), 10, 10, 300, 300)); - //Vertical and horizontal - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, 5), 10, 10, 300, 300)); - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 0), 10, 10, 300, 300)); - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, 0), 10, 10, 300, 300)); - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, -5), 10, 10, 300, 300)); - */ - - - // TODO: use this.Content to load your game content here + theHUD.LoadContent(contentManager); } /// @@ -79,96 +64,14 @@ namespace CarFire /// checking for collisions, gathering input, and playing audio. /// /// Provides a snapshot of timing values. - public void Update(TimeSpan timespan, GameState state) + public void Update(TimeSpan timeSpan,int thisPlayer) { - - //INPUT - testing input... has to be through network later -#if SINGLE_TEST - KeyboardState keyState = Keyboard.GetState(); + mGameLogic.Update(timeSpan, thisPlayer); - List pressedKeys = new List(); - List releasedKeys = new List(); - - Keys[] pressedKeysArray = keyState.GetPressedKeys(); - foreach (Keys k in pressedKeysArray) - { - if (!mLastPressedKeys.Contains(k)) pressedKeys.Add(k); - else mLastPressedKeys.Remove(k); - } - - releasedKeys = mLastPressedKeys; - mLastPressedKeys = new List(pressedKeysArray); - //Just apply input for the first player - mCharacters[0].MovePlayer(pressedKeys); - if (pressedKeys.Contains(Keys.Enter) && !releasedKeys.Contains(Keys.Enter)) - { - mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5,0), mCharacters[0].GridX +1, mCharacters[0].GridY+1, (int)mCharacters[0].GridX*(int)Map.PixelsToUnitSquares,(int)mCharacters[0].GridY*(int)Map.PixelsToUnitSquares)); - } - mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY); +#if INGAME_ZOOM + if (Keyboard.GetState().IsKeyDown(Keys.PageUp)) mGame.State.Map.Zoom = mGame.State.Map.Zoom + 0.5f; + if (Keyboard.GetState().IsKeyDown(Keys.PageDown)) mGame.State.Map.Zoom = mGame.State.Map.Zoom - 0.5f; #endif - - //Handle projectiles - update and check for wall collisions - for (int i = 0; i < mProjectiles.Count; i++ ) - { - bool removed = false; - if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY))) - { - - mProjectiles.RemoveAt(i); - removed = true; - i--; - } - if(!removed) - mProjectiles[i].Update(timespan); - - } - //Check for collisons - for (int j = 0; j < mCharacters.Length; j++) - { - - if(mCharacters[j] != null) - for (int i = 0; i < mProjectiles.Count; i++) - { - if (mProjectiles[i].GridX == mCharacters[j].GridX && mProjectiles[i].GridY == mCharacters[j].GridY) - { - mCharacters[j].causeDamageTo(mProjectiles[i].Damage); - Console.WriteLine(mCharacters[j].Health); - mProjectiles.RemoveAt(i); - i--; - } - } - } - //Update input for each player - for (int i = 0; i < 4; i++) - { - //If player has not selected a player yet let them select one. - if (mCharacters[i] == null) - { - if (state.keysDown[i].Contains(Keys.Enter)) - { - mCharacters[i] = (new Human(mMap, "", everything, projectile1, this)); - mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i + 1).X; - mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i + 1).Y; - } - } - //Regular player input updates - else - { - - mCharacters[i].MovePlayer(state.keysDown[i]); - mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY); - } - } - //Handle wall collisions of projectiles again... - for (int i = 0; i < mProjectiles.Count; i++) - { - if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY))) - { - mProjectiles.RemoveAt(i); - i--; - } - - } } /// @@ -177,26 +80,27 @@ namespace CarFire /// Used to draw with public void Draw(SpriteBatch spriteBatch) { - mMap.Draw(spriteBatch); - foreach(Projectile projectile in mProjectiles) + mGame.State.Map.Draw(spriteBatch); + mGame.State.Entities.ForEach(delegate(IEntity e) { e.Draw(spriteBatch); }); + + foreach(Projectile projectile in mGame.State.mProjectiles) { projectile.Draw(spriteBatch); - } - for(int i = 0; i < 4; i++)//IPlayer character in mCharacters) + for(int i = 0; i < mGame.State.NumberOfPlayers; i++)//IPlayer character in mCharacters) { - if(mCharacters[i] != null) - mCharacters[i].Draw(spriteBatch); - } - } - /// - /// Add a projectile to the Display. - /// - /// - public void AddProjectiles(Projectile projectile) - { - mProjectiles.Add(projectile); + + if (mGame.State.mCharacters[i] != null) + { + mGame.State.mCharacters[i].Draw(spriteBatch); + + } + } + theHUD.Draw(spriteBatch); + + } + } }