allow zoom from mouse position; don't scale depth 0 images

Author: loudoweb

parallax/Parallax.hx

@@ -1,4 +1,5 @@
 package parallax;
+import haxe.ds.WeakMap;
 import haxe.xml.Access;
 using parallax.ParallaxHelper;
 
@@ -41,6 +42,9 @@ class Parallax
 
 	public var speed:Int;
 
+	public var zoomOffsetX:Null<Float>;
+	public var zoomOffsetY:Null<Float>;
+	
 	public function new(id:String, world:String, cameraX:Float, cameraY:Float, speed:Int = 1 ) 
 	{
 		this.id = id;
@@ -92,53 +96,58 @@ class Parallax
 		{
 			trace("resize", camera.minZoom, "old", camera.zoom, "closest", closest, camera.maxZoom);
 			camera.zoom = closest;
-			//applyZoom();
+			//this.zoomOffsetX = zoomOffsetX;
+			//this.zoomOffsetY = zoomOffsetY;
+					
+			applyZoom();
 		}
 
 	}
 
 	public function checkBounds():Void{
+
 		if (camera.x < 0){
 			camera.x = 0;
-		}else if (camera.x > width - camera.width){
-			camera.x = width - camera.width;
+		}else if (camera.x > (width * camera.zoom - camera.width)){
+			camera.x = (width * camera.zoom - camera.width) ;
 		}
 
 		if (camera.y < 0){
 			camera.y = 0;
-		}else if (camera.y > height - camera.height){
-			camera.y = height - camera.height;
+		}else if (camera.y > (height * camera.zoom - camera.height)){
+			camera.y = (height * camera.zoom - camera.height);
 
 		}
 	}
 
-	public function onZoom(delta:Float):Void {
+	public function onZoom(delta:Float, zoomOffsetX:Null<Float> = null, zoomOffsetY:Null<Float> = null):Void {
 
 		camera.onZoom(delta);
 
-		//imagePivot = image.globalToLocal(new Point(e.stageX, e.stageY));
-			
+		this.zoomOffsetX = zoomOffsetX;
+		this.zoomOffsetY = zoomOffsetY;
+					
 		applyZoom();
 
 	}
 
-	function applyZoom():Void
+	public function applyZoom():Void
 	{
 		if (!camera.canApplyZoom())
 			return;
 
-		//var offsetX = image.x + imagePivot.x * preZoom - imagePivot.x * zoom;
-		//var offsetY = image.y + imagePivot.y * preZoom - imagePivot.y * zoom;
-
-		//bgPos.setTo(offsetX, offsetY);
-		/*for (container in containers)
+		if (zoomOffsetX != null)
 		{
+
+			var offsetX = zoomOffsetX * camera.preZoom - zoomOffsetX * camera.zoom;
+			var offsetY = zoomOffsetY * camera.preZoom - zoomOffsetY * camera.zoom;
 
-			container.scaleX = container.scaleY = parallax.zoom;
-		}*/
-		//checkBounds(bgPos, stage.stageWidth, stage.stageHeight);
-		//image.x = bgPos.x;
-		//image.y = bgPos.y;
+			camera.x -= offsetX;
+			camera.y -= offsetY;
+		}
+
+		checkBounds();
+		updateLayers();
 	}
 
 	public static function parse(xml:Xml):Parallax

parallax/engines/OpenflHelper.hx

@@ -10,6 +10,12 @@ import parallax.ParallaxLayer;
  */
 class OpenflHelper
 {
+	/**
+	 * Helper to get width and height of main image to auto set the bounds of the parallax world.
+	 * @param	parallax
+	 * @param	layer
+	 * @param	container
+	 */
 	inline public static function setWorldBounds(parallax:Parallax, layer:ParallaxLayer, container:DisplayObject ):Void
 	{
 		if (parallax.world != "" && layer.id == parallax.world)

sample/OpenflSample.hx

@@ -20,8 +20,6 @@ import parallax.engines.OpenflHelper;
  */
 class OpenflSample extends Sprite 
 {
-	var bgPos:Point;
-	var imagePivot:Point;
 
 	var parallax:Parallax;
 	var containers:Array<Sprite>;
@@ -37,9 +35,6 @@ class OpenflSample extends Sprite
 		var xml = Xml.parse(Assets.getText("parallax.xml"));
 		parallax = Parallax.parse(xml);
 
-		bgPos = new Point();
-		imagePivot = new Point();
-		
 		containers = [];
 
 		// Assets:
@@ -63,15 +58,11 @@ class OpenflSample extends Sprite
 			}
 		}
 
-		parallax.setZoomBounds(stage.stageHeight);
-		
-		imagePivot.setTo(stage.stageWidth / 2, stage.stageHeight / 2);
+		parallax.setZoomBounds(stage.stageHeight);		
 
-		
-		//stage.addEventListener(MouseEvent.CLICK, onClick);
 		stage.addEventListener(MouseEvent.MOUSE_WHEEL, onWheel);
 		stage.addEventListener(MouseEvent.MOUSE_DOWN, onDragStart);
-		//stage.addEventListener(MouseEvent.RIGHT_CLICK, onReset);
+		stage.addEventListener(MouseEvent.MIDDLE_CLICK, onReset);
 		stage.addEventListener(Event.RESIZE, onResize);
 	}
 
@@ -84,11 +75,15 @@ class OpenflSample extends Sprite
 
 	function onReset(e:MouseEvent):Void
 	{
-		//parallax.zoom = 1;
-		/*for (container in containers)
+		e.preventDefault();
+		parallax.camera.zoom = 1;
+		parallax.checkBounds();
+		for (i in 0...containers.length)
 		{
-			Actuate.tween(container, 0.25, {scaleX: zoom, scaleY: zoom});
-		}*/
+			var container = containers[i];
+			if(parallax.layers[i].depth != 0)
+				container.scaleX = container.scaleY = parallax.layers[i].scale * parallax.camera.zoom;
+		}
 	}
 
 	function onDragStart(e:MouseEvent):Void
@@ -124,7 +119,18 @@ class OpenflSample extends Sprite
 
 	function onWheel(e:MouseEvent):Void
 	{
-		parallax.onZoom(e.delta / 100);
+		parallax.onZoom(e.delta / 100, e.stageX + parallax.camera.x, e.stageY + parallax.camera.y);
+		
+		for (i in 0...containers.length)
+		{
+			var container = containers[i];
+			if (parallax.layers[i].depth != 0)
+			{
+				container.scaleX = container.scaleY = parallax.layers[i].scale * parallax.camera.zoom;
+				container.x = parallax.layers[i].x;
+				container.y = parallax.layers[i].y;
+			}
+		}
 
 	}