fix parallax depth, add bounds

Author: loudoweb

src/Main.hx

@@ -66,43 +66,24 @@ class Main extends Sprite
 				}
 			}
 		}
-		
-		trace(parallax);
-		
+				
 		parallax.setZoomBounds(stage.stageHeight);
 
 		imagePivot.setTo(stage.stageWidth / 2, stage.stageHeight / 2);
 
 
 		//stage.addEventListener(MouseEvent.CLICK, onClick);
-		//stage.addEventListener(MouseEvent.MOUSE_WHEEL, onWheel);
+		stage.addEventListener(MouseEvent.MOUSE_WHEEL, onWheel);
 		stage.addEventListener(MouseEvent.MOUSE_DOWN, onDragStart);
 		//stage.addEventListener(MouseEvent.RIGHT_CLICK, onReset);
-		//stage.addEventListener(Event.RESIZE, onResize);
+		stage.addEventListener(Event.RESIZE, onResize);
 	}
 
 	function onResize(e:Event):Void
 	{
 		//parallax.camera.width = stage.stageWidth;
 		//parallax.camera.height = stage.stageHeight;
 		parallax.setZoomBounds(stage.stageHeight);
-		/*var values = [for (i in 0...5) i * deltaZoom + minZoom];
-		trace(values);
-		//find closest zoom to current
-		var closest = 42.;
-		for (item in values)
-		{
-			if ( Math.abs(item - zoom) < Math.abs(zoom - closest))
-				closest = item;
-		}
-		
-		if (closest != zoom)
-		{
-			trace("resize", minZoom, "old", zoom, "closest", closest, maxZoom);
-			zoom = closest;
-			applyZoom();
-		}*/
-		
 	}
 
 	function onReset(e:MouseEvent):Void
@@ -142,17 +123,9 @@ class Main extends Sprite
 			containers[i].x = parallax.layers[i].x;
 			containers[i].y = parallax.layers[i].y;
 		}
-		//bgPos.setTo(image.x, image.y);
-		//checkBounds(bgPos, stage.stageWidth, stage.stageHeight, image.width, image.height);
-		//image.x = bgPos.x;
-		//image.y = bgPos.y;
-			
-	}
-	function onClick(e:MouseEvent):Void
-	{
-		stage.displayState = StageDisplayState.FULL_SCREEN;
-		
+	
 	}
+
 	function onWheel(e:MouseEvent):Void
 	{
 		parallax.onZoom(e.delta / 100);

src/parallax/Parallax.hx

@@ -49,42 +49,61 @@ class Parallax
 
 	public function moveCamera(x:Float, y:Float):Void
 	{
-		camera.x += x;
-		camera.y += y;
-		//checkBounds();
+		camera.x += x * speed;
+		camera.y += y * speed;
+		checkBounds();
 		updateLayers();
 	}
 
 	public function updateLayers():Void
 	{
 		for (layer in layers)
 		{
-			layer.x = layer.originX - camera.x + (camera.originX - camera.x) * speed * layer.depth;
-			layer.y = layer.originY - camera.y + (camera.originY - camera.y) * speed * layer.depth;
+			layer.x = Math.round(layer.originX - camera.x + (camera.originX - camera.x) * (layer.depth - 1));
+			layer.y = Math.round(layer.originY - camera.y + (camera.originY - camera.y) * (layer.depth - 1));
 		}	
 	}
 
 
-	
-	inline public function setZoomBounds(screenY:Int):Void
+	public function setZoomBounds(screenY:Int):Void
 	{
-		camera.setZoomBounds(screenY);
+		//zoom bounds
+		//to have fluid zoom
+		camera.minZoom = screenY / (height / camera.zoom);
+		//trace("image height", height / camera.zoom, "stage", screenY);
+		camera.deltaZoom = (1 - camera.minZoom) / 2;
+		camera.maxZoom = 1 + camera.deltaZoom *2;
+		trace(camera.minZoom, camera.zoom, camera.maxZoom, camera.deltaZoom);
+		
+		
+		var values = [for (i in 0...5) i * camera.deltaZoom + camera.minZoom];
+		//find closest zoom to current
+		var closest = 42.;
+		for (item in values)
+		{
+			if ( Math.abs(item - camera.zoom) < Math.abs(camera.zoom - closest))
+				closest = item;
+		}
+		
+		if (closest != camera.zoom)
+		{
+			trace("resize", camera.minZoom, "old", camera.zoom, "closest", closest, camera.maxZoom);
+			camera.zoom = closest;
+			//applyZoom();
+		}
+	
 	}
 
 	public function checkBounds():Void{
 		if (camera.x < 0){
-			trace('bound reach x <0');
 			camera.x = 0;
 		}else if (camera.x > width - camera.width){
-			trace('bound reach camera.width - width', camera.width, width);
 			camera.x = width - camera.width;
 		}
 
 		if (camera.y < 0){
 			camera.y = 0;
-			trace('bound reach y <0');
 		}else if (camera.y > height - camera.height){
-			trace('bound reach camera.height - height');
 			camera.y = height - camera.height;
 
 		}

src/parallax/ParallaxCamera.hx

@@ -18,11 +18,11 @@ class ParallaxCamera
 
 	//zoom
 	//zoom
-	var minZoom:Float;
-	var preZoom:Float;
+	public var minZoom:Float;
+	public var preZoom:Float;
 	public var zoom:Float;
-	var maxZoom:Float;
-	var deltaZoom:Float;
+	public var maxZoom:Float;
+	public var deltaZoom:Float;
 
 	public function new(x:Float, y:Float, width:Float = 1920, height:Float = 1080, zoom:Float = 1) 
 	{
@@ -35,17 +35,6 @@ class ParallaxCamera
 		this.y = y;
 	}
 
-	public function setZoomBounds(screenY:Float):Void
-	{
-		//zoom bounds
-		//to have fluid zoom
-		minZoom = screenY / (height / zoom);
-		//trace("image height", height / zoom, "stage", screenY);
-		deltaZoom = (1 - minZoom) / 2;
-		maxZoom = 1 + deltaZoom *2;
-		//trace(minZoom, zoom, maxZoom, deltaZoom);
-	}
-	
 	public function onZoom(delta:Float):Void
 	{
 		preZoom = zoom;