alysbrooks-public/games/isometric-park-fna Commit - r179:535c7ba28929

alysbrooks-public » games » isometric-park-fna

Commit `r179:535c7ba28929` public

parent | child

Description:

Move over remainder of Camera movement. (grafted from 558b1277915195c77357ed82ceee5e8619f1a535)

Commit status:

[Not Reviewed]

References:

add-encompass

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r179:535c7ba28929 - 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

@@ -184,7 +184,7
184		184
185		185
186	// WorldBuilder.AddGeneralRenderer(new BudgetWindowRenderer(this.batch, this.monoFont));	186	// WorldBuilder.AddGeneralRenderer(new BudgetWindowRenderer(this.batch, this.monoFont));
187	WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT));	187	WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height));
188	WorldBuilder.AddEngine(new GameBridgeEngine(this));	188	WorldBuilder.AddEngine(new GameBridgeEngine(this));
189	WorldBuilder.AddEngine(new SimulationBridgeEngine(this.simulation));	189	WorldBuilder.AddEngine(new SimulationBridgeEngine(this.simulation));
190	WorldBuilder.AddEngine(new CameraBridgeEngine(this.camera));	190	WorldBuilder.AddEngine(new CameraBridgeEngine(this.camera));
@@ -344,11 +344,6
344	#region input	344	#region input
345	//	345	//
346	#region misc_keys	346	#region misc_keys
347	if (keyboardCur.IsKeyDown(Keys.C) && keyboardPrev.IsKeyUp(Keys.C))
348	{
349	this.camera.Jump(Vector2.Zero);
350
351	}
352	if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))	347	if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))
353	{	348	{
354	sound.Play(volume, pitch, pan);	349	sound.Play(volume, pitch, pan);
@@ -358,26 +353,6
358	MouseState mouseCur = Mouse.GetState();	353	MouseState mouseCur = Mouse.GetState();
359	this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice)));	354	this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice)));
360		355
361	var menuBarHeight = Menu.MENU_BAR_HEIGHT;
362
363
364	if (MathUtils.Between(mouseCur.X, 0, 50))
365	{
366	this.camera.Move(new Vector2(-4, 0));
367	}
368	else if (MathUtils.Between(mouseCur.X, (FNAGame.width - 50), FNAGame.width))
369	{
370	this.camera.Move(new Vector2(4, 0));
371	}
372
373	if (MathUtils.Between(mouseCur.Y, menuBarHeight, 50 + menuBarHeight))
374	{
375	this.camera.Move(new Vector2(0, -4));
376	}
377	else if (MathUtils.Between(mouseCur.Y, (FNAGame.height - 50 -menuBarHeight), FNAGame.height-menuBarHeight))
378	{
379	this.camera.Move(new Vector2(0, 4));
380	}
381		356
382	#if DEBUG	357	#if DEBUG
383	if (mouseCur.RightButton == ButtonState.Pressed)	358	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

r179:535c7ba28929 - Tue, 06 Apr 2021 00:56:34

Sign in to your account

Commit r179:535c7ba28929 public

Author

r179:535c7ba28929 - Tue, 06 Apr 2021 00:56:34

Commit `r179:535c7ba28929` public