alysbrooks-public/games/isometric-park-fna Commit - r167:558b12779151

alysbrooks-public » games » isometric-park-fna

Commit `r167:558b12779151` public

parent | child

Description:

Move over remainder of Camera movement.

Commit status:

[Not Reviewed]

References:

proto-encompass

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r167:558b12779151 - Tue, 06 Apr 2021 00:56:34

isometric-park-fna/Messages/JumpCameraMessage.cs ¶ created 644 +11 0

@@ -0,0 +1,11
	1
	2
	3	using Microsoft.Xna.Framework;
	4	using Encompass;
	5
	6	namespace isometricparkfna.Messages {
	7	public struct JumpCameraMessage : IMessage
	8	{
	9	public Vector2 Movement;
	10	}
	11	}

isometric-park-fna/Engines/CameraBridgeEngine.cs ¶ +6 -2

             namespace isometricparkfna.Engines {
-            	[Receives(typeof(ZoomCameraMessage), typeof(MoveCameraMessage))]
+            	[Receives(typeof(ZoomCameraMessage), typeof(MoveCameraMessage),
+            			typeof(JumpCameraMessage))]
             	class CameraBridgeEngine : Engine
             	{
             		private Camera Camera;
             			foreach (ref readonly var message in ReadMessages<MoveCameraMessage>())
             			{
             				this.Camera.Move(message.Movement);
+            			}
+            			foreach (ref readonly var message in ReadMessages<JumpCameraMessage>())
+            			{
+            				this.Camera.Jump(message.Movement);
             			}
             		}

isometric-park-fna/Engines/InputEngine.cs ¶ +33 -6

             	[Sends( typeof(ZoomCameraMessage),
             			typeof(MoveCameraMessage),
+            			typeof(JumpCameraMessage),
             			typeof(ToggleWindowMessage),
             			typeof(ToggleVisibilityMessage),
             			typeof(TogglePauseMessage),
             		//Area to ignore:
             		private int menuBarHeight;
+            		private int viewWidth;
+            		private int viewHeight;
-            		public InputEngine(int menuBarHeight) {
+            		public InputEngine(int menuBarHeight, int viewWidth, int viewHeight) {
             			//initialize to blank for now
             			this.keyboardPrev = new KeyboardState();
-            			menuBarHeight = menuBarHeight;
+            			this.menuBarHeight = menuBarHeight;
+            			this.viewWidth = viewWidth;
+            			this.viewHeight = viewHeight;
             		}
             		public override void Update(double dt) {
             			{
             				SendMessage(new ZoomCameraMessage {ZoomIn = true});
             			}
+            			if (keyboardCur.IsKeyDown(Keys.C) && keyboardPrev.IsKeyUp(Keys.C))
+            			{
+            				SendMessage(new JumpCameraMessage {Movement = Vector2.Zero });
+            			}
             #endregion camera_movement_keys
             #region gamerate_keys
             			if (keyboardCur.IsKeyDown(Keys.P) && keyboardPrev.IsKeyUp(Keys.P) )
             				// this.camera.Jump(Vector2.Zero);
             			}
-            			if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))
-            				// sound.Play(volume, pitch, pan);
             #endregion misc_keys
+            #region mouse_movement
+            		if (MathUtils.Between(mouseCur.Y, menuBarHeight, 50 + menuBarHeight))
+            		{
+            			SendMessage(new MoveCameraMessage {Movement = new Vector2(0, -4)});
+            		}
+            		else if (MathUtils.Between(mouseCur.Y, (this.viewHeight - 50 -menuBarHeight), this.viewHeight-menuBarHeight))
+            		{
+            			SendMessage(new MoveCameraMessage {Movement = new Vector2(0, 4)});
+            		}
+            		if (MathUtils.Between(mouseCur.X, 0, 50))
+            		{
+            			SendMessage(new MoveCameraMessage {Movement = new Vector2(-4, 0)});
+            		}
+            		else if (MathUtils.Between(mouseCur.X, (this.viewWidth - 50), this.viewWidth))
+            		{
+            			SendMessage(new MoveCameraMessage {Movement = new Vector2(4, 0)});
+            		}
+            #endregion
             			this.keyboardPrev = keyboardCur;
             		}

isometric-park-fna/FNAGame.cs ¶ +1 -26

@@ -196,7 +196,7
196		196
197		197
198	// WorldBuilder.AddGeneralRenderer(new BudgetWindowRenderer(this.batch, this.monoFont));	198	// WorldBuilder.AddGeneralRenderer(new BudgetWindowRenderer(this.batch, this.monoFont));
199	WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT));	199	WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height));
200	WorldBuilder.AddEngine(new GameBridgeEngine(this));	200	WorldBuilder.AddEngine(new GameBridgeEngine(this));
201	WorldBuilder.AddEngine(new SimulationBridgeEngine(this.simulation));	201	WorldBuilder.AddEngine(new SimulationBridgeEngine(this.simulation));
202	WorldBuilder.AddEngine(new CameraBridgeEngine(this.camera));	202	WorldBuilder.AddEngine(new CameraBridgeEngine(this.camera));
@@ -356,11 +356,6
356	#region input	356	#region input
357	//	357	//
358	#region misc_keys	358	#region misc_keys
359	if (keyboardCur.IsKeyDown(Keys.C) && keyboardPrev.IsKeyUp(Keys.C))
360	{
361	this.camera.Jump(Vector2.Zero);
362
363	}
364	if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))	359	if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))
365	{	360	{
366	sound.Play(volume, pitch, pan);	361	sound.Play(volume, pitch, pan);
@@ -370,26 +365,6
370	MouseState mouseCur = Mouse.GetState();	365	MouseState mouseCur = Mouse.GetState();
371	this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice)));	366	this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice)));
372		367
373	var menuBarHeight = Menu.MENU_BAR_HEIGHT;
374
375
376	if (MathUtils.Between(mouseCur.X, 0, 50))
377	{
378	this.camera.Move(new Vector2(-4, 0));
379	}
380	else if (MathUtils.Between(mouseCur.X, (FNAGame.width - 50), FNAGame.width))
381	{
382	this.camera.Move(new Vector2(4, 0));
383	}
384
385	if (MathUtils.Between(mouseCur.Y, menuBarHeight, 50 + menuBarHeight))
386	{
387	this.camera.Move(new Vector2(0, -4));
388	}
389	else if (MathUtils.Between(mouseCur.Y, (FNAGame.height - 50 -menuBarHeight), FNAGame.height-menuBarHeight))
390	{
391	this.camera.Move(new Vector2(0, 4));
392	}
393		368
394	#if DEBUG	369	#if DEBUG
395	if (mouseCur.RightButton == ButtonState.Pressed)	370	if (mouseCur.RightButton == ButtonState.Pressed)

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

r167:558b12779151 - Tue, 06 Apr 2021 00:56:34

Sign in to your account

Commit r167:558b12779151 public

Author

r167:558b12779151 - Tue, 06 Apr 2021 00:56:34

Commit `r167:558b12779151` public