proper camera controls

Author: mirrorcult

src/Main.as

@@ -105,9 +105,12 @@ package
          Input.define("next", Key.TAB);
          Input.define("restart", Key.R);
          Input.define("tas", Key.T);
-         Input.define("camleft", Key.Q);
-         Input.define("camright", Key.E);
 
+         Input.define("cam_up", Key.I);
+         Input.define("cam_left", Key.J);
+         Input.define("cam_down", Key.K);
+         Input.define("cam_right", Key.L);
+         Input.define("cam_reset", Key.Q);
 
          instance = this;
          BDScreen = new ImgScreen().bitmapData;

src/game/Player.as

@@ -249,8 +249,8 @@ package game
 
       public function cameraFollow() : void
       {
-         FP.camera.x = Math.min(Math.max(x - 160,0),this.level.width - 320) + FP.cameraOffset;
-         FP.camera.y = Math.min(Math.max(y + this.cameraOffsetY - 120,0),this.level.height - 240);
+         FP.camera.x = Math.min(Math.max(x - 160,0),this.level.width - 320) + FP.cameraOffset.x;
+         FP.camera.y = Math.min(Math.max(y + this.cameraOffsetY - 120,0),this.level.height - 240) + FP.cameraOffset.y;
       }
 
       private function dropJetpack(flash:Boolean = true) : void

src/net/flashpunk/FP.as

@@ -79,7 +79,9 @@
 		 */
 		public static var camera:Point = new Point;
 
-		public static var cameraOffset:Number = 0;
+		public static var cameraOffset:Point = new Point;
+
+		public static var oldCamera:Point = new Point;
 
 		public static var tas:TAS;
 

src/net/flashpunk/debug/Console.as

@@ -17,6 +17,7 @@ package net.flashpunk.debug
 	import net.flashpunk.utils.Key;
 	import game.tas.TASUtility;
 	import game.Player;
+	import flash.geom.Point;
 
 	/**
 	 * FlashPunk debug console; can use to log information or pause the game and view/move Entities and step the frame.
@@ -305,20 +306,44 @@ package net.flashpunk.debug
 			if (Input.pressed("pause")) 
 			{
 				FP.engine.paused = !FP.engine.paused; _butPlay.visible = FP.engine.paused; _butPause.visible = !FP.engine.paused;
+				if (FP.engine.paused) FP.oldCamera = FP.camera.clone();
+				else FP.oldCamera = new Point;
 			}
 			if (Input.pressed("frameadvance1")) stepFrame();
 			else if (Input.check("frameadvance")) stepFrame();
 			if (Input.pressed("hitboxes")) _renderBoxes = !_renderBoxes;
 
-			if (Input.pressed("camleft"))
+			var mod:Number = 3;
+
+			if (Input.check("cam_right"))
+			{
+				FP.cameraOffset.x += mod;
+				if (FP.engine.paused) panCamera(mod, 0);
+			}
+			else if (Input.check("cam_left"))
+			{
+				FP.cameraOffset.x += -mod;
+				if (FP.engine.paused) panCamera(-mod, 0);
+			}
+
+			if (Input.check("cam_up"))
 			{
-				FP.cameraOffset -= 20;
-				if (paused) panCamera(-20, 0);
+				FP.cameraOffset.y += -mod;
+				if (FP.engine.paused) panCamera(0, -mod);
 			}
-			else if (Input.pressed("camright"))
+			else if (Input.check("cam_down"))
 			{
-				FP.cameraOffset += 20;
-				if (paused) panCamera(20, 0);
+				FP.cameraOffset.y += mod;
+				if (FP.engine.paused) panCamera(0, mod);
+			}
+			
+			if (Input.pressed("cam_reset"))
+			{
+				FP.cameraOffset = new Point;
+				if (FP.engine.paused) 
+				{
+					panCamera(FP.oldCamera.x - FP.camera.x, FP.oldCamera.y - FP.camera.y)
+				}
 			}
 		}