Merge 2e92443 into b401cd2

tzachshabtay · Apr 5, 2018 · 8eb36d4 · 8eb36d4
2 parents b401cd2 + 2e92443
commit 8eb36d4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Source/Engine/AGS.Engine/Rooms/Viewport/AGSCamera.cs b/Source/Engine/AGS.Engine/Rooms/Viewport/AGSCamera.cs
@@ -53,8 +53,13 @@ public void Tick (IViewport viewport, RectangleF roomLimits, Size virtualResouti
 
             var box = target.WorldBoundingBox;
             var targetPoint = TargetPoint;
+            var parallaxSpeed = target.RenderLayer.ParallaxSpeed;
+            var parallaxOffsetX = -viewport.X * (parallaxSpeed.X - 1f);
+            var parallaxOffsetY = -viewport.Y * (parallaxSpeed.Y - 1f);
             float targetX = targetPoint == null ? target.WorldX : MathUtils.Lerp(0f, box.MinX, 1f, box.MaxX, targetPoint.Value.X);
             float targetY = targetPoint == null ? target.WorldY : MathUtils.Lerp(0f, box.MinY, 1f, box.MaxY, targetPoint.Value.Y);
+            targetX += parallaxOffsetX;
+            targetY += parallaxOffsetY;
 			float maxResolutionX = virtualResoution.Width / viewport.ScaleX;
 			float maxResolutionY = virtualResoution.Height / viewport.ScaleY;
             targetX = getTargetPos(targetX, roomLimits.X, roomLimits.Width, maxResolutionX);