alysbrooks-public/games/isometric-park-fna Commit - r6:8f8c684c5f35

alysbrooks-public » games » isometric-park-fna

Commit `r6:8f8c684c5f35` public

parent | child

Description:

Refactor and cleanup.

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

r6:8f8c684c5f35 - Sat, 12 Dec 2020 03:21:39

isometric-park-fna/MathUtils.cs ¶ created 644 +47 0

			@@ -0,0 +1,47
		1	using System;
		2	namespace isometricparkfna
		3	{
		4	public class MathUtils
		5	{
		6	public MathUtils()
		7	{
		8	}
		9
		10	public static bool Between(float val, float x, float y)
		11	{
		12	return ((x < val && val < y) \|\| (y < val && val < x));
		13
		14	}
		15
		16	public static bool Between(int val, int x, int y)
		17	{
		18	return ((x < val && val < y) \|\| (y < val && val < x));
		19
		20	}
		21
		22	protected float Decrement(float value, float delta)
		23	{
		24	float magnitude = Math.Abs(value);
		25
		26	//If distance from zero is less than our delta,
		27	//go to zero to prevent overshooting:
		28	if (magnitude < delta)
		29	{
		30	return 0.0f;
		31	}
		32	else if (value > 0)
		33	{
		34	return value - delta;
		35	}
		36	else if (value < 0)
		37	{
		38	return value + delta;
		39	}
		40	else
		41	{
		42	return 0.0f;
		43	}
		44	}
		45
		46	}
		47	}

isometric-park-fna/FNAGame.cs ¶ +6 -125

              using System.Diagnostics;
-             struct Entity
+             {
-             	public Vector2 loc;
-             	public Vector2 velocity;
-             	private Rectangle _boundingBox;
-             	public Rectangle BoundingBox
+             	{
-             		get
+             		{
-             			Rectangle calculatedRectangle = _boundingBox;
-             			calculatedRectangle.Location += new Point((int)loc.X, (int)loc.Y);
-             			return calculatedRectangle;
+             		}
-             		set { _boundingBox = value; }
+             	}
-             	public Entity(Vector2 loc, Vector2 velocity)
+             	{
-             		this.loc = loc;
-             		this.velocity = velocity;
-             		this._boundingBox = Rectangle.Empty;
+             	}
-             	public Entity(Vector2 loc, Vector2 velocity, Rectangle boundingBox)
+             	{
-             		this.loc = loc;
-             		this.velocity = velocity;
-             		this._boundingBox = boundingBox;
+             	}
+             }
-             //static class Camera
-             //{
-             //	static public Vector2 Location = Vector2.Zero;
-             //}
              class FNAGame : Game
              {
              	private KeyboardState keyboardPrev = new KeyboardState();
              	private const int height = 640;
-             	private Entity paddleEntity = new Entity(Vector2.Zero, Vector2.Zero,
-             		new Rectangle(36, 0, 20, 100));
-             	private Entity ballEntity = new Entity(new Vector2(height, 360),
-             											new Vector2(2.0f, 2.0f),
-             											new Rectangle(36, 36, 20, 20));
-             	private Entity aiPaddleEntity = new Entity(new Vector2(width - 100, 0), Vector2.Zero,
-             		new Rectangle(36, 0, 20, 100));
              	private const float friction = 0.1f;
              	private const float inputVelocityDelta = friction + 0.1f;
              		g.Run();
              	}
-             	public static bool Between(float val, float x, float y)
+             	{
-             		return ((x < val && val < y) || (y < val && val < x));
+             	}
-             	public Entity Move(ref Entity orig, bool score)
+             	{
-             		orig.loc += orig.velocity;
-             		if (orig.loc.Y <= 0 && orig.velocity.Y < 0)
+             		{
-             			orig.velocity.Y *= -1;
-             			orig.loc.Y = 0;
+             		}
-             		else if (orig.loc.Y >= (height) && orig.velocity.Y > 0)
+             		{
-             			orig.velocity.Y *= -1;
-             			orig.loc.Y = (720 - 100);
+             		}
-             		if (orig.loc.X <= 0 && orig.velocity.X < 0)
+             		{
-             			orig.velocity.X *= -1;
-             			orig.loc.X = 0;
-             			if (score)
+             			{
-             				playerScore += 1;
+             			}
+             		}
-             		else if (orig.loc.X >= width && orig.velocity.X > 0)
+             		{
-             			orig.velocity.X *= -1;
-             			orig.loc.X = width;
-             			if (score)
+             			{
-             				aiScore += 1;
+             			}
+             		}
-             		return orig;
+             	}
              	}
-             	protected float Decrement(float value, float delta)
+             	{
-             		float magnitude = Math.Abs(value);
-             		//If distance from zero is less than our delta,
-             		//go to zero to prevent overshooting:
-             		if (magnitude < delta)
+             		{
-             			return 0.0f;
+             		}
-             		else if (value > 0)
+             		{
-             			return value - delta;
+             		}
-             		else if (value < 0)
+             		{
-             			return value + delta;
+             		}
-             		else
+             		{
-             			return 0.0f;
+             		}
+             	}
              	protected override void Update(GameTime gameTime)
              	{
              		}
              		else if (keyboardCur.IsKeyDown(Keys.Subtract) && keyboardPrev.IsKeyUp(Keys.Subtract))
              		{
-             			this.camera.zoom -= 0.25f;
+             			this.camera.zoom *= 0.75f;
              		}
              		else if (keyboardCur.IsKeyDown(Keys.Add) && keyboardPrev.IsKeyUp(Keys.Add))
              		{
-             			this.camera.zoom += 0.25f;
+             			this.camera.zoom *= 1.25f;
              		}
              		MouseState mouseCur = Mouse.GetState();
-             		if ((mouseCur.X < 50) && (mouseCur.X > 0))
+             		if (MathUtils.Between(mouseCur.X, 0, 50))
              		{
              			this.camera.Move(new Vector2(-4, 0));
              		}
-             		else if ((mouseCur.X > (FNAGame.width - 50))  && (mouseCur.X < FNAGame.width))
+             		else if (MathUtils.Between(mouseCur.X, (FNAGame.width - 50), FNAGame.width))
              		{
              			this.camera.Move(new Vector2(4, 0));
              		}
-             		if ((mouseCur.Y < 50) && (mouseCur.Y > 0))
+             		if (MathUtils.Between(mouseCur.Y, 0, 50))
              		{
              			this.camera.Move(new Vector2(0, -4));
              		}
-             		else if ((mouseCur.Y > (FNAGame.height - 50))  && (mouseCur.Y < FNAGame.height))
+             		else if (MathUtils.Between(mouseCur.Y , (FNAGame.height - 50), FNAGame.height))
              		{
              			this.camera.Move(new Vector2(0, 4));
              		}
              			frameCounter = 0;
              		}
              		base.Update(gameTime);
              		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);

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

                  <Compile Include="TileMap.cs" />
                  <Compile Include="Line.cs" />
                  <Compile Include="Camera.cs" />
+                 <Compile Include="MathUtils.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

r6:8f8c684c5f35 - Sat, 12 Dec 2020 03:21:39

Sign in to your account

Commit r6:8f8c684c5f35 public

Author

r6:8f8c684c5f35 - Sat, 12 Dec 2020 03:21:39

Commit `r6:8f8c684c5f35` public