alysbrooks-public/games/isometric-park-fna Commit - r7:accb2e8529fe

alysbrooks-public » games » isometric-park-fna

Commit `r7:accb2e8529fe` public

parent | child

Description:

Fix debouncing and only apply to certain keys.

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

r7:accb2e8529fe - Sat, 12 Dec 2020 03:31:10

isometric-park-fna/Camera.cs ¶ +45 0

@@ -1,4 +1,5
1	using System;	1	using System;
		2	using System.Linq;
2	using Microsoft.Xna.Framework;	3	using Microsoft.Xna.Framework;
3	using Microsoft.Xna.Framework.Graphics;	4	using Microsoft.Xna.Framework.Graphics;
4		5
@@ -10,6 +11,7
10	public Vector2 position;	11	public Vector2 position;
11		12
12	float _zoom;	13	float _zoom;
		14	float[] zoom_levels;
13		15
14		16
15	public static int world_width { get; set; }	17	public static int world_width { get; set; }
@@ -29,6 +31,13
29	position = Vector2.Zero;	31	position = Vector2.Zero;
30	}	32	}
31		33
		34	public Camera(float[] zoomLevels)
		35	{
		36	this.zoom = 1.0f;
		37	position = Vector2.Zero;
		38	this.zoom_levels = zoomLevels;
		39	}
		40
32	public void Move(Vector2 change)	41	public void Move(Vector2 change)
33	{	42	{
34	this.position += change;	43	this.position += change;
@@ -56,5 +65,41
56	{	65	{
57	return screenPosition + this.position - Camera.display_offset;	66	return screenPosition + this.position - Camera.display_offset;
58	}	67	}
		68
		69	public float ZoomIn()
		70	{
		71	float next_level;
		72
		73	foreach (float level in this.zoom_levels)
		74	{
		75	if(level > this.zoom)
		76	{
		77	next_level = level;
		78	this.zoom = next_level;
		79	return next_level;
		80	}
		81	}
		82
		83	return this.zoom;
		84
		85	}
		86
		87	public float ZoomOut()
		88	{
		89	float next_level;
		90
		91	foreach (float level in this.zoom_levels.Reverse())
		92	{
		93	if (level < this.zoom)
		94	{
		95	next_level = level;
		96	this.zoom = next_level;
		97	return next_level;
		98	}
		99	}
		100
		101	return this.zoom;
		102
		103	}
59	}	104	}
60	}	105	}

isometric-park-fna/FNAGame.cs ¶ +19 -12

             	private Song music;
             	private SpriteFont font;
-            	private Camera camera = new Camera();
+            	private Camera camera = new Camera(new float[] {0.25f, 0.5f, 1.0f, 2.0f, 4.0f });
             	Random random_generator = new Random();
             		}
-            		if (keyboardCur.IsKeyDown(Keys.Down) && keyboardPrev.IsKeyUp(Keys.Down))
+            		if (keyboardCur.IsKeyDown(Keys.Down) )
             		{
             			this.camera.Move(new Vector2(0, -2));
             		}
-            		else if (keyboardCur.IsKeyDown(Keys.Up) && keyboardPrev.IsKeyUp(Keys.Up))
+            		else if (keyboardCur.IsKeyDown(Keys.Up) )
                     {
             			this.camera.Move(new Vector2(0, 2));
             		}
-            		else if (keyboardCur.IsKeyDown(Keys.Left) && keyboardPrev.IsKeyUp(Keys.Left))
+            		else if (keyboardCur.IsKeyDown(Keys.Left) )
             		{
             			this.camera.Move(new Vector2(-2, 0));
             		}
-            		else if (keyboardCur.IsKeyDown(Keys.Right) && keyboardPrev.IsKeyUp(Keys.Right))
+            		else if (keyboardCur.IsKeyDown(Keys.Right) )
             		{
             			this.camera.Move(new Vector2(2, 0));
             		}
             		else if (keyboardCur.IsKeyDown(Keys.Subtract) && keyboardPrev.IsKeyUp(Keys.Subtract))
             		{
-            			this.camera.zoom *= 0.75f;
+            			this.camera.ZoomOut();
             		}
             		else if (keyboardCur.IsKeyDown(Keys.Add) && keyboardPrev.IsKeyUp(Keys.Add))
             		{
-            			this.camera.zoom *= 1.25f;
+            			this.camera.ZoomIn();
             		}
             			frameCounter = 0;
             		}
+            		this.keyboardPrev = keyboardCur;
             		base.Update(gameTime);
             		drawTileAt(0, 0, 22, 1);
-            		//Warning: creates a flashing effect because tree positions update every 1/60th of a second
+            		//*
-            		/*
                     {
             			for (int j = 0; j < 50; j += 1)
             			{
+            				//Warning: creates a flashing effect because tree positions update every 1/60th of a second
+            				/*
             				if (this.random_generator.NextDouble() > 0.75)
                             {
             					drawTileAt(i, j, 142, 2);
+            				}//*/
+            				if ((i + j) % 3 == 0)
+            				{
+            					drawTileAt(i, j, 142, 2);
             				}
             			}
                     }//*/

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

r7:accb2e8529fe - Sat, 12 Dec 2020 03:31:10

Sign in to your account

Commit r7:accb2e8529fe public

Author

r7:accb2e8529fe - Sat, 12 Dec 2020 03:31:10

Commit `r7:accb2e8529fe` public