alysbrooks-public/games/isometric-park-fna Commit - r4:d36395dd0ac1

alysbrooks-public » games » isometric-park-fna

Commit `r4:d36395dd0ac1` public

parent | child

Description:

Add zooming, scrolling, and proper sprite layering (changes from last night).

Commit status:

[Not Reviewed]

References:

default

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r4:d36395dd0ac1 - Fri, 11 Dec 2020 21:22:26

isometric-park-fna/Camera.cs ¶ created 644 +60 0

			@@ -0,0 +1,60
		1	using System;
		2	using Microsoft.Xna.Framework;
		3	using Microsoft.Xna.Framework.Graphics;
		4
		5	namespace isometricparkfna
		6	{
		7	public class Camera
		8	{
		9
		10	public Vector2 position;
		11
		12	float _zoom;
		13
		14
		15	public static int world_width { get; set; }
		16	public static int world_height { get; set; }
		17	public static Vector2 display_offset { get; set; }
		18
		19	public float zoom
		20	{
		21	get { return _zoom; }
		22	set { _zoom = value; if (zoom < 0.1f) _zoom = 0.1f; } // Negative zoom will flip image
		23	}
		24
		25
		26	public Camera()
		27	{
		28	this.zoom = 1.0f;
		29	position = Vector2.Zero;
		30	}
		31
		32	public void Move(Vector2 change)
		33	{
		34	this.position += change;
		35	}
		36
		37	public Matrix get_transformation(GraphicsDevice graphicsDevice)
		38	{
		39	Viewport viewPort = graphicsDevice.Viewport;
		40
		41
		42	Matrix transformation = Matrix.CreateTranslation(new Vector3(-this.position.X, -this.position.Y, 0)) *
		43	Matrix.CreateScale(new Vector3(this.zoom, this.zoom, 1)) *
		44	Matrix.CreateTranslation(new Vector3(viewPort.Width * 0.5f, viewPort.Height * 0.5f, 0));
		45
		46
		47	return transformation;
		48	}
		49
		50	public Vector2 world_to_screen(Vector2 worldPosition)
		51	{
		52	return worldPosition - this.position + Camera.display_offset;
		53	}
		54
		55	public Vector2 screen_to_world(Vector2 screenPosition)
		56	{
		57	return screenPosition + this.position - Camera.display_offset;
		58	}
		59	}
		60	}

FNA/obj/Debug/FNA.csproj.FileListAbsolute.txt ¶ +1 0

              /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csproj.CoreCompileInputs.cache
              /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.dll
              /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.pdb
+             /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csprojAssemblyReference.cache

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

isometric-park-fna/FNAGame.cs ¶ +129 -41

              using isometricparkfna;
              using System.Diagnostics;
              struct Entity
              {
              	public Vector2 loc;
              	}
              }
-             static class Camera
+             {
-             	static public Vector2 Location = Vector2.Zero;
+             }
+             //static class Camera
+             //{
+             //	static public Vector2 Location = Vector2.Zero;
+             //}
              class FNAGame : Game
              {
              	private Song music;
              	private SpriteFont font;
+             	private Camera camera = new Camera();
+             	Random random_generator = new Random();
              	int frameRate = 0;
              	int frameCounter = 0;
              	TimeSpan elapsedTime = TimeSpan.Zero;
              	//new tile stuff
              	TileMap myMap = new TileMap();
-             	int squaresAcross = 250;
-             	int squaresDown = 250;
+             	int squaresAcross = 25;
+             	int squaresDown = 25;
              	int baseOffsetX = -14;
              	int baseOffsetY = -14;
+             	GraphicsDevice device;
              	private static void Main(string[] args)
              	{
              	private FNAGame()
              	{
+             		//this.device = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.)
              		GraphicsDeviceManager gdm = new GraphicsDeviceManager(this)
              		{
              		}
+             		if (keyboardCur.IsKeyDown(Keys.Down) && keyboardPrev.IsKeyUp(Keys.Down))
+             		{
+             			this.camera.Move(new Vector2(0, -2));
+             		}
+             		else if (keyboardCur.IsKeyDown(Keys.Up) && keyboardPrev.IsKeyUp(Keys.Up))
+                     {
+             			this.camera.Move(new Vector2(0, 2));
+             		}
+             		else if (keyboardCur.IsKeyDown(Keys.Left) && keyboardPrev.IsKeyUp(Keys.Left))
+             		{
+             			this.camera.Move(new Vector2(-2, 0));
+             		}
+             		else if (keyboardCur.IsKeyDown(Keys.Right) && keyboardPrev.IsKeyUp(Keys.Right))
+             		{
+             			this.camera.Move(new Vector2(2, 0));
+             		}
+             		else if (keyboardCur.IsKeyDown(Keys.Subtract) && keyboardPrev.IsKeyUp(Keys.Subtract))
+             		{
+             			this.camera.zoom -= 0.25f;
+             		}
+             		else if (keyboardCur.IsKeyDown(Keys.Add) && keyboardPrev.IsKeyUp(Keys.Add))
+             		{
+             			this.camera.zoom += 0.25f;
+             		}
              		if (keyboardCur.IsKeyDown(Keys.Space) && keyboardPrev.IsKeyUp(Keys.Space))
              		{
              			sound.Play(volume, pitch, pan);
              	protected void drawTileAt(int x, int y, int tileIndex, int height)
                  {
-             		Vector2 squareOffset = new Vector2(Camera.Location.X % 32,
-             			Camera.Location.Y % 32);
+             		Vector2 firstSquare = Vector2.Zero;
+             		Vector2 squareOffset = Vector2.Zero;
              		int offsetX = (int)squareOffset.X;
              		int offsetY = (int)squareOffset.Y;
+             		int firstX = (int)firstSquare.X;
+             		int firstY = (int)firstSquare.Y;
+             		int rowOffset = 0;
+             		float maxdepth = ((this.squaresAcross + 1) + ((this.squaresDown + 1) * Tile.TileWidth)) * 10;
+             		int mapx = (firstX + x);
+             		int mapy = (firstY + y);
+             		float depthOffset = 0.7f - ((mapx + (mapy * Tile.TileWidth)) / maxdepth);
+             		if ((firstY + y) % 2 == 1)
+             			rowOffset = Tile.OddRowXOffset;
              		batch.Draw(
              						Tile.TileSetTexture,
              							new Rectangle(
-             									(x * Tile.TileStepX) - offsetX + 0 + baseOffsetX,
+             									(x * Tile.TileStepX) - offsetX + rowOffset + baseOffsetX,
              									(y * Tile.TileStepY) - offsetY + baseOffsetY,
              									Tile.TileWidth, Tile.TileHeight*height),
              						Tile.GetExtendedSourceRectangle(tileIndex, height),
-             						Color.White);
+             						Color.White,
+.0f,
+             						Vector2.Zero,
+             						SpriteEffects.None,
+             						depthOffset);
              	}
              	protected override void Draw(GameTime gameTime)
              		Stopwatch stopWatch = new Stopwatch();
              		stopWatch.Start();
              		GraphicsDevice.Clear(Color.CornflowerBlue);
-             		batch.Begin();
+             		batch.Begin(SpriteSortMode.BackToFront,
+             						BlendState.AlphaBlend,
+             						null,
+             						null,
+             						null,
+             						null,
+             						camera.get_transformation(GraphicsDevice));
              		//New tile stuff
-             		Vector2 firstSquare = new Vector2(Camera.Location.X / 32,
-             			Camera.Location.Y / 32);
+             		Vector2 firstSquare = Vector2.Zero;
              		int firstX = (int)firstSquare.X;
              		int firstY = (int)firstSquare.Y;
-             		Vector2 squareOffset = new Vector2(Camera.Location.X % 32,
-             			Camera.Location.Y % 32);
+             		Vector2 squareOffset = Vector2.Zero;
              		int offsetX = (int)squareOffset.X;
              		int offsetY = (int)squareOffset.Y;
              			if ((firstY + y) % 2 == 1)
              				rowOffset = Tile.OddRowXOffset;
-             			for (int x = 0; x < this.squaresAcross; x++)
+                         {
+             			for (int x = 0; x < this.squaresAcross; x++) {
              				batch.Draw(
              					Tile.TileSetTexture,
-             						new Rectangle(
-             								(x * Tile.TileStepX) - offsetX + rowOffset + baseOffsetX,
-             								(y * Tile.TileStepY) - offsetY + baseOffsetY,
-             								Tile.TileWidth, Tile.TileHeight),
+                                     new Rectangle(
+                                             (x * Tile.TileStepX) - offsetX + rowOffset + baseOffsetX,
+                                             (y * Tile.TileStepY) - offsetY + baseOffsetY,
+                                             Tile.TileWidth, Tile.TileHeight),
              					Tile.GetSourceRectangle(1),
-             					Color.White);
+             					Color.White,
+.0f,
+             						Vector2.Zero,
+             						SpriteEffects.None,
+.9f);
                          }
                      }
              			Vector2 stop = new Vector2(startX + this.squaresAcross* Tile.TileStepX/2,
              				this.squaresDown*Tile.TileStepY- baseOffsetY+4);
-             			Line.drawLine(batch, start, stop, Color.White);
+             			Line.drawLine(batch, start, stop, Color.White, 0.8f);
              		}
              		//Lines going down and to the left:
              			Vector2 stop_reverse = new Vector2(startX + -(this.squaresAcross * Tile.TileStepX / 2),
              				(this.squaresDown * Tile.TileStepY) - baseOffsetY + 4);
-             			Line.drawLine(batch, start_reverse, stop_reverse, Color.White);
+             			Line.drawLine(batch, start_reverse, stop_reverse, Color.White, 0.8f);
              		}
-             		//int startpos = 140;
-             		//for (int i = startpos; i < startpos + 4; i++)
-             		//{
-             		//	batch.Draw(
-             		//				Tile.TileSetTexture,
-             		//					new Rectangle(
-             		//							((i - startpos+2) * 2 * Tile.TileStepX) - offsetX + 0 + baseOffsetX,
-             		//							(4 * Tile.TileStepY) - offsetY + baseOffsetY,
-             		//							Tile.TileWidth, Tile.TileHeight),
-             		//				Tile.GetExtendedSourceRectangle(i, 2),
-             		//				Color.White);
-             		//}
              		drawTileAt(4, 4, 140, 3);
              		drawTileAt(6, 4, 141, 3);
              		drawTileAt(8, 4, 142, 2);
              		drawTileAt(10, 4, 142, 3);
+             		drawTileAt(0, 0, 22, 1);
-             		batch.DrawString(font, fps, new Vector2(33, 33), Color.Black);
-             		batch.DrawString(font, fps, new Vector2(32, 32), Color.White);
-             		batch.DrawString(font, this.drawTime.TotalMilliseconds.ToString(), new Vector2(120, 33), Color.Black);
-             		batch.DrawString(font, this.drawTime.TotalMilliseconds.ToString(), new Vector2(119, 32), Color.White);
+             		//Warning: creates a flashing effect because tree positions update every 1/60th of a second
+             		//*
+             		for (int i = 0; i< 80; i++)
+                     {
+             			for (int j = 0; j < 50; j += 1)
+             			{
+             				if (this.random_generator.NextDouble() > 0.75)
+                             {
+             					drawTileAt(i, j, 142, 2);
+             				}
+             			}
+                     }//*/
              		batch.End();
+             		batch.Begin(SpriteSortMode.BackToFront,
+             						BlendState.AlphaBlend,
+             						null,
+             						null,
+             						null,
+             						null);
+             		batch.DrawString(font, fps, new Vector2(33, 33), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f);
+             		batch.DrawString(font, fps, new Vector2(32, 32), Color.White, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.49f);
+             		batch.DrawString(font, this.drawTime.TotalMilliseconds.ToString(), new Vector2(120, 33), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f);
+             		batch.DrawString(font, this.drawTime.TotalMilliseconds.ToString(), new Vector2(119, 32), Color.White, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.49f);
+             		batch.DrawString(font, camera.position.ToString(), new Vector2(190, 33), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f);
+             		batch.DrawString(font, camera.position.ToString(), new Vector2(189, 32), Color.White, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.49f);
+             		batch.End();
              		stopWatch.Stop();
              		this.drawTime = stopWatch.Elapsed;

isometric-park-fna/isometric-park-fna.csproj ¶ +1 0

                  <Compile Include="Tile.cs" />
                  <Compile Include="TileMap.cs" />
                  <Compile Include="Line.cs" />
+                 <Compile Include="Camera.cs" />
                </ItemGroup>
                <ItemGroup>
                  <ProjectReference Include="..\FNA\FNA.csproj">

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r4:d36395dd0ac1 - Fri, 11 Dec 2020 21:22:26

Sign in to your account

Commit r4:d36395dd0ac1 public

Author

r4:d36395dd0ac1 - Fri, 11 Dec 2020 21:22:26

Commit `r4:d36395dd0ac1` public