Merge pull request phaserjs#3354 from brandonvdongen/master

photonstorm · web-flow · commit 9a88b5a163b5 · 2018-03-09T15:49:35.000Z
fixed camera offset when combining zoom+follow
diff --git a/src/cameras/2d/Camera.js b/src/cameras/2d/Camera.js
@@ -852,8 +852,8 @@ var Camera = new Class({
             originX = follow.x;
             originY = follow.y;
 
-            this.scrollX = originX - width * 0.5;
-            this.scrollY = originY - height * 0.5;
+            this.scrollX = (originX - width * 0.5) / zoom;
+            this.scrollY = (originY - height * 0.5) / zoom;
         }
 
         if (this.useBounds)

Original file line number	Diff line number	Diff line change
`@@ -852,8 +852,8 @@ var Camera = new Class({`
`852`	`852`	`originX = follow.x;`
`853`	`853`	`originY = follow.y;`
`854`	`854`
`855`		`- this.scrollX = originX - width * 0.5;`
`856`		`- this.scrollY = originY - height * 0.5;`
	`855`	`+ this.scrollX = (originX - width * 0.5) / zoom;`
	`856`	`+ this.scrollY = (originY - height * 0.5) / zoom;`
`857`	`857`	`}`
`858`	`858`
`859`	`859`	`if (this.useBounds)`