Skip to content

Commit 290389c

Browse files
committed
Input Types
1 parent b09ddc9 commit 290389c

24 files changed

Lines changed: 39 additions & 39 deletions

src/actions/SetHitArea.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @param {(array|Phaser.GameObjects.GameObject[])} items - An array of Game Objects. The contents of this array are updated by this Action.
1818
* @param {*} hitArea - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
19-
* @param {Phaser.Input.Types.HitAreaCallback} hitAreaCallback - A callback to be invoked when the Game Object is interacted with. If you provide a shape you must also provide a callback.
19+
* @param {Phaser.Types.Input.HitAreaCallback} hitAreaCallback - A callback to be invoked when the Game Object is interacted with. If you provide a shape you must also provide a callback.
2020
*
2121
* @return {(array|Phaser.GameObjects.GameObject[])} The array of Game Objects that was passed to this Action.
2222
*/

src/gameobjects/GameObject.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ var GameObject = new Class({
159159
* Not usually set directly. Instead call `GameObject.setInteractive()`.
160160
*
161161
* @name Phaser.GameObjects.GameObject#input
162-
* @type {?Phaser.Input.Types.InteractiveObject}
162+
* @type {?Phaser.Types.Input.InteractiveObject}
163163
* @default null
164164
* @since 3.0.0
165165
*/
@@ -386,8 +386,8 @@ var GameObject = new Class({
386386
* @method Phaser.GameObjects.GameObject#setInteractive
387387
* @since 3.0.0
388388
*
389-
* @param {(Phaser.Input.Types.InputConfiguration|any)} [shape] - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
390-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - A callback to be invoked when the Game Object is interacted with. If you provide a shape you must also provide a callback.
389+
* @param {(Phaser.Types.Input.InputConfiguration|any)} [shape] - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
390+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - A callback to be invoked when the Game Object is interacted with. If you provide a shape you must also provide a callback.
391391
* @param {boolean} [dropZone=false] - Should this Game Object be treated as a drop zone target?
392392
*
393393
* @return {this} This GameObject.

src/gameobjects/group/typedefs/GroupCreateConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @property {?number} [setAlpha.value=0] - The alpha value of each new Game Object.
4141
* @property {?number} [setAlpha.step=0] - Increment each Game Object's alpha from the previous by this amount, starting from `setAlpha.value`.
4242
* @property {?*} [hitArea] - A geometric shape that defines the hit area for the Game Object.
43-
* @property {?Phaser.Input.Types.HitAreaCallback} [hitAreaCallback] - A callback to be invoked when the Game Object is interacted with.
43+
* @property {?Phaser.Types.Input.HitAreaCallback} [hitAreaCallback] - A callback to be invoked when the Game Object is interacted with.
4444
* @property {?(false|Phaser.Types.Actions.GridAlignConfig)} [gridAlign=false] - Align the new Game Objects in a grid using these settings.
4545
*
4646
* @see Phaser.Actions.GridAlign

src/gameobjects/zone/Zone.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ var Zone = new Class({
234234
* @since 3.0.0
235235
*
236236
* @param {object} shape - A Geometry shape instance, such as Phaser.Geom.Ellipse, or your own custom shape.
237-
* @param {Phaser.Input.Types.HitAreaCallback} callback - A function that will return `true` if the given x/y coords it is sent are within the shape.
237+
* @param {Phaser.Types.Input.HitAreaCallback} callback - A function that will return `true` if the given x/y coords it is sent are within the shape.
238238
*
239239
* @return {Phaser.GameObjects.Zone} This Game Object.
240240
*/

src/input/CreateInteractiveObject.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
*
1717
* @param {Phaser.GameObjects.GameObject} gameObject - The Game Object to which this Interactive Object is bound.
1818
* @param {any} hitArea - The hit area for this Interactive Object. Typically a geometry shape, like a Rectangle or Circle.
19-
* @param {Phaser.Input.Types.HitAreaCallback} hitAreaCallback - The 'contains' check callback that the hit area shape will use for all hit tests.
19+
* @param {Phaser.Types.Input.HitAreaCallback} hitAreaCallback - The 'contains' check callback that the hit area shape will use for all hit tests.
2020
*
21-
* @return {Phaser.Input.Types.InteractiveObject} The new Interactive Object.
21+
* @return {Phaser.Types.Input.InteractiveObject} The new Interactive Object.
2222
*/
2323
var CreateInteractiveObject = function (gameObject, hitArea, hitAreaCallback)
2424
{

src/input/InputManager.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ var InputManager = new Class({
692692
* @private
693693
* @since 3.10.0
694694
*
695-
* @param {Phaser.Input.Types.InteractiveObject} interactiveObject - The Interactive Object that called this method.
695+
* @param {Phaser.Types.Input.InteractiveObject} interactiveObject - The Interactive Object that called this method.
696696
*/
697697
setCursor: function (interactiveObject)
698698
{
@@ -712,7 +712,7 @@ var InputManager = new Class({
712712
* @private
713713
* @since 3.10.0
714714
*
715-
* @param {Phaser.Input.Types.InteractiveObject} interactiveObject - The Interactive Object that called this method.
715+
* @param {Phaser.Types.Input.InteractiveObject} interactiveObject - The Interactive Object that called this method.
716716
*/
717717
resetCursor: function (interactiveObject)
718718
{
@@ -1592,7 +1592,7 @@ var InputManager = new Class({
15921592
* @method Phaser.Input.InputManager#pointWithinInteractiveObject
15931593
* @since 3.0.0
15941594
*
1595-
* @param {Phaser.Input.Types.InteractiveObject} object - The Interactive Object to check against.
1595+
* @param {Phaser.Types.Input.InteractiveObject} object - The Interactive Object to check against.
15961596
* @param {number} x - The translated x coordinate for the hit test.
15971597
* @param {number} y - The translated y coordinate for the hit test.
15981598
*

src/input/InputPlugin.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ var InputPlugin = new Class({
209209
* Internal event propagation callback container.
210210
*
211211
* @name Phaser.Input.InputPlugin#_eventContainer
212-
* @type {Phaser.Input.Types.EventData}
212+
* @type {Phaser.Types.Input.EventData}
213213
* @private
214214
* @since 3.13.0
215215
*/
@@ -761,8 +761,8 @@ var InputPlugin = new Class({
761761
* @since 3.0.0
762762
*
763763
* @param {Phaser.GameObjects.GameObject} gameObject - The Game Object to be enabled for input.
764-
* @param {(Phaser.Input.Types.InputConfiguration|any)} [shape] - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
765-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The 'contains' function to invoke to check if the pointer is within the hit area.
764+
* @param {(Phaser.Types.Input.InputConfiguration|any)} [shape] - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
765+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The 'contains' function to invoke to check if the pointer is within the hit area.
766766
* @param {boolean} [dropZone=false] - Is this Game Object a drop zone or not?
767767
*
768768
* @return {Phaser.Input.InputPlugin} This Input Plugin.
@@ -1724,8 +1724,8 @@ var InputPlugin = new Class({
17241724
* @since 3.0.0
17251725
*
17261726
* @param {(Phaser.GameObjects.GameObject|Phaser.GameObjects.GameObject[])} gameObjects - An array of Game Objects to set the hit area on.
1727-
* @param {(Phaser.Input.Types.InputConfiguration|any)} [shape] - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
1728-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The 'contains' function to invoke to check if the pointer is within the hit area.
1727+
* @param {(Phaser.Types.Input.InputConfiguration|any)} [shape] - Either an input configuration object, or a geometric shape that defines the hit area for the Game Object. If not specified a Rectangle will be used.
1728+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The 'contains' function to invoke to check if the pointer is within the hit area.
17291729
*
17301730
* @return {Phaser.Input.InputPlugin} This InputPlugin object.
17311731
*/
@@ -1820,7 +1820,7 @@ var InputPlugin = new Class({
18201820
* @param {number} x - The center of the circle.
18211821
* @param {number} y - The center of the circle.
18221822
* @param {number} radius - The radius of the circle.
1823-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Circle.Contains.
1823+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Circle.Contains.
18241824
*
18251825
* @return {Phaser.Input.InputPlugin} This InputPlugin object.
18261826
*/
@@ -1845,7 +1845,7 @@ var InputPlugin = new Class({
18451845
* @param {number} y - The center of the ellipse.
18461846
* @param {number} width - The width of the ellipse.
18471847
* @param {number} height - The height of the ellipse.
1848-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Ellipse.Contains.
1848+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Ellipse.Contains.
18491849
*
18501850
* @return {Phaser.Input.InputPlugin} This InputPlugin object.
18511851
*/
@@ -1866,7 +1866,7 @@ var InputPlugin = new Class({
18661866
* @since 3.0.0
18671867
*
18681868
* @param {(Phaser.GameObjects.GameObject|Phaser.GameObjects.GameObject[])} gameObjects - An array of Game Objects to set as having an ellipse hit area.
1869-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Rectangle.Contains.
1869+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Rectangle.Contains.
18701870
*
18711871
* @return {Phaser.Input.InputPlugin} This InputPlugin object.
18721872
*/
@@ -1928,7 +1928,7 @@ var InputPlugin = new Class({
19281928
* @param {number} y - The top-left of the rectangle.
19291929
* @param {number} width - The width of the rectangle.
19301930
* @param {number} height - The height of the rectangle.
1931-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Rectangle.Contains.
1931+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Rectangle.Contains.
19321932
*
19331933
* @return {Phaser.Input.InputPlugin} This InputPlugin object.
19341934
*/
@@ -1955,7 +1955,7 @@ var InputPlugin = new Class({
19551955
* @param {number} y2 - The y coordinate of the second point of the triangle.
19561956
* @param {number} x3 - The x coordinate of the third point of the triangle.
19571957
* @param {number} y3 - The y coordinate of the third point of the triangle.
1958-
* @param {Phaser.Input.Types.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Triangle.Contains.
1958+
* @param {Phaser.Types.Input.HitAreaCallback} [callback] - The hit area callback. If undefined it uses Triangle.Contains.
19591959
*
19601960
* @return {Phaser.Input.InputPlugin} This InputPlugin object.
19611961
*/

src/input/InputPluginCache.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ InputPluginCache.register = function (key, plugin, mapping, settingsKey, configK
4848
*
4949
* @param {string} key - The key of the input plugin to get.
5050
*
51-
* @return {Phaser.Input.Types.InputPluginContainer} The input plugin object.
51+
* @return {Phaser.Types.Input.InputPluginContainer} The input plugin object.
5252
*/
5353
InputPluginCache.getPlugin = function (key)
5454
{

src/input/events/GAMEOBJECT_DOWN_EVENT.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
*
3131
* @param {Phaser.Input.Pointer} pointer - The Pointer responsible for triggering this event.
3232
* @param {Phaser.GameObjects.GameObject} gameObject - The Game Object the pointer was pressed down on.
33-
* @param {Phaser.Input.Types.EventData} event - The Phaser input event. You can call `stopPropagation()` to halt it from going any further in the event flow.
33+
* @param {Phaser.Types.Input.EventData} event - The Phaser input event. You can call `stopPropagation()` to halt it from going any further in the event flow.
3434
*/
3535
module.exports = 'gameobjectdown';

src/input/events/GAMEOBJECT_MOVE_EVENT.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
*
3131
* @param {Phaser.Input.Pointer} pointer - The Pointer responsible for triggering this event.
3232
* @param {Phaser.GameObjects.GameObject} gameObject - The Game Object the pointer was moved on.
33-
* @param {Phaser.Input.Types.EventData} event - The Phaser input event. You can call `stopPropagation()` to halt it from going any further in the event flow.
33+
* @param {Phaser.Types.Input.EventData} event - The Phaser input event. You can call `stopPropagation()` to halt it from going any further in the event flow.
3434
*/
3535
module.exports = 'gameobjectmove';

0 commit comments

Comments
 (0)