Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-28 07:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Camera roundPixels stuttering

Browse source
This commit is contained in:
Richard Davey 2018-06-21 01:59:12 +01:00
parent 2c8c4c7a16
commit 0b3392fab4
1 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/cameras/2d/Camera.js
View file

@ -228,8 +228,8 @@ var Camera = new Class({
* @type {float} * @type {float}
* @default 1 * @default 1
* @since 3.0.0 * @since 3.0.0
*/
this.zoom = 1; this.zoom = 1;
*/
/** /**
* The rotation of the Camera. This influences the rendering of all Game Objects visible by this camera. * The rotation of the Camera. This influences the rendering of all Game Objects visible by this camera.
@ -412,6 +412,9 @@ var Camera = new Class({
* @since 3.0.0 * @since 3.0.0
*/ */
this._id = 0; this._id = 0;
this._zoom = 1;
this._zoomInversed = 1;
}, },
/** /**
@ -830,7 +833,7 @@ var Camera = new Class({
{ {
var width = this.width; var width = this.width;
var height = this.height; var height = this.height;
var zoom = this.zoom * baseScale; var zoom = this._zoom * baseScale;
var matrix = this.matrix; var matrix = this.matrix;
var originX = width / 2; var originX = width / 2;
var originY = height / 2; var originY = height / 2;
@ -911,8 +914,8 @@ var Camera = new Class({
if (this.roundPixels) if (this.roundPixels)
{ {
sx = Math.round(sx); originX = Math.round(originX);
sy = Math.round(sy); originY = Math.round(originY);
} }
this.scrollX = sx; this.scrollX = sx;
@ -930,6 +933,36 @@ var Camera = new Class({
this.shakeEffect.preRender(); this.shakeEffect.preRender();
}, },
/*
getRenderX: function (src)
{
if (this.roundPixels)
{
var gap = this._zoomInversed;
return gap * Math.round((src.x - this.scrollX * src.scrollFactorX) / gap);
}
else
{
return src.x - this.scrollX * src.scrollFactorX;
}
},
getRenderY: function (src)
{
if (this.roundPixels)
{
var gap = this._zoomInversed;
return gap * Math.round((src.y - this.scrollY * src.scrollFactorY) / gap);
}
else
{
return src.y - this.scrollY * src.scrollFactorY;
}
},
*/
/** /**
* If this Camera has previously had movement bounds set on it, this will remove them. * If this Camera has previously had movement bounds set on it, this will remove them.
* *
@ -1262,7 +1295,7 @@ var Camera = new Class({
* @method Phaser.Cameras.Scene2D.Camera#setZoom * @method Phaser.Cameras.Scene2D.Camera#setZoom
* @since 3.0.0 * @since 3.0.0
* *
* @param {float} [value=1] - The zoom value of the Camera. * @param {float} [value=1] - The zoom value of the Camera. The minimum it can be is 0.001.
* *
* @return {Phaser.Cameras.Scene2D.Camera} This Camera instance. * @return {Phaser.Cameras.Scene2D.Camera} This Camera instance.
*/ */
@ -1270,6 +1303,11 @@ var Camera = new Class({
{ {
if (value === undefined) { value = 1; } if (value === undefined) { value = 1; }
if (value === 0)
{
value = 0.001;
}
this.zoom = value; this.zoom = value;
return this; return this;
@ -1556,6 +1594,26 @@ var Camera = new Class({
return this.height / this.zoom; return this.height / this.zoom;
} }
},
zoom: {
get: function ()
{
return this._zoom;
},
set: function (value)
{
if (value === 0)
{
value = 0.001;
}
this._zoom = value;
this._zoomInversed = 1 / value;
}
} }
}); });