Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-16 14:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5568 from samme/feature/camera-controls-zoom

Browse source 
Add min and max zoom to camera controls
This commit is contained in:
Richard Davey 2021-03-01 16:41:16 +00:00 • committed by GitHub
commit dc4942ca30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/cameras/controls/FixedKeyControl.js
View file

@ -119,6 +119,26 @@ var FixedKeyControl = new Class({
*/
this.zoomSpeed = GetValue(config, 'zoomSpeed', 0.01);
/**
* The smallest zoom value the camera will reach when zoomed out.
*
* @name Phaser.Cameras.Controls.FixedKeyControl#minZoom
* @type {number}
* @default 0.001
* @since 3.53.0
*/
this.minZoom = GetValue(config, 'minZoom', 0.001);
/**
* The largest zoom value the camera will reach when zoomed in.
*
* @name Phaser.Cameras.Controls.FixedKeyControl#maxZoom
* @type {number}
* @default 1000
* @since 3.53.0
*/
this.maxZoom = GetValue(config, 'maxZoom', 1000);
/**
* The horizontal speed the camera will move.
*
@ -265,14 +285,19 @@ var FixedKeyControl = new Class({
{
cam.zoom -= this.zoomSpeed;
if (cam.zoom < 0.1)
if (cam.zoom < this.minZoom)
{
cam.zoom = 0.1;
cam.zoom = this.minZoom;
}
}
else if (this.zoomOut && this.zoomOut.isDown)
{
cam.zoom += this.zoomSpeed;
if (cam.zoom > this.maxZoom)
{
cam.zoom = this.maxZoom;
}
}
},

30
src/cameras/controls/SmoothedKeyControl.js
View file

@ -29,7 +29,7 @@ var GetValue = require('../../utils/object/GetValue');
* maxSpeed: 1.0
* };
* ```
*
*
* You must call the `update` method of this controller every frame.
*
* @class SmoothedKeyControl
@ -125,6 +125,26 @@ var SmoothedKeyControl = new Class({
*/
this.zoomSpeed = GetValue(config, 'zoomSpeed', 0.01);
/**
* The smallest zoom value the camera will reach when zoomed out.
*
* @name Phaser.Cameras.Controls.SmoothedKeyControl#minZoom
* @type {number}
* @default 0.001
* @since 3.53.0
*/
this.minZoom = GetValue(config, 'minZoom', 0.001);
/**
* The largest zoom value the camera will reach when zoomed in.
*
* @name Phaser.Cameras.Controls.SmoothedKeyControl#maxZoom
* @type {number}
* @default 1000
* @since 3.53.0
*/
this.maxZoom = GetValue(config, 'maxZoom', 1000);
/**
* The horizontal acceleration the camera will move.
*
@ -446,9 +466,13 @@ var SmoothedKeyControl = new Class({
{
cam.zoom += this._zoom;
if (cam.zoom < 0.001)
if (cam.zoom < this.minZoom)
{
cam.zoom = 0.001;
cam.zoom = this.minZoom;
}
else if (cam.zoom > this.maxZoom)
{
cam.zoom = this.maxZoom;
}
}
},

2
src/cameras/controls/typedefs/FixedKeyControlConfig.js
View file

@ -11,4 +11,6 @@
* @property {Phaser.Input.Keyboard.Key} [zoomOut] - The Key to be pressed that will zoom the Camera out.
* @property {number} [zoomSpeed=0.01] - The speed at which the camera will zoom if the `zoomIn` or `zoomOut` keys are pressed.
* @property {(number|{x:number,y:number})} [speed=0] - The horizontal and vertical speed the camera will move.
* @property {number} [minZoom=0.001] - The smallest zoom value the camera will reach when zoomed out.
* @property {number} [maxZoom=1000] - The largest zoom value the camera will reach when zoomed in.
*/

2
src/cameras/controls/typedefs/SmoothedKeyControlConfig.js
View file

@ -13,4 +13,6 @@
* @property {(number|{x:number,y:number})} [acceleration=0] - The horizontal and vertical acceleration the camera will move.
* @property {(number|{x:number,y:number})} [drag=0] - The horizontal and vertical drag applied to the camera when it is moving.
* @property {(number|{x:number,y:number})} [maxSpeed=0] - The maximum horizontal and vertical speed the camera will move.
* @property {number} [minZoom=0.001] - The smallest zoom value the camera will reach when zoomed out.
* @property {number} [maxZoom=1000] - The largest zoom value the camera will reach when zoomed in.
*/