mirror of
https://github.com/photonstorm/phaser
synced 2024-11-23 21:24:09 +00:00
Merge branch 'master' of https://github.com/rexrainbow/phaser
This commit is contained in:
commit
2559a06705
98 changed files with 227183 additions and 47957 deletions
|
@ -8,6 +8,7 @@ src/geom/polygon/Earcut.js
|
|||
src/utils/array/StableSort.js
|
||||
src/utils/object/Extend.js
|
||||
src/structs/RTree.js
|
||||
plugins/spine/dist/
|
||||
plugins/spine/src/runtimes/
|
||||
webpack.*
|
||||
webpack.config.js
|
||||
|
|
50
CHANGELOG.md
50
CHANGELOG.md
|
@ -1,6 +1,24 @@
|
|||
# Change Log
|
||||
|
||||
## Version 3.19.0 - Naofumi - in development
|
||||
## Version 3.20.0 - Fitoria - in dev
|
||||
|
||||
### New Features
|
||||
|
||||
* `GameConfig.antialiasGL` is a new boolean that allows you to set the `antialias` property of the WebGL context during creation, without impacting any subsequent textures or the canvas CSS.
|
||||
|
||||
### Updates
|
||||
|
||||
* When calling `Shader.setRenderToTexture()` it will now draw the shader just once, immediately to the texture, to avoid the texture being blank for a single frame (thanks Kyle)
|
||||
* The private `Shader._savedKey` property has been removed as it wasn't used anywhere internally.
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* `SpineCanvasPlugin.shutdown` would try to dispose of the `sceneRenderer`, but the property isn't set for Canvas.
|
||||
* `ArcadePhysics.Body.checkWorldBounds` would incorrectly report as being on the World bounds if the `blocked.none` flag had been toggled elsewhere in the Body. It now only sets if it toggles a new internal flag (thanks Pablo)
|
||||
* `RenderTexture.resize` wouldn't update the CanvasTexture width and height, causing the cal to draw or drawFrame to potentially distort the texture (thanks @yhwh)
|
||||
* `InputPlugin.processDragMove` has been updated so that the resulting `dragX` and `dragY` values, sent to the event handler, now compensate for the scale of the Game Objects parent container, if inside of one. This means dragging a child of a scale Container will now still drag at 'full' speed.
|
||||
|
||||
## Version 3.19.0 - Naofumi - 8th August 2019
|
||||
|
||||
### Tween Updates
|
||||
|
||||
|
@ -46,9 +64,11 @@
|
|||
|
||||
### Spine Updates
|
||||
|
||||
The Spine Plugin is now 100% complete. It has been updated to use the Spine 3.7 Runtimes. Improvements have been made across the entire plugin, including proper batched rendering support in WebGL, cleaner skin and slot functions and lots and lots of updates. It's fully documented and there are lots of examples to be found. The following legacy bugs have also been fixed:
|
||||
|
||||
* Adding Spine to physics causes position to become NaN. Fix #4501 (thanks @hizzd)
|
||||
* Destroying a Phaser Game instance and then re-creating it would cause an error trying to re-create Spine Game Objects ("Cannot read property get of null"). Fix #4532 (thanks @Alex-Badea)
|
||||
* Rendering a Spine object when a Camer has `renderToTexture` enabled on it would cause the object to be vertically flipped. It now renders correctly in both cases. Fix #4647 (thanks @probt)
|
||||
* Rendering a Spine object when a Camera has `renderToTexture` enabled on it would cause the object to be vertically flipped. It now renders correctly in both cases. Fix #4647 (thanks @probt)
|
||||
|
||||
### New Features
|
||||
|
||||
|
@ -77,6 +97,19 @@
|
|||
* `WebGLRenderer.newType` is a boolean that indicates if the current Game Object has a new type, i.e. different to the previous one in the display list.
|
||||
* `WebGLRenderer.nextTypeMatch` is a boolean that indicates if the _next_ Game Object in the display list has the same type as the one being currently rendered. This allows you to build batching into separated Game Objects.
|
||||
* `PluginManager.removeGameObject` is a new method that allows you to de-register custom Game Object types from the global Game Object Factory and/or Creator. Useful for when custom plugins are destroyed and need to clean-up after themselves.
|
||||
* `GEOM_CONST` is a new constants object that contains the different types of Geometry Objects, such as `RECTANGLE` and `CIRCLE`.
|
||||
* `Circle.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Ellipse.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Line.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Point.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Polygon.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Rectangle.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Triangle.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `InputPlugin.enableDebug` is a new method that will create a debug shape for the given Game Objects hit area. This allows you to quickly check the size and placement of an input hit area. You can customzie the shape outline color. The debug shape will automatically track the Game Object to which it is bound.
|
||||
* `InputPlugion.removeDebug` will remove a Debug Input Shape from the given Game Object and destroy it.
|
||||
* `Pointer.updateWorldPoint` is a new method that takes a Camera and then updates the Pointers `worldX` and `worldY` values based on the cameras transform (thanks @Nick-lab)
|
||||
* `ScaleManager._resetZoom` is a new internal flag that is set when the game zoom factor changes.
|
||||
* `Texture.remove` is a new method that allows you to remove a Frame from a Texture based on its name. Fix #4460 (thanks @BigZaphod)
|
||||
|
||||
### Updates
|
||||
|
||||
|
@ -93,6 +126,13 @@
|
|||
* The `WebAudioSoundManager` will now remove the document touch handlers even if the Promise fails, preventing it from throwing a rejection handler error.
|
||||
* `GameObjectFactory.remove` is a new static function that will remove a custom Game Object factory type.
|
||||
* `GameObjectCreator.remove` is a new static function that will remove a custom Game Object creator type.
|
||||
* `CanvasTexture.getPixels` now defaults to 0x0 by width x height as the default area, allowing you to call the method with no arguments to get all the pixels for the canvas.
|
||||
* `CreateDOMContainer` will now use `div.style.cssText` to set the inline styles of the container, so it now works on IE11. Fix #4674 (thanks @DanLiamco)
|
||||
* `TransformMatrix.rotation` now returns the properly normalized rotation value.
|
||||
* `PhysicsEditorParser` has now been exposed under the `Phaser.Physics.Matter` namespace, so you can call methods on it directly.
|
||||
* Calling `CanvasTexture.update` will now automatically call `refresh` if running under WebGL. This happens for both `draw` and `drawFrame`, meaning you no longer need to remember to call `refresh` after drawing to a Canvas Texture in WebGL, keeping it consistent with the Canvas renderer.
|
||||
* `Frame.destroy` will now null the Frames reference to its parent texture, glTexture and clear the data and customData objects.
|
||||
* The Container renderer functions will now read the childs `alpha` property, instead of `_alpha`, allowing it to work with more variety of custom children.
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
|
@ -121,14 +161,14 @@
|
|||
* The `DESTROY` event hook wasn't removed from Group children when destroying the Group and `destroyChildren` was set to false. Now, the hook is removed regardless (thanks @rexrainbow)
|
||||
* The WebGL Lost and Restored Context callbacks were never removed, which could cause them to hold onto stale references. Fix #3610 (thanks @Twilrom)
|
||||
* `Origin.updateDisplayOrigin` no longer applies a Math.floor to the display origins, allowing you to have a 0.x origin for a Game Object that only has a width or height of 1. This fixes issues with things like 1x1 rectangles displaying incorrectly during rendering. Fix #4126 (thanks @rexrainbow)
|
||||
* `InputManager.resetCursor` will now check if the canvas element still exists before resetting the cursor on it. Fix #4662 (thanks @fromnowhereuser)
|
||||
* It was not possible to set the zoom value of the Scale Manager back to 1 again, having changed it to a different value. Fix #4633 (thanks @lgibson02 @BinaryMoon)
|
||||
|
||||
### Examples, Documentation and TypeScript
|
||||
|
||||
My thanks to the following for helping with the Phaser 3 Examples, Docs and TypeScript definitions, either by reporting errors, fixing them or helping author the docs:
|
||||
|
||||
@vacarsu @KennethGomez @samme @ldd @Jazcash
|
||||
|
||||
|
||||
@vacarsu @KennethGomez @samme @ldd @Jazcash @jcyuan @LearningCode2023 @PhaserEditor2D
|
||||
|
||||
## Version 3.18.1 - Raphtalia - 20th June 2019
|
||||
|
||||
|
|
346
README.md
346
README.md
|
@ -22,17 +22,17 @@ Grab the source and join the fun!
|
|||
|
||||
<div align="center"><img src="https://phaser.io/images/github/news.jpg"></div>
|
||||
|
||||
> 20th June 2019
|
||||
> 8th August 2019
|
||||
|
||||
After another month of hard work, we're very happy to announce the release of Phaser 3.18. In this release we took the time to rewrite large chunks of the Input API. This allowed us to fix a number of issues that had arisen, as well as optimizing the internal event flow. Native support for complete Multi-Touch support, Mouse Wheels and more advanced Pointer Button handling are now available. The whole API is smaller and tidier after the clean-up, which is always a good thing.
|
||||
I'm pleased to announce that Phaser 3.19 is now available. This release includes our brand new Spine plugin. Spine allows you to bring animation to life in your games, offering a dedicated 2D skeletal animation system and workflow. Our plugin makes integration with Phaser seamless and is fully updated for the Spine 3.7 Runtimes with support for WebGL and Canvas renderers. This version will properly batch Spine skeletons where possible, potentially saving hundreds of draw calls. The plugin is fully documented and exports both debug and minified files, suitable for ES6 'importing' or ES5 plugin inclusion. The whole plugin is just 68KB in size (min+gz), or a paltry 57KB if you only need the Canvas renderer! That's a really tiny payload for such a massive feature-set. You can find out more about Spine from the [Esoteric Software website](http://esotericsoftware.com/).
|
||||
|
||||
We've also added lots of other features and updates, including better Matter physics constraint handling, Arcade Physics improvements, Audio decoding events, Text justification, new Bounds methods and a lot, lot more. As usual, it doesn't end there, though. You'll find hundreds of great new features, updates and fixes. So, as usual, please do spend some time digging through the [Change Log](#changelog). I assure you, it's worth while :)
|
||||
3.19 also introduces a huge overhaul to the Tween system. Tweens now have 100% documentation and we've extended their capabilities significantly. There are lots of new Tween Events to listen for, such as 'COMPLETE' or 'REPEAT' to allow you to trigger actions without needing to create callbacks. Tweens can now tween both 'from' and 'to' a value, with the ability to set a starting value for any tweened property. There are lots of new handy methods and properties, such as `Tween.hasStarted` and a rewrite of the Tween seeking function, so it now allows you to seek to any point in time across a tween. Finally, we've added in the great new 'StaggerBuilder'. This allows you to easily add staggered offsets to a bunch of tween targets, including all kinds of options such as staggering across a grid layout, stagger directions, starting values and a lot more. Please see the docs and examples for more details.
|
||||
|
||||
If you're coming from an earlier release then you may not be aware of what the previous release, 3.17, included. It was a huge release, introducing some big new features. The first was that we moved the DOM Element Game Objects from the 'experimental' flag they were previously hidden under, finished them off, fully documented them and moved them to main. DOM Elements are a great way to layer HTML content over the top of your game and control it, just as if it was a standard Game Object. Have a look at the demos, read the docs and get stuck-in using them!
|
||||
As usual, it doesn't end there, though :) Another very useful feature is `Shader.setRenderToTexture`. This allows you to redirect a shader to its own framebuffer / WebGL Texture instead of to the display list. This allows you to use the output of the shader as an input for another shader, by mapping a sampler2D uniform to it. It also allows you to save the Shader to the Texture Manager, allowing you to use it as a texture for any other texture based Game Object such as a Sprite. Combined with the new `setSampler2DBuffer` method you can now easily chain shaders together, using them as buffers for other shaders.
|
||||
|
||||
Also brand new in 3.17 were Shader Game Objects. Previously, if you wished to use a custom shader in your game, you'd have to create your own WebGL pipeline to handle it. Now, with 3.17, adding a shader is a single line of code - and what's more, you can manipulate them just like regular Game Objects, so they can be rotated, scaled, have hit areas and so on. As with DOM Elements please see the new examples and read the fully complete API Docs to learn how to use them.
|
||||
One thing I've been seeing asked for a lot on the Phaser Discord is the ability to 'save' a Render Texture to an image. So, I added the new methods `RenderTexture.snapshot` and `snapshotArea`. This allows you to grab whatever is on the Render Texture at that point in time and turn it into an Image. You could then save this image to the Texture Manager, if needed, or just save it out to the filesystem, or transmit it to as web service. Great for things like avatar creators or art packages.
|
||||
|
||||
The final significant 3.17 feature came in the way of masks. Phaser 3 has always supported Bitmap and Geometry Masks, but using them was limited (you couldn't mask children inside Containers, for example), and they were pretty slow. After a lot of development they're now fully batched, meaning the same mask applied to thousands of game objects no longer impacts performance. They can also be nested and will restore the mask stack as they're used and what's more, you can now add masks to Cameras. This is a great feature in itself and opens up the possibility for lots of visual effects in your games.
|
||||
You'll find loads more great new features, updates and fixes. So, as usual, please do spend some time digging through the [Change Log](#changelog). I assure you, it's worth while :)
|
||||
|
||||
A massive thank-you to everyone who supports Phaser on Patreon and PayPal. Your continued backing has allowed me to work on Phaser all year, and this great new releases is the very real result of that. If you've ever considered becoming a backer, now is the perfect time!
|
||||
|
||||
|
@ -75,8 +75,9 @@ Extra special thanks to the following companies who's support makes Phaser possi
|
|||
* [Texture Packer](https://www.codeandweb.com/texturepacker/tutorials/how-to-create-sprite-sheets-for-phaser3?utm_source=ad&utm_medium=banner&utm_campaign=phaser-2018-10-16)
|
||||
* [Twilio](https://www.twilio.com)
|
||||
* [Y8 Games](https://www.y8.com)
|
||||
* [Poki](https://developers.poki.com/)
|
||||
|
||||
![Sponsors](https://phaser.io/images/github/sponsors-2019-05.png "Awesome Sponsors")
|
||||
![Sponsors](https://phaser.io/images/github/sponsors-2019-08.png "Awesome Sponsors")
|
||||
|
||||
![Phaser Newsletter](https://phaser.io/images/github/div-newsletter.png "Phaser Newsletter")
|
||||
|
||||
|
@ -110,13 +111,13 @@ npm install phaser
|
|||
[Phaser is on jsDelivr](https://www.jsdelivr.com/projects/phaser) which is a "super-fast CDN for developers". Include the following in your html:
|
||||
|
||||
```html
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.18.1/dist/phaser.js"></script>
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.19.0/dist/phaser.js"></script>
|
||||
```
|
||||
|
||||
or the minified version:
|
||||
|
||||
```html
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.18.1/dist/phaser.min.js"></script>
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.19.0/dist/phaser.min.js"></script>
|
||||
```
|
||||
|
||||
### API Documentation
|
||||
|
@ -197,13 +198,13 @@ We've 3 tutorials related to Facebook Instant Games and Phaser:
|
|||
A special build of Phaser with the Facebook Instant Games Plugin ready-enabled is [available on jsDelivr](https://www.jsdelivr.com/projects/phaser). Include the following in your html:
|
||||
|
||||
```html
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.18.1/dist/phaser-facebook-instant-games.js"></script>
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.19.0/dist/phaser-facebook-instant-games.js"></script>
|
||||
```
|
||||
|
||||
or the minified version:
|
||||
|
||||
```html
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.18.1/dist/phaser-facebook-instant-games.min.js"></script>
|
||||
<script src="//cdn.jsdelivr.net/npm/phaser@3.19.0/dist/phaser-facebook-instant-games.min.js"></script>
|
||||
```
|
||||
|
||||
The build files are in the git repository in the `dist` folder, and you can also include the plugin in custom builds.
|
||||
|
@ -220,7 +221,7 @@ Create an `index.html` page locally and paste the following code into it:
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<script src="https://cdn.jsdelivr.net/npm/phaser@3.18.1/dist/phaser-arcade-physics.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/phaser@3.19.0/dist/phaser-arcade-physics.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
@ -331,210 +332,157 @@ You can then run `webpack` to create a development build in the `build` folder w
|
|||
|
||||
# Change Log
|
||||
|
||||
## Version 3.18.1 - Raphtalia - 20th June 2019
|
||||
## Version 3.19.0 - Naofumi - 8th August 2019
|
||||
|
||||
### Bug Fixes
|
||||
### Tween Updates
|
||||
|
||||
* `InputManager.preRender` didn't get the `time` property correctly, causing input plugin methods that relied on it to fail.
|
||||
* `KeyboardPlugin.time` wasn't being set to the correct value, causing `checkDown` to fail constantly.
|
||||
* All Tween classes and functions have 100% complete JSDocs :)
|
||||
* `StaggerBuilder` is a new function that allows you to define a staggered tween property. For example, as part of a tween config: `delay: this.tweens.stagger(500)` would stagger the delay by 500ms for every target of the tween. You can also provide a range: `delay: this.tweens.stagger([ 500, 1000 ])` which is spread across all targets. Finally, you can provide a Stagger Config object as the second argument. This allows you to define a stagger grid, direction, starting value and more. Please see the API Docs and new Examples for further details.
|
||||
* `Tween` now extends the Event Emitter class, allowing it to emit its own events and be listened to.
|
||||
* `Tween.ACTIVE_EVENT` is a new event that is dispatched when a tween becomes active. Listen to it with `tween.on('active')`.
|
||||
* `Tween.COMPLETE_EVENT` is a new event that is dispatched when a tween completes or is stopped. Listen to it with `tween.on('complete')`.
|
||||
* `Tween.LOOP_EVENT` is a new event that is dispatched when a tween loops, after any loop delay expires. Listen to it with `tween.on('loop')`.
|
||||
* `Tween.REPEAT_EVENT` is a new event that is dispatched when a tween property repeats, after any repeat delay expires. Listen to it with `tween.on('repeat')`.
|
||||
* `Tween.START_EVENT` is a new event that is dispatched when a tween starts. Listen to it with `tween.on('start')`.
|
||||
* `Tween.UPDATE_EVENT` is a new event that is dispatched when a tween property updates. Listen to it with `tween.on('update')`.
|
||||
* `Tween.YOYO_EVENT` is a new event that is dispatched when a tween property yoyos, after any hold delay expires. Listen to it with `tween.on('yoyo')`.
|
||||
* `Tween.onActive` is a new callback that is invoked the moment the Tween Manager brings the tween to life, even though it may not have yet started actively tweening anything due to delay settings.
|
||||
* `Tween.onStart` is now only invoked when the Tween actually starts tweening a value. Previously, it was invoked as soon as the Tween Manager activated the Tween. This has been recoded and this action is now handled by the `onActive` callback. Fix #3330 (thanks @wtravO)
|
||||
* `Tween.seek` has been rewritten so you can now seek to any point in the Tween, regardless of repeats, loops, delays and hold settings. Seeking will not invoke any callbacks or events during the seek. Fix #4409 (thanks @cristib84)
|
||||
* You can now set `from` and `to` values for a property, i.e. `alpha: { from: 0, to: 1 }` which would set the alpha of the target to 0 and then tween it to 1 _after_ any delays have expired. Fix #4493 (thanks @BigZaphod)
|
||||
* You can now set `start` and `to` values for a property, i.e. `alpha: { start: 0, to: 1 }` which would set the alpha of the target to 0 immediately, as soon as the Tween becomes active, and then tween it to 1 over the duration of the tween.
|
||||
* You can now set `start`, `from` and `to` values for a property, i.e. `alpha: { start: 0, from: 0.5, to: 1 }` which would set the alpha of the target to 0 immediately, as soon as the Tween becomes active, then after any delays it would set the alpha to 0.5 and then tween it to 1 over the duration of the Tween.
|
||||
* `Tween.hasStarted` is a new property that holds a flag signifying if the Tween has started or not. A Tween that has started is one that is actively tweening a property and not just in a delayed state.
|
||||
* `Tween.startDelay` is a new property that is set during the Tween init to hold the shortest possible time before the Tween will start tweening a value. It is decreased each update until it hits zero, after which the `onStart` callback is invoked.
|
||||
* `Tween.init` and `Tween.play` have been rewritten so they are not run multiple times when a Tween is paused before playback, or is part of a Timeline. This didn't cause any problems previously, but it was a redundant duplication of calls.
|
||||
* `Tween.onLoop` will now be invoked _after_ the `loopDelay` has expired, if any was set.
|
||||
* `Tween.onRepeat` will now be invoked _after_ the `repeatDelay` has expired, if any was set.
|
||||
* `easeParams` would be ignored for tweens that _didn't_ use a string for the ease function name. Fix #3826 (thanks @SBCGames)
|
||||
* You can now specify `easeParams` for any custom easing function you wish to use. Fix #3826 (thanks @SBCGames)
|
||||
* All changes to `Tween.state` are now set _before_ any events or callbacks, allowing you to modify the state of the Tween in those handlers (thanks @Cudabear)
|
||||
* `Tween.dispatchTweenEvent` is a new internal method that handles dispatching the new Tween Events and callbacks. This consolidates a lot of duplicate code into a single method.
|
||||
* `Tween.dispatchTweenDataEvent` is a new internal method that handles dispatching the new TweenData Events and callbacks. This consolidates a lot of duplicate code into a single method.
|
||||
* `Tween.isSeeking` is a new internal boolean flag that is used to keep track of the seek progress of a Tween.
|
||||
* `Timeline.onLoop` will now be invoked _after_ the `loopDelay` has expired, if any was set.
|
||||
* `Timeline.onComplete` will now be invoked _after_ the `completeDelay` has expired, if any was set.
|
||||
* All changes to `Timeline.state` are now set _before_ any events or callbacks, allowing you to modify the state of the Timeline in those handlers.
|
||||
* The `TIMELINE_LOOP_EVENT` has had the `loopCounter` argument removed from it. It didn't actually send the number of times the Timeline had looped (it actually sent the total remaining).
|
||||
* When a TweenData completes it will now set the `current` property to be exactly either `start` or `end` depending on playback direction.
|
||||
* When a TweenData completes it will set the exact `start` or `end` value into the target property.
|
||||
* `TweenData` has a new function signature, with the new `index` and `getActive`arguments added to it. `TweenBuilder` has been updated to set these, but if you create any TweenData objects directly, use the new signature.
|
||||
* `TweenData.getActiveValue` is a new property that, if not null, returns a value to immediately sets the property value to on activation.
|
||||
* `GetEaseFunction`, and by extension anything that uses it, such as setting the ease for a Tween, will now accept a variety of input strings as valid. You can now use lower-case, such as `back`, and omit the 'ease' part of the direction, such as `back.in` or `back.inout`.
|
||||
* The signature of `getStart` and `getEnd` custom property functions has changed to `(target, key, value, targetIndex, totalTargets, tween)`, previously it was just `(target, key, value)`. Custom functions don't need to change as the new arguments are in addition to those sent previously.
|
||||
* The signature of the LoadValue generator functions (such as `delay` and `repeat`) has changed to `(target, key, value, targetIndex, totalTargets, tween)` to match those of the custom property functions. If you used a custom generator function for your Tween configs you'll need to modify the signature to the new one.
|
||||
* Tweens created via `TweenManager.create` wouldn't start when `Tween.play` was called without first making them active manually. They now start automatically. Fix #4632 (thanks @mikewesthad)
|
||||
|
||||
## Version 3.18.0 - Raphtalia - 19th June 2019
|
||||
### Spine Updates
|
||||
|
||||
### Input System Changes
|
||||
The Spine Plugin is now 100% complete. It has been updated to use the Spine 3.7 Runtimes. Improvements have been made across the entire plugin, including proper batched rendering support in WebGL, cleaner skin and slot functions and lots and lots of updates. It's fully documented and there are lots of examples to be found. The following legacy bugs have also been fixed:
|
||||
|
||||
#### Mouse Wheel Support
|
||||
|
||||
3.18 now includes native support for reading mouse wheel events.
|
||||
|
||||
* `POINTER_WHEEL` is a new event dispatched by the Input Plugin allowing you to listen for global wheel events.
|
||||
* `GAMEOBJECT_WHEEL` is a new event dispatched by the Input Plugin allowing you to listen for global wheel events over all interactive Game Objects in a Scene.
|
||||
* `GAMEOBJECT_POINTER_WHEEL` is a new event dispatched by a Game Object allowing you to listen for wheel events specifically on that Game Object.
|
||||
* `Pointer.deltaX` is a new property that holds the horizontal scroll amount that occurred due to the user moving a mouse wheel or similar input device.
|
||||
* `Pointer.deltaY` is a new property that holds the vertical scroll amount that occurred due to the user moving a mouse wheel or similar input device.
|
||||
* `Pointer.deltaZ` is a new property that holds the z-axis scroll amount that occurred due to the user moving a mouse wheel or similar input device.
|
||||
* `Pointer.wheel` is a new internal method that handles the wheel event.
|
||||
* `InputManager.onMouseWheel` is a new internal method that handles processing the wheel event.
|
||||
* `InputManager.processWheelEvent` is a new internal method that handles processing the wheel event sent by the Input Manager.
|
||||
|
||||
#### Button Released Support
|
||||
|
||||
* `Pointer.button` is a new property that indicates which button was pressed, or released, on the pointer during the most recent event. It is only set during `up` and `down` events and is always 0 for Touch inputs.
|
||||
* `Pointer.leftButtonReleased` is a new method that returns `true` if it was the left mouse button that was just released. This can be checked in a `pointerup` event handler to find out which button was released.
|
||||
* `Pointer.rightButtonReleased` is a new method that returns `true` if it was the right mouse button that was just released. This can be checked in a `pointerup` event handler to find out which button was released (thanks @BobtheUltimateProgrammer)
|
||||
* `Pointer.middleButtonReleased` is a new method that returns `true` if it was the middle mouse button that was just released. This can be checked in a `pointerup` event handler to find out which button was released.
|
||||
* `Pointer.backButtonReleased` is a new method that returns `true` if it was the back mouse button that was just released. This can be checked in a `pointerup` event handler to find out which button was released.
|
||||
* `Pointer.forwardButtonReleased` is a new method that returns `true` if it was the forward mouse button that was just released. This can be checked in a `pointerup` event handler to find out which button was released.
|
||||
|
||||
#### Input System Bug Fixes
|
||||
|
||||
* Calling `setPollAlways()` would cause the `'pointerdown'` event to fire multiple times. Fix #4541 (thanks @Neyromantik)
|
||||
* The pointer events were intermittently not registered, causing `pointerup` to often fail. Fix #4538 (thanks @paulsymphony)
|
||||
* Due to a regression in 3.16 the drag events were not performing as fast as before, causing drags to feel lagged. Fix #4500 (thanks @aliblong)
|
||||
* The Touch Manager will now listen for Touch Cancel events on the Window object (if `inputWindowEvents` is enabled in the game config, which it is by default). This allows it to prevent touch cancel actions, like opening the dock on iOS, from causing genuinely active pointers to enter an active locked state.
|
||||
* Over and Out events now work for any number of pointers in multi-touch environments, not just the first touch pointer registered. They also now fire correctly on touch start and touch end / cancel events.
|
||||
* If you enable a Game Object for drag and place it inside a rotated Container (of any depth), the `dragX` and `dragY` values sent to the `drag` callback didn't factor the rotation in, so you had to do it manually. This is now done automatically, so the values account for parent rotation before being sent to the event handler. Fix #4437 (thanks @aliblong)
|
||||
|
||||
#### Input System API Changes
|
||||
|
||||
The old 'input queue' legacy system, which was deprecated in 3.16, has been removed entirely in order to tidy-up the API and keep input events consistent. This means the following changes:
|
||||
|
||||
* Removed the `inputQueue` Game config property.
|
||||
* Removed the `useQueue`, `queue` and `_updatedThisFrame` properties from the Input Manager.
|
||||
* Removed the `legacyUpdate` and `update` methods from the Input Manager.
|
||||
* Removed the `ignoreEvents` property as this should now be handled on a per-event basis.
|
||||
* The Input Manager no longer listens for the `GameEvents.POST_STEP` event.
|
||||
* The following Input Manager methods are no longer required so have been removed: `startPointer`, `updatePointer`, `stopPointer` and `cancelPointer`.
|
||||
|
||||
As a result, all of the following Input Manager methods have been renamed:
|
||||
|
||||
* `queueTouchStart` is now called `onTouchStart` and invoked by the Touch Manager.
|
||||
* `queueTouchMove` is now called `onTouchMove` and invoked by the Touch Manager.
|
||||
* `queueTouchEnd` is now called `onTouchEnd` and invoked by the Touch Manager.
|
||||
* `queueTouchCancel` is now called `onTouchCancel` and invoked by the Touch Manager.
|
||||
* `queueMouseDown` is now called `onMouseDown` and invoked by the Mouse Manager.
|
||||
* `queueMouseMove` is now called `onMouseMove` and invoked by the Mouse Manager.
|
||||
* `queueMouseUp` is now called `onMouseUp` and invoked by the Mouse Manager.
|
||||
|
||||
Each of these handlers used to check the `enabled` state of the Input Manager, but this now handled directly in the Touch and Mouse Managers instead, leading to less branching and cleaner tests. They also all used to run an IIFE that updated motion on the changed pointers array, but this is now handled directly in the event handler, allowing it to be removed from here.
|
||||
|
||||
Because the legacy queue mode is gone, there is no longer any need for the DOM Callbacks:
|
||||
|
||||
* Removed the `_hasUpCallback`, `_hasDownCallback` and `_hasMoveCallback` properties from the Input Manager
|
||||
* Removed the `processDomCallbacks`, `addDownCallback`, `addUpCallback`, `addMoveCallback`, `domCallbacks`, `addDownCallback`, `addUpCallback` and `addMoveCallback` methods.
|
||||
|
||||
Also, CSS cursors can now be set directly:
|
||||
|
||||
* Cursors are now set and reset immediately on the canvas, leading to the removal of `_setCursor` and `_customCursor` properties.
|
||||
|
||||
The following changes took place in the Input Plugin class:
|
||||
|
||||
* The method `processDragEvents` has been removed as it's now split across smaller, more explicit methods.
|
||||
* `processDragDownEvent` is a new method that handles a down event for drag enabled Game Objects.
|
||||
* `processDragMoveEvent` is a new method that handles a move event for drag enabled Game Objects.
|
||||
* `processDragUpEvent` is a new method that handles an up event for drag enabled Game Objects.
|
||||
* `processDragStartList` is a new internal method that builds a drag list for a pointer.
|
||||
* `processDragThresholdEvent` is a new internal method that tests when a pointer with drag thresholds can drag.
|
||||
* `processOverEvents` is a new internal method that handles when a touch pointer starts and checks for over events.
|
||||
* `processOutEvents` is a new internal method that handles when a touch pointer stops and checks for out events.
|
||||
|
||||
The following changes took place in the Pointer class:
|
||||
|
||||
* `Pointer.dirty` has been removed as it's no longer required.
|
||||
* `Pointer.justDown` has been removed as it's not used internally and makes no sense under the DOM event system.
|
||||
* `Pointer.justUp` has been removed as it's not used internally and makes no sense under the DOM event system.
|
||||
* `Pointer.justMoved` has been removed as it's not used internally and makes no sense under the DOM event system.
|
||||
* The `Pointer.reset` method has been removed as it's no longer required internally.
|
||||
* `Pointer.touchstart` now has two arguments, the Touch List entry and the Touch Event. The full Touch Event is now stored in `Pointer.event` (instead of the Touch List entry).
|
||||
* `Pointer.touchmove` now has two arguments, the Touch List entry and the Touch Event. The full Touch Event is now stored in `Pointer.event` (instead of the Touch List entry).
|
||||
* `Pointer.touchend` now has two arguments, the Touch List entry and the Touch Event. The full Touch Event is now stored in `Pointer.event` (instead of the Touch List entry).
|
||||
* `Pointer.touchcancel` now has two arguments, the Touch List entry and the Touch Event. The full Touch Event is now stored in `Pointer.event` (instead of the Touch List entry).
|
||||
* Adding Spine to physics causes position to become NaN. Fix #4501 (thanks @hizzd)
|
||||
* Destroying a Phaser Game instance and then re-creating it would cause an error trying to re-create Spine Game Objects ("Cannot read property get of null"). Fix #4532 (thanks @Alex-Badea)
|
||||
* Rendering a Spine object when a Camera has `renderToTexture` enabled on it would cause the object to be vertically flipped. It now renders correctly in both cases. Fix #4647 (thanks @probt)
|
||||
|
||||
### New Features
|
||||
|
||||
* `Matter.Factory.velocity` is a new method that allows you to set the velocity on a Matter Body directly.
|
||||
* `Matter.Factory.angularVelocity` is a new method that allows you to set the angular velocity on a Matter Body directly.
|
||||
* `Matter.Factory.force` is a new method that allows you to apply a force from a world position on a Matter Body directly.
|
||||
* `GetBounds.getTopCenter` is a new method that will return the top-center point from the bounds of a Game Object.
|
||||
* `GetBounds.getBottomCenter` is a new method that will return the bottom-center point from the bounds of a Game Object.
|
||||
* `GetBounds.getLeftCenter` is a new method that will return the left-center point from the bounds of a Game Object.
|
||||
* `GetBounds.getRightCenter` is a new method that will return the right-center point from the bounds of a Game Object.
|
||||
* You can now create a desynchronized 2D or WebGL canvas by setting the Game Config property `desynchronized` to `true` (the default is `false`). For more details about what this means see https://developers.google.com/web/updates/2019/05/desynchronized.
|
||||
* The CanvasRenderer can now use the `transparent` Game Config property in order to tell the browser an opaque background is in use, leading to faster rendering in a 2D context.
|
||||
* `GameObject.scale` is a new property, that exists as part of the Transform component, that allows you to set the horizontal and vertical scale of a Game Object via a setter, rather than using the `setScale` method. This is handy for uniformly scaling objects via tweens, for example.
|
||||
* `Base64ToArrayBuffer` is a new utility function that will convert a base64 string into an ArrayBuffer. It works with plain base64 strings, or those with data uri headers attached to them. The resulting ArrayBuffer can be fed to any suitable function that may need it, such as audio decoding.
|
||||
* `ArrayBufferToBase64` is a new utility function that converts an ArrayBuffer into a base64 string. You can also optionally included a media type, such as `image/jpeg` which will result in a data uri being returned instead of a plain base64 string.
|
||||
*`WebAudioSoundManager.decodeAudio` is a new method that allows you to decode audio data into a format ready for playback and stored in the audio cache. The audio data can be provided as an ArrayBuffer, a base64 string or a data uri. Listen for the events to know when the data is ready for use.
|
||||
* `Phaser.Sound.Events#DECODED` is a new event emitted by the Web Audio Sound Manager when it has finished decoding audio data.
|
||||
* `Phaser.Sound.Events#DECODED_ALL` is a new event emitted by the Web Audio Sound Manager when it has finished decoding all of the audio data files passed to the `decodeAudio` method.
|
||||
* `Phaser.Utils.Objects.Pick` is a new function that will take an object and an array of keys and return a new object containing just the keys provided in the array.
|
||||
* `Text.align` and `Text.setAlign` can now accept `justify` as a type. It will apply basic justification to multi-line text, adding in extra spaces in order to justify the content. Fix #4291 (thanks @andrewbaranov @Donerkebap13 @dude78GH)
|
||||
* `Arcade.Events.WORLD_STEP` is a new event you can listen to. It is emitted by the Arcade Physics World every time the world steps once. It is emitted _after_ the bodies and colliders have been updated. Fix #4289 (thanks @fant0m)
|
||||
* `Shader.setRenderToTexture` is a new method that will redirect the Shader to render to its own framebuffer / WebGLTexture instead of to the display list. This allows you to use the output of the shader as an input for another shader, by mapping a sampler2D uniform to it. It also allows you to save the Shader to the Texture Manager, allowing you to use it as a texture for any other texture based Game Object such as a Sprite.
|
||||
* `Shader.setSampler2DBuffer` is a new method that allows you to pass a WebGLTexture directly into a Shader as a sampler2D uniform, such as when linking shaders together as buffers for each other.
|
||||
* `Shader.renderToTexture` is a new property flag that is set if you set the Shader to render to a texture.
|
||||
* `Shader.framebuffer` is a new property that contains a WebGLFramebuffer reference which is set if you set the Shader to render to a texture.
|
||||
* `Shader.glTexture` is a new property that contains a WebGLTexture reference which is set if you set the Shader to render to a texture.
|
||||
* `Shader.texture` is a new property that contains a Phaser Texture reference which is set if you set the Shader to save to the Texture Manager.
|
||||
* `TextureManager.addGLTexture` is a new method that allows you to add a WebGLTexture directly into the Texture Manager, saved under the given key.
|
||||
* `TextureSource.isGLTexture` is a new boolean property that reflects if the data backing the underlying Texture Source is a WebGLTexture or not.
|
||||
* `TextureTintPipeline.batchSprite` will now flip the UV if the TextureSource comes from a GLTexture.
|
||||
* `Math.ToXY` is a new mini function that will take a given index and return a Vector2 containing the x and y coordinates of that index within a grid.
|
||||
* `RenderTexture.glTexture` is a new property that holds a reference to the WebGL Texture being used by the Render Texture. Useful for passing to a shader as a sampler2D.
|
||||
* `GroupCreateConfig.quantity` - when creating a Group using a config object you can now use the optional property `quantity` to set the number of objects to be created. Use this for quickly creating groups of single frame objects that don't need the advanced capabilities of `frameQuantity` and `repeat`.
|
||||
* `Pointer.locked` is a new read-only property that indicates if the pointer has been Pointer Locked, or not, via the Pointer Lock API.
|
||||
* `WebGLRenderer.snapshotFramebuffer`, and the corresponding utility function `WebGLSnapshot`, allows you to take a snapshot of a given WebGL framebuffer, such as the one used by a Render Texture or Shader, and either get a single pixel from it as a Color value, or get an area of it as an Image object, which can then optionally be saved to the Texture Manager for use by Game Object textures.
|
||||
* `CanvasRenderer.snapshotCanvas` allows you to take a snapshot of a given Canvas object, such as the one used by a Render Texture, and either get a single pixel from it as a Color value, or get an area of it as an Image object, which can then optionally be saved to the Texture Manager for use by Game Object textures.
|
||||
* `RenderTexture.snapshot` is a new method that will take a snapshot of the whole current state of the Render Texture and return it as an Image object, which could then be saved to the Texture Manager if needed.
|
||||
* `RenderTexture.snapshotArea` is a new method that will take a snapshot of an area of a Render Texture and return it as an Image object, which could then be saved to the Texture Manager if needed.
|
||||
* `RenderTexture.snapshotPixel` is a new method that will take extract a single pixel color value from a Render Texture and return it as a Color object.
|
||||
* The `SnapshotState` object has three new properties: `isFramebuffer` boolean and `bufferWidth` and `bufferHeight` integers.
|
||||
* `Game.CONTEXT_LOST_EVENT` is a new event that is dispatched by the Game instance when the WebGL Renderer webgl context is lost. Use this instead of the old 'lostContextCallbacks' for cleaner context handling.
|
||||
* `Game.CONTEXT_RESTORED_EVENT` is a new event that is dispatched by the Game instance when the WebGL Renderer webgl context is restored. Use this instead of the old 'restoredContextCallbacks' for cleaner context handling.
|
||||
* `WebGLRenderer.currentType` contains the type of the Game Object currently being rendered.
|
||||
* `WebGLRenderer.newType` is a boolean that indicates if the current Game Object has a new type, i.e. different to the previous one in the display list.
|
||||
* `WebGLRenderer.nextTypeMatch` is a boolean that indicates if the _next_ Game Object in the display list has the same type as the one being currently rendered. This allows you to build batching into separated Game Objects.
|
||||
* `PluginManager.removeGameObject` is a new method that allows you to de-register custom Game Object types from the global Game Object Factory and/or Creator. Useful for when custom plugins are destroyed and need to clean-up after themselves.
|
||||
* `GEOM_CONST` is a new constants object that contains the different types of Geometry Objects, such as `RECTANGLE` and `CIRCLE`.
|
||||
* `Circle.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Ellipse.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Line.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Point.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Polygon.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Rectangle.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `Triangle.type` is a new property containing the shapes geometry type, which can be used for quick type comparisons.
|
||||
* `InputPlugin.enableDebug` is a new method that will create a debug shape for the given Game Objects hit area. This allows you to quickly check the size and placement of an input hit area. You can customzie the shape outline color. The debug shape will automatically track the Game Object to which it is bound.
|
||||
* `InputPlugion.removeDebug` will remove a Debug Input Shape from the given Game Object and destroy it.
|
||||
* `Pointer.updateWorldPoint` is a new method that takes a Camera and then updates the Pointers `worldX` and `worldY` values based on the cameras transform (thanks @Nick-lab)
|
||||
* `ScaleManager._resetZoom` is a new internal flag that is set when the game zoom factor changes.
|
||||
* `Texture.remove` is a new method that allows you to remove a Frame from a Texture based on its name. Fix #4460 (thanks @BigZaphod)
|
||||
|
||||
### Updates
|
||||
|
||||
* `Zones` will now use the new `customHitArea` property introduced in 3.17 to avoid their hit areas from being resized if you specified your own custom hit area (thanks @rexrainbow)
|
||||
* The default `BaseShader` vertex shader has a new uniform `uResolution` which is set during the Shader init and load to be the size of the Game Object to which the shader is bound.
|
||||
* The default `BaseShader` vertex shader will now set the `fragCoord` varying to be the Game Object height minus the y inPosition. This will give the correct y axis in the fragment shader, causing 'inverted' shaders to display normally when using the default vertex code.
|
||||
* There was some test code left in the `DOMElementCSSRenderer` file that caused `getBoundingClientRect` to be called every render. This has been removed, which increases performance significantly for DOM heavy games.
|
||||
* The `TimeStep` will no longer set its `frame` property to zero in the `resetDelta` method. Instead, this property is incremented every step, no matter what, giving an accurate indication of exactly which frame something happened on internally.
|
||||
* The `TimeStep.step` method no longer uses the time value passed to the raf callback, as it's not actually the current point in time, but rather the time that the main thread began at. Which doesn't help if we're comparing it to event timestamps.
|
||||
* `TimeStep.now` is a new property that holds the exact `performance.now` value, as set at the start of the current game step.
|
||||
* `Matter.Factory.fromVertices` can now take a vertices path string as its `vertexSets` argument, as well as an array of vertices.
|
||||
* `GetBounds.prepareBoundsOutput` is a new private method that handles processing the output point. All of the bounds methods now use this, allowing us to remove a lot of duplicated code.
|
||||
* The PluginManager will now display a console warning if it skips installing a plugin (during boot) because the plugin value is missing or empty (thanks @samme)
|
||||
* When creating a Matter Constraint via the Factory you can now optionally provide a `length`. If not given, it will determine the length automatically from the position of the two bodies.
|
||||
* When creating a Matter Game Object you can now pass in a pre-created Matter body instead of a config object.
|
||||
* When Debug Draw is enabled for Arcade Physics it will now use `Graphics.defaultStrokeWidth` to drawn the body with, this makes static bodies consistent with dynamic ones (thanks @samme)
|
||||
* `Group.name` is a new property that allows you to set a name for a Group, just like you can with all other Game Objects. Phaser itself doesn't use this, it's there for you to take advantage of (thanks @samme)
|
||||
* Calling `ScaleManager.setGameSize` will now adjust the size of the canvas element as well. Fix #4482 (thanks @sudhirquestai)
|
||||
* `Scale.Events.RESIZE` now sends two new arguments to the handler: `previousWidth` and `previousHeight`. If, and only if, the Game Size has changed, these arguments contain the previous size, before the change took place.
|
||||
* The Camera Manager has a new method `onSize` which is invoked by handling the Scale Manager `RESIZE` event. When it receives it, it will iterate the cameras it manages. If the camera _doesn't_ have a custom offset and _is_ the size of the game, then it will be automatically resized for you. This means you no longer need to call `this.cameras.resize(width, height)` from within your own resize handler, although you can still do so if you wish, as that will resize _every_ Camera being managed to the new size, instead of just 'full size' cameras.
|
||||
* `Graphics.translate` has been renamed to `Graphics.translateCanvas` to make it clearer what it's actually translating (i.e. the drawing buffer, not the Graphics object itself)
|
||||
* `Graphics.scale` has been renamed to `Graphics.scaleCanvas` to make it clearer what it's actually scaling (i.e. the drawing buffer, not the Graphics object itself)
|
||||
* `Graphics.rotate` has been renamed to `Graphics.rotateCanvas` to make it clearer what it's actually rotating (i.e. the drawing buffer, not the Graphics object itself)
|
||||
* The `width` and `height` of an Arc / Circle Shape Game Object is now set to be the diameter of the arc, not the radius (thanks @rexrainbow)
|
||||
* `LineStyleCanvas` now takes an `altColor` argument which is used to override the context color.
|
||||
* `LineStyleCanvas` now takes an `altAlpha` argument which is used to override the context alpha.
|
||||
* `FillStyleCanvas` now takes an `altAlpha` argument which is used to override the context alpha.
|
||||
* `StaticPhysicsGroup` can now take a `classType` property in its Group Config and will use the value of it, rather than override it. If none is provided it'll default to `ArcadeSprite`. Fix #4401 (thanks @Legomite)
|
||||
* `Phaser.Tilemaps.Parsers.Tiled` used to run the static function `ParseJSONTiled`. `Parsers.Tiled` is now just a namespace, so access the function within it: `Phaser.Tilemaps.Parsers.Tiled.ParseJSONTiled`.
|
||||
* `Phaser.Tilemaps.Parsers.Impact` used to run the static function `ParseWeltmeister`. `Parsers.Impact` is now just a namespace, so access the function within it: `Phaser.Tilemaps.Parsers.Impact.ParseWeltmeister`.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.AssignTileProperties` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.Base64Decode` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.BuildTilesetIndex` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseGID` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseImageLayers` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseJSONTiled` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseObject` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseObjectLayers` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseTileLayers` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseTilesets` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.ParseTilesets` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Impact.ParseTileLayers` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Impact.ParseTilesets` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Impact.ParseWeltmeister` is now a public static function, available to be called directly.
|
||||
* `Phaser.Tilemaps.Parsers.Tiled.Pick` has been removed. It is now available under `Phaser.Utils.Objects.Pick`, which is a more logical place for it.
|
||||
* You can now call `this.scene.remove` at the end of a Scene's `create` method without it throwing an error. Why you'd ever want to do this is beyond me, but you now can (thanks @samme)
|
||||
* The `Arcade.StaticBody.setSize` arguments have changed from `(width, height, offsetX, offsetY)` to `(width, height, center)`. They now match Dynamic Body setSize and the Size Component method (thanks @samme)
|
||||
* When enabling Arcade Physics Body debug it will now draw only the faces marked for collision, allowing you to easily see if a face is disabled or not (thanks @BdR76)
|
||||
* `Transform.getParentRotation` is a new method available to all GameObjects that will return the sum total rotation of all of the Game Objects parent Containers, if it has any.
|
||||
* `Tween.restart` now sets the Tween properties `elapsed`, `progress`, `totalElapsed` and `totalProgress` to zero when called, rather than adding to existing values should the tween already be running.
|
||||
* `ArcadePhysics.Body.resetFlags` is a new method that prepares the Body for a physics step by resetting the `wasTouching`, `touching` and `blocked` states.
|
||||
* `ArcadePhysics.Body.preUpdate` has two new arguments `willStep` and `delta`. If `willStep` is true then the body will call resetFlags, sync with the parent Game Object and then run one iteration of `Body.update`, using the provided delta. If false, only the Game Object sync takes place.
|
||||
* `ArcadePhysics.World.update` will now determine if a physics step is going to happen this frame or not. If not, it no longer calls `World.step` (fix #4529, thanks @ampled). If a step _is_ going to happen, then it now handles this with one iteration of the bodies array, instead of two. It has also inlined a single world step, avoiding branching out. If extra world steps are required this frame (such as in high Hz environments) then `World.step` is called accordingly.
|
||||
* `ArcadePhysics.World.postUpdate` will no longer call `Body.postUpdate` on all of the bodies if no World step has taken place this frame.
|
||||
* `ArcadePhysics.World.step` will now increment the `stepsLastFrame` counter, allowing `postUpdate` to determine if bodies should be processed should World.step have been invoked manually.
|
||||
* When calling `setHitArea` and not providing a shape (i.e. a texture based hit area), it will now set `customHitArea` to `false` by default (thanks @rexrainbow)
|
||||
* The Shader will no longer set uniforms if the values are `null`, saving on GL ops.
|
||||
* The Animation Manager will now emit a console warning if you try and play an animation on a Sprite that doesn't exist.
|
||||
* The Animation component will no longer start an animation on a Sprite if the animation doesn't exist. Previously it would throw an error saying "Unable to read the property getFirstTick of null".
|
||||
* `InputManager.onPointerLockChange` is a new method that handles pointer lock change events and dispatches the lock event.
|
||||
* `CanvasTexture` has been added to the `Textures` namespace so it can be created without needing to import it. The correct way to create a `CanvasTexture` is via the Texture Manager, but you can now do it directly if required. Fix #4651 (thanks @Jugacu)
|
||||
* The `SmoothedKeyControl` minimum zoom a Camera can go to is now 0.001. Previously it was 0.1. This is to make it match the minimum zoom a Base Camera can go to. Fix #4649 (thanks @giviz)
|
||||
* `WebGLRenderer.lostContextCallbacks` and the `onContextLost` method have been removed. Please use the new `CONTEXT_LOST` event instead.
|
||||
* `WebGLRenderer.restoredContextCallbacks` and the `onContextRestored` method have been removed. Please use the new `CONTEXT_RESTORED` event instead.
|
||||
* `TextureManager.getBase64` will now emit a console warning if you try to get a base64 from a non-image based texture, such as a WebGL Texture.
|
||||
* The `WebAudioSoundManager` will now remove the document touch handlers even if the Promise fails, preventing it from throwing a rejection handler error.
|
||||
* `GameObjectFactory.remove` is a new static function that will remove a custom Game Object factory type.
|
||||
* `GameObjectCreator.remove` is a new static function that will remove a custom Game Object creator type.
|
||||
* `CanvasTexture.getPixels` now defaults to 0x0 by width x height as the default area, allowing you to call the method with no arguments to get all the pixels for the canvas.
|
||||
* `CreateDOMContainer` will now use `div.style.cssText` to set the inline styles of the container, so it now works on IE11. Fix #4674 (thanks @DanLiamco)
|
||||
* `TransformMatrix.rotation` now returns the properly normalized rotation value.
|
||||
* `PhysicsEditorParser` has now been exposed under the `Phaser.Physics.Matter` namespace, so you can call methods on it directly.
|
||||
* Calling `CanvasTexture.update` will now automatically call `refresh` if running under WebGL. This happens for both `draw` and `drawFrame`, meaning you no longer need to remember to call `refresh` after drawing to a Canvas Texture in WebGL, keeping it consistent with the Canvas renderer.
|
||||
* `Frame.destroy` will now null the Frames reference to its parent texture, glTexture and clear the data and customData objects.
|
||||
* The Container renderer functions will now read the childs `alpha` property, instead of `_alpha`, allowing it to work with more variety of custom children.
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* Tweens created in a paused state couldn't be started by a call to `play`. Fix #4525 (thanks @TonioParis)
|
||||
* If both Arcade Physics circle body positions and the delta equaled zero, the `separateCircle` function would cause the position to be set `NaN` (thanks @hizzd)
|
||||
* The `CameraManager` would incorrectly destroy the `default` Camera in its shutdown method, meaning that if you used a fixed mask camera and stopped then resumed a Scene, the masks would stop working. The default camera is now destroyed only in the `destroy` method. Fix #4520 (thanks @telinc1)
|
||||
* Passing a Frame object to `Bob.setFrame` would fail, as it expected a string or integer. It now checks the type of object, and if a Frame it checks to make sure it's a Frame belonging to the parent Blitter's texture, and if so sets it. Fix #4516 (thanks @NokFrt)
|
||||
* The ScaleManager full screen call had an arrow function in it. Despite being within a conditional block of code it still broke really old browsers like IE11, so has been removed. Fix #4530 (thanks @jorbascrumps @CNDW)
|
||||
* `Game.getTime` would return `NaN` because it incorrectly accessed the time value from the TimeStep.
|
||||
* Text with a `fixedWidth` or `fixedHeight` could cause the canvas to be cropped if less than the size of the Text itself (thanks @rexrainbow)
|
||||
* Changing the `radius` of an Arc Game Object wouldn't update the size, causing origin issues. It now updates the size and origin correctly in WebGL. Fix #4542 (thanks @@PhaserEditor2D)
|
||||
* Setting `padding` in a Text style configuration object would cause an error about calling split on undefined. Padding can now be applied both in the config and via `setPadding`.
|
||||
* `Tilemap.createBlankDynamicLayer` would fail if you provided a string for the tileset as the base tile width and height were incorrectly read from the tileset argument. Fix #4495 (thanks @jppresents)
|
||||
* `Tilemap.createDynamicLayer` would fail if you called it without setting the `x` and `y` arguments, even though they were flagged as being optional. Fix #4508 (thanks @jackfreak)
|
||||
* `RenderTexture.draw` didn't work if no `x` and `y` arguments were provided, even though they are optional, due to a problem with the way the frame cut values were added. The class has been refactored to prevent this, fixing issues like `RenderTexture.erase` not working with Groups. Fix #4528 (thanks @jbgomez21 @telinc1)
|
||||
* The `Grid` Game Object wouldn't render in Canvas mode at all. Fix #4585 (thanks @fyyyyy)
|
||||
* If you had a `Graphics` object in the display list immediately after an object with a Bitmap Mask it would throw an error `Uncaught TypeError: Cannot set property 'TL' of undefined`. Fix #4581 (thanks @Petah @Loonride)
|
||||
* Calling Arcade Physics `Body.reset` on a Game Object that doesn't have any bounds, like a Container, would throw an error about being unable to access `getTopLeft`. If this is the case, it will now set the position to the given x/y values (thanks Jazz)
|
||||
* All of the `Tilemaps.Parsers.Tiled` static functions are now available to be called directly. Fix #4318 (thanks @jestarray)
|
||||
* `Arcade.StaticBody.setSize` now centers the body correctly, as with the other similar methods. Fix #4213 (thanks @samme)
|
||||
* Setting `random: false` in a Particle Emitter config option no longer causes it to think random is true (thanks @samme)
|
||||
* `Zone.setSize` didn't update the displayOrigin, causing touch events to be inaccurate as the origin was out. Fix #4131 (thanks @rexrainbow)
|
||||
* `Tween.restart` wouldn't restart the tween properly. Fix #4594 (thanks @NokFrt)
|
||||
* Looped Tween Timelines would mess-up the tween values on every loop repeat, causing the loop to fail. They now loop correctly due to a fix in the Tween.play method. Fix #4558 (thanks @peteroravec)
|
||||
* `Timeline.setTimeScale` would only impact the Timeline loop and completion delays, not the actively running Tweens. It now scales the time for all child tweens as well. Fix #4164 (thanks @garethwhittaker)
|
||||
* The Scale Manager would throw the error 'TypeError: this.removeFullscreenTarget is not a function' when entering full-screen mode. It would still enter fullscreen, but the error would appear in the console. Fix #4605 (thanks @darklightcode)
|
||||
* `Tilemap.renderDebug` was calling out-dated Graphics API methods, which would cause the debug to fail (thanks @Fabadiculous)
|
||||
* The `Matter.Factory.constraint`, `joint` and `worldConstraint` methods wouldn't allow a zero length constraint to be created due to a falsey check of the length argument. You can now set length to be any value, including zero, or leave it undefined to have it automatically calculated (thanks @olilanz)
|
||||
* `Pointer.getDuration` would return a negative / static value on desktop, or NaN on mobile, because the base time wasn't being pulled in from the Input Manager properly. Fix #4612 (thanks @BobtheUltimateProgrammer)
|
||||
* `Pointer.downTime`, `Pointer.upTime` and `Pointer.moveTime` would be set to NaN on mobile browsers where Touch.timeStamp didn't exist. Fix #4612 (thanks @BobtheUltimateProgrammer)
|
||||
* `WebGLRenderer.setScissor` will default the `drawingBufferHeight` if no argument is provided, stopping NaN scissor heights.
|
||||
* If you called `Scene.destroy` within a Game Object `pointerdown` or `pointerup` handler, it would cause the error "Cannot read property 'game' of null" if the event wasn't cancelled in your handler. It now checks if the manager is still there before accessing its property. Fix #4436 (thanks @jcyuan)
|
||||
* The `Arc / Circle` Game Object wasn't rendering centered correctly in WebGL due to an issue in a previous size related commit, it would be half a radius off. Fix #4620 (thanks @CipSoft-Components @rexrainbow)
|
||||
* Destroying a Scene in HEADLESS mode would throw an error as it tried to access the gl renderer in the Camera class. Fix #4467 (thanks @AndreaBoeAbrahamsen @samme)
|
||||
* `Tilemap.createFromObjects` would ignore the `scene` argument passed in to the method. It's now used (thanks @samme)
|
||||
* Fixed a bug in the WebGL and Canvas Renderers where a Sprite with a `flipX` or `flipY` value set would render the offset frames slightly out of place, causing the animation to appear jittery. Also, the sprite would be out of place by its origin. Fix #4636 #3813 (thanks @jronn @B3L7)
|
||||
* Animations with custom pivots, like those created in Texture Packer with the pivot option enabled, would be mis-aligned if flipped. They now render in the correct position, regardless of scale or flip on either axis. Fix #4155 (thanks @Zax37)
|
||||
* Removing a frame from a 2 frame animation would cause an error when a Sprite using that animation next tried to render. Fix #4621 (thanks @orlicgms)
|
||||
* Calling `Animation.setRepeat()` wouldn't reset the `repeatCounter` properly, causing Sprite bound animation instances to fail to change their repeat rate. Fix #4553 (thanks @SavedByZero)
|
||||
* The `UpdateList.remove` method wouldn't flag the Game Object for removal properly if it was active. It now checks that the Game Object is in the current update list and hasn't already been inserted into the 'pending removal' list before flagging it. Fix #4544 (thanks @jcyuan)
|
||||
* `DynamicTilemapLayer.destroy` will now no longer run its destroy sequence again if it has already been run once. Fix #4634 (thanks @CipSoft-Components)
|
||||
* `StaticTilemapLayer.destroy` will now no longer run its destroy sequence again if it has already been run once.
|
||||
* `Shader.uniforms` now uses Extend instead of Clone to perform a deep object copy, instead of a shallow one, avoiding multiple instances of the same shader sharing uniforms. Fix #4641 (thanks @davidmball)
|
||||
* Calling `input.mouse.requestPointerLock()` will no longer throw an error about being unable to push to the Input Manager events queue.
|
||||
* The `POINTERLOCK_CHANGE` event is now dispatched by the Input Manager again.
|
||||
* The `Pointer.movementX` and `Pointer.movementY` properties are now taken directly from the DOM pointer event values, if the pointer is locked, and no longer incremental. Fix #4611 (thanks @davidmball)
|
||||
* The `Pointer.velocity` and `Pointer.midPoint` values are now updated every frame. Based on the `motionFactor` setting they are smoothed towards zero, for velocity, and the pointer position for the mid point. This now happens regardless if the Pointer moves or not, which is how it was originally intended to behave.
|
||||
* The `DESTROY` event hook wasn't removed from Group children when destroying the Group and `destroyChildren` was set to false. Now, the hook is removed regardless (thanks @rexrainbow)
|
||||
* The WebGL Lost and Restored Context callbacks were never removed, which could cause them to hold onto stale references. Fix #3610 (thanks @Twilrom)
|
||||
* `Origin.updateDisplayOrigin` no longer applies a Math.floor to the display origins, allowing you to have a 0.x origin for a Game Object that only has a width or height of 1. This fixes issues with things like 1x1 rectangles displaying incorrectly during rendering. Fix #4126 (thanks @rexrainbow)
|
||||
* `InputManager.resetCursor` will now check if the canvas element still exists before resetting the cursor on it. Fix #4662 (thanks @fromnowhereuser)
|
||||
* It was not possible to set the zoom value of the Scale Manager back to 1 again, having changed it to a different value. Fix #4633 (thanks @lgibson02 @BinaryMoon)
|
||||
|
||||
### Examples, Documentation and TypeScript
|
||||
|
||||
My thanks to the following for helping with the Phaser 3 Examples, Docs and TypeScript definitions, either by reporting errors, fixing them or helping author the docs:
|
||||
|
||||
@PhaserEditor2D @samme @Nallebeorn @Punkiebe @rootasjey @Sun0fABeach
|
||||
@vacarsu @KennethGomez @samme @ldd @Jazcash @jcyuan @LearningCode2023 @PhaserEditor2D
|
||||
|
||||
Please see the complete [Change Log](https://github.com/photonstorm/phaser/blob/master/CHANGELOG.md) for previous releases.
|
||||
|
||||
|
@ -565,8 +513,8 @@ All rights reserved.
|
|||
|
||||
"Above all, video games are meant to be just one thing: fun. Fun for everyone." - Satoru Iwata
|
||||
|
||||
[get-js]: https://github.com/photonstorm/phaser/releases/download/v3.18.1/phaser.js
|
||||
[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v3.18.1/phaser.min.js
|
||||
[get-js]: https://github.com/photonstorm/phaser/releases/download/v3.19.0/phaser.js
|
||||
[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v3.19.0/phaser.min.js
|
||||
[clone-http]: https://github.com/photonstorm/phaser.git
|
||||
[clone-ssh]: git@github.com:photonstorm/phaser.git
|
||||
[clone-ghwin]: github-windows://openRepo/https://github.com/photonstorm/phaser
|
||||
|
|
15059
dist/phaser-arcade-physics.js
vendored
15059
dist/phaser-arcade-physics.js
vendored
File diff suppressed because it is too large
Load diff
2
dist/phaser-arcade-physics.min.js
vendored
2
dist/phaser-arcade-physics.min.js
vendored
File diff suppressed because one or more lines are too long
14663
dist/phaser-facebook-instant-games.js
vendored
14663
dist/phaser-facebook-instant-games.js
vendored
File diff suppressed because it is too large
Load diff
2
dist/phaser-facebook-instant-games.min.js
vendored
2
dist/phaser-facebook-instant-games.min.js
vendored
File diff suppressed because one or more lines are too long
16099
dist/phaser.js
vendored
16099
dist/phaser.js
vendored
File diff suppressed because it is too large
Load diff
2
dist/phaser.min.js
vendored
2
dist/phaser.min.js
vendored
File diff suppressed because one or more lines are too long
7
package-lock.json
generated
7
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "phaser",
|
||||
"version": "3.19.0-beta1",
|
||||
"version": "3.19.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -3882,6 +3882,11 @@
|
|||
"integrity": "sha512-8Ph721maXiOYSLtaDGKVmDn5wdsNaF6Px85qFNeMPQq0r8K5Y10tgP6YuR65Ws35n4DvzFcCxEnRNBIXQunzLw==",
|
||||
"dev": true
|
||||
},
|
||||
"remove-files-webpack-plugin": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/remove-files-webpack-plugin/-/remove-files-webpack-plugin-1.1.3.tgz",
|
||||
"integrity": "sha512-r53wQ/IlTkmcv11wri71CZ27S+GhFI5SjHbTbaAJbisPC3qGwg87vlA2C5Z1PuVA+aMI8SgimnE4SqI+ZYzu6Q=="
|
||||
},
|
||||
"remove-trailing-separator": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
|
||||
|
|
12
package.json
12
package.json
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "phaser",
|
||||
"version": "3.19.0-beta1",
|
||||
"release": "Naofumi",
|
||||
"version": "3.20.0-beta1",
|
||||
"release": "Fitoria",
|
||||
"description": "A fast, free and fun HTML5 Game Framework for Desktop and Mobile web browsers.",
|
||||
"author": "Richard Davey <rich@photonstorm.com> (http://www.photonstorm.com)",
|
||||
"homepage": "http://phaser.io",
|
||||
|
@ -28,10 +28,15 @@
|
|||
"plugin.spine": "webpack --config plugins/spine/webpack.config.js",
|
||||
"plugin.spine.dist": "webpack --config plugins/spine/webpack.auto.dist.config.js",
|
||||
"plugin.spine.watch": "webpack --config plugins/spine/webpack.auto.config.js --watch --display-modules",
|
||||
"plugin.spine.dev": "webpack --config plugins/spine/webpack.auto.config.js",
|
||||
"plugin.spine.canvas.dist": "webpack --config plugins/spine/webpack.canvas.dist.config.js",
|
||||
"plugin.spine.canvas.watch": "webpack --config plugins/spine/webpack.canvas.config.js --watch --display-modules",
|
||||
"plugin.spine.canvas.dev": "webpack --config plugins/spine/webpack.canvas.config.js",
|
||||
"plugin.spine.webgl.dist": "webpack --config plugins/spine/webpack.webgl.dist.config.js",
|
||||
"plugin.spine.webgl.watch": "webpack --config plugins/spine/webpack.webgl.config.js --watch",
|
||||
"plugin.spine.webgl.watch": "webpack --config plugins/spine/webpack.webgl.config.js --watch --display-modules",
|
||||
"plugin.spine.webgl.dev": "webpack --config plugins/spine/webpack.webgl.config.js",
|
||||
"plugin.spine.full": "npm run plugin.spine.dev && npm run plugin.spine.canvas.dev && npm run plugin.spine.webgl.dev",
|
||||
"plugin.spine.full.dist": "npm run plugin.spine.dist && npm run plugin.spine.canvas.dist && npm run plugin.spine.webgl.dist",
|
||||
"lint": "eslint --config .eslintrc.json \"src/**/*.js\"",
|
||||
"lintfix": "eslint --config .eslintrc.json \"src/**/*.js\" --fix",
|
||||
"sloc": "node-sloc \"./src\" --include-extensions \"js\"",
|
||||
|
@ -74,6 +79,7 @@
|
|||
"imports-loader": "^0.8.0",
|
||||
"jsdoc": "^3.6.1",
|
||||
"path": "^0.12.7",
|
||||
"remove-files-webpack-plugin": "^1.1.3",
|
||||
"typescript": "^3.4.5"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,3 +11,10 @@ else
|
|||
{
|
||||
console.log('Copy-to-Examples failed: Phaser 3 Examples not present at ../phaser3-examples');
|
||||
}
|
||||
|
||||
dest = '../100-phaser3-snippets/public/libs/';
|
||||
|
||||
if (fs.existsSync(dest))
|
||||
{
|
||||
fs.copySync(source, dest, { overwrite: true });
|
||||
}
|
||||
|
|
28428
plugins/spine/dist/SpineCanvasPlugin.js
vendored
Normal file
28428
plugins/spine/dist/SpineCanvasPlugin.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
1
plugins/spine/dist/SpineCanvasPlugin.min.js
vendored
Normal file
1
plugins/spine/dist/SpineCanvasPlugin.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
29500
plugins/spine/dist/SpineCanvasPluginDebug.js
vendored
Normal file
29500
plugins/spine/dist/SpineCanvasPluginDebug.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
1
plugins/spine/dist/SpineCanvasPluginDebug.js.map
vendored
Normal file
1
plugins/spine/dist/SpineCanvasPluginDebug.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
44140
plugins/spine/dist/SpinePlugin.js
vendored
44140
plugins/spine/dist/SpinePlugin.js
vendored
File diff suppressed because one or more lines are too long
1
plugins/spine/dist/SpinePlugin.js.map
vendored
1
plugins/spine/dist/SpinePlugin.js.map
vendored
File diff suppressed because one or more lines are too long
1
plugins/spine/dist/SpinePlugin.min.js
vendored
Normal file
1
plugins/spine/dist/SpinePlugin.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
31991
plugins/spine/dist/SpinePluginDebug.js
vendored
Normal file
31991
plugins/spine/dist/SpinePluginDebug.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
1
plugins/spine/dist/SpinePluginDebug.js.map
vendored
Normal file
1
plugins/spine/dist/SpinePluginDebug.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
30799
plugins/spine/dist/SpineWebGLPlugin.js
vendored
Normal file
30799
plugins/spine/dist/SpineWebGLPlugin.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
plugins/spine/dist/SpineWebGLPlugin.min.js
vendored
Normal file
1
plugins/spine/dist/SpineWebGLPlugin.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
31871
plugins/spine/dist/SpineWebGLPluginDebug.js
vendored
Normal file
31871
plugins/spine/dist/SpineWebGLPluginDebug.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
plugins/spine/dist/SpineWebGLPluginDebug.js.map
vendored
Normal file
1
plugins/spine/dist/SpineWebGLPluginDebug.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -39,10 +39,11 @@ var TextFile = require('../../../src/loader/filetypes/TextFile.js');
|
|||
* @constructor
|
||||
*
|
||||
* @param {Phaser.Loader.LoaderPlugin} loader - A reference to the Loader that is responsible for this file.
|
||||
* @param {(string|Phaser.Loader.FileTypes.UnityAtlasFileConfig)} key - The key to use for this file, or a file configuration object.
|
||||
* @param {string|string[]} [textureURL] - The absolute or relative URL to load the texture image file from. If undefined or `null` it will be set to `<key>.png`, i.e. if `key` was "alien" then the URL will be "alien.png".
|
||||
* @param {(string|Phaser.Loader.FileTypes.SpineFileConfig)} key - The key to use for this file, or a file configuration object.
|
||||
* @param {string|string[]} [jsonURL] - The absolute or relative URL to load the JSON file from. If undefined or `null` it will be set to `<key>.json`, i.e. if `key` was "alien" then the URL will be "alien.json".
|
||||
* @param {string} [atlasURL] - The absolute or relative URL to load the texture atlas data file from. If undefined or `null` it will be set to `<key>.txt`, i.e. if `key` was "alien" then the URL will be "alien.txt".
|
||||
* @param {XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
|
||||
* @param {boolean} [preMultipliedAlpha=false] - Do the textures contain pre-multiplied alpha or not?
|
||||
* @param {XHRSettingsObject} [jsonXhrSettings] - An XHR Settings configuration object for the json file. Used in replacement of the Loaders default XHR Settings.
|
||||
* @param {XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas data file. Used in replacement of the Loaders default XHR Settings.
|
||||
*/
|
||||
var SpineFile = new Class({
|
||||
|
@ -51,10 +52,15 @@ var SpineFile = new Class({
|
|||
|
||||
initialize:
|
||||
|
||||
function SpineFile (loader, key, jsonURL, atlasURL, jsonXhrSettings, atlasXhrSettings)
|
||||
function SpineFile (loader, key, jsonURL, atlasURL, preMultipliedAlpha, jsonXhrSettings, atlasXhrSettings)
|
||||
{
|
||||
var i;
|
||||
var json;
|
||||
var atlas;
|
||||
var files = [];
|
||||
var cache = loader.cacheManager.custom.spine;
|
||||
|
||||
// atlas can be an array of atlas files, not just a single one
|
||||
|
||||
if (IsPlainObject(key))
|
||||
{
|
||||
|
@ -69,29 +75,58 @@ var SpineFile = new Class({
|
|||
xhrSettings: GetFastValue(config, 'jsonXhrSettings')
|
||||
});
|
||||
|
||||
atlas = new TextFile(loader, {
|
||||
key: key,
|
||||
url: GetFastValue(config, 'atlasURL'),
|
||||
extension: GetFastValue(config, 'atlasExtension', 'atlas'),
|
||||
xhrSettings: GetFastValue(config, 'atlasXhrSettings')
|
||||
});
|
||||
atlasURL = GetFastValue(config, 'atlasURL');
|
||||
preMultipliedAlpha = GetFastValue(config, 'preMultipliedAlpha');
|
||||
|
||||
if (!Array.isArray(atlasURL))
|
||||
{
|
||||
atlasURL = [ atlasURL ];
|
||||
}
|
||||
|
||||
for (i = 0; i < atlasURL.length; i++)
|
||||
{
|
||||
atlas = new TextFile(loader, {
|
||||
key: key,
|
||||
url: atlasURL[i],
|
||||
extension: GetFastValue(config, 'atlasExtension', 'atlas'),
|
||||
xhrSettings: GetFastValue(config, 'atlasXhrSettings')
|
||||
});
|
||||
|
||||
atlas.cache = cache;
|
||||
|
||||
files.push(atlas);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
json = new JSONFile(loader, key, jsonURL, jsonXhrSettings);
|
||||
atlas = new TextFile(loader, key, atlasURL, atlasXhrSettings);
|
||||
}
|
||||
|
||||
atlas.cache = loader.cacheManager.custom.spine;
|
||||
|
||||
MultiFile.call(this, loader, 'spine', key, [ json, atlas ]);
|
||||
if (!Array.isArray(atlasURL))
|
||||
{
|
||||
atlasURL = [ atlasURL ];
|
||||
}
|
||||
|
||||
for (i = 0; i < atlasURL.length; i++)
|
||||
{
|
||||
atlas = new TextFile(loader, key + '_' + i, atlasURL[i], atlasXhrSettings);
|
||||
atlas.cache = cache;
|
||||
|
||||
files.push(atlas);
|
||||
}
|
||||
}
|
||||
|
||||
files.unshift(json);
|
||||
|
||||
MultiFile.call(this, loader, 'spine', key, files);
|
||||
|
||||
this.config.preMultipliedAlpha = preMultipliedAlpha;
|
||||
},
|
||||
|
||||
/**
|
||||
* Called by each File when it finishes loading.
|
||||
*
|
||||
* @method Phaser.Loader.MultiFile#onFileComplete
|
||||
* @since 3.7.0
|
||||
* @method Phaser.Loader.FileTypes.SpineFile#onFileComplete
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.Loader.File} file - The File that has completed processing.
|
||||
*/
|
||||
|
@ -164,7 +199,7 @@ var SpineFile = new Class({
|
|||
* Adds this file to its target cache upon successful loading and processing.
|
||||
*
|
||||
* @method Phaser.Loader.FileTypes.SpineFile#addToCache
|
||||
* @since 3.16.0
|
||||
* @since 3.19.0
|
||||
*/
|
||||
addToCache: function ()
|
||||
{
|
||||
|
@ -174,152 +209,39 @@ var SpineFile = new Class({
|
|||
|
||||
fileJSON.addToCache();
|
||||
|
||||
var fileText = this.files[1];
|
||||
var atlasCache;
|
||||
var atlasKey = '';
|
||||
var combinedAtlastData = '';
|
||||
var preMultipliedAlpha = (this.config.preMultipliedAlpha) ? true : false;
|
||||
|
||||
fileText.addToCache();
|
||||
|
||||
for (var i = 2; i < this.files.length; i++)
|
||||
for (var i = 1; i < this.files.length; i++)
|
||||
{
|
||||
var file = this.files[i];
|
||||
|
||||
var key = file.key.substr(4).trim();
|
||||
if (file.type === 'text')
|
||||
{
|
||||
atlasKey = file.key.substr(0, file.key.length - 2);
|
||||
|
||||
this.loader.textureManager.addImage(key, file.data);
|
||||
atlasCache = file.cache;
|
||||
|
||||
combinedAtlastData = combinedAtlastData.concat(file.data);
|
||||
}
|
||||
else
|
||||
{
|
||||
var key = file.key.substr(4).trim();
|
||||
|
||||
this.loader.textureManager.addImage(key, file.data);
|
||||
}
|
||||
|
||||
file.pendingDestroy();
|
||||
}
|
||||
|
||||
atlasCache.add(atlasKey, { preMultipliedAlpha: preMultipliedAlpha, data: combinedAtlastData });
|
||||
|
||||
this.complete = true;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
* Adds a Unity YAML based Texture Atlas, or array of atlases, to the current load queue.
|
||||
*
|
||||
* You can call this method from within your Scene's `preload`, along with any other files you wish to load:
|
||||
*
|
||||
* ```javascript
|
||||
* function preload ()
|
||||
* {
|
||||
* this.load.unityAtlas('mainmenu', 'images/MainMenu.png', 'images/MainMenu.txt');
|
||||
* }
|
||||
* ```
|
||||
*
|
||||
* The file is **not** loaded right away. It is added to a queue ready to be loaded either when the loader starts,
|
||||
* or if it's already running, when the next free load slot becomes available. This happens automatically if you
|
||||
* are calling this from within the Scene's `preload` method, or a related callback. Because the file is queued
|
||||
* it means you cannot use the file immediately after calling this method, but must wait for the file to complete.
|
||||
* The typical flow for a Phaser Scene is that you load assets in the Scene's `preload` method and then when the
|
||||
* Scene's `create` method is called you are guaranteed that all of those assets are ready for use and have been
|
||||
* loaded.
|
||||
*
|
||||
* If you call this from outside of `preload` then you are responsible for starting the Loader afterwards and monitoring
|
||||
* its events to know when it's safe to use the asset. Please see the Phaser.Loader.LoaderPlugin class for more details.
|
||||
*
|
||||
* Phaser expects the atlas data to be provided in a YAML formatted text file as exported from Unity.
|
||||
*
|
||||
* Phaser can load all common image types: png, jpg, gif and any other format the browser can natively handle.
|
||||
*
|
||||
* The key must be a unique String. It is used to add the file to the global Texture Manager upon a successful load.
|
||||
* The key should be unique both in terms of files being loaded and files already present in the Texture Manager.
|
||||
* Loading a file using a key that is already taken will result in a warning. If you wish to replace an existing file
|
||||
* then remove it from the Texture Manager first, before loading a new one.
|
||||
*
|
||||
* Instead of passing arguments you can pass a configuration object, such as:
|
||||
*
|
||||
* ```javascript
|
||||
* this.load.unityAtlas({
|
||||
* key: 'mainmenu',
|
||||
* textureURL: 'images/MainMenu.png',
|
||||
* atlasURL: 'images/MainMenu.txt'
|
||||
* });
|
||||
* ```
|
||||
*
|
||||
* See the documentation for `Phaser.Loader.FileTypes.SpineFileConfig` for more details.
|
||||
*
|
||||
* Once the atlas has finished loading you can use frames from it as textures for a Game Object by referencing its key:
|
||||
*
|
||||
* ```javascript
|
||||
* this.load.unityAtlas('mainmenu', 'images/MainMenu.png', 'images/MainMenu.json');
|
||||
* // and later in your game ...
|
||||
* this.add.image(x, y, 'mainmenu', 'background');
|
||||
* ```
|
||||
*
|
||||
* To get a list of all available frames within an atlas please consult your Texture Atlas software.
|
||||
*
|
||||
* If you have specified a prefix in the loader, via `Loader.setPrefix` then this value will be prepended to this files
|
||||
* key. For example, if the prefix was `MENU.` and the key was `Background` the final key will be `MENU.Background` and
|
||||
* this is what you would use to retrieve the image from the Texture Manager.
|
||||
*
|
||||
* The URL can be relative or absolute. If the URL is relative the `Loader.baseURL` and `Loader.path` values will be prepended to it.
|
||||
*
|
||||
* If the URL isn't specified the Loader will take the key and create a filename from that. For example if the key is "alien"
|
||||
* and no URL is given then the Loader will set the URL to be "alien.png". It will always add `.png` as the extension, although
|
||||
* this can be overridden if using an object instead of method arguments. If you do not desire this action then provide a URL.
|
||||
*
|
||||
* Phaser also supports the automatic loading of associated normal maps. If you have a normal map to go with this image,
|
||||
* then you can specify it by providing an array as the `url` where the second element is the normal map:
|
||||
*
|
||||
* ```javascript
|
||||
* this.load.unityAtlas('mainmenu', [ 'images/MainMenu.png', 'images/MainMenu-n.png' ], 'images/MainMenu.txt');
|
||||
* ```
|
||||
*
|
||||
* Or, if you are using a config object use the `normalMap` property:
|
||||
*
|
||||
* ```javascript
|
||||
* this.load.unityAtlas({
|
||||
* key: 'mainmenu',
|
||||
* textureURL: 'images/MainMenu.png',
|
||||
* normalMap: 'images/MainMenu-n.png',
|
||||
* atlasURL: 'images/MainMenu.txt'
|
||||
* });
|
||||
* ```
|
||||
*
|
||||
* The normal map file is subject to the same conditions as the image file with regard to the path, baseURL, CORs and XHR Settings.
|
||||
* Normal maps are a WebGL only feature.
|
||||
*
|
||||
* Note: The ability to load this type of file will only be available if the Unity Atlas File type has been built into Phaser.
|
||||
* It is available in the default build but can be excluded from custom builds.
|
||||
*
|
||||
* @method Phaser.Loader.LoaderPlugin#spine
|
||||
* @fires Phaser.Loader.LoaderPlugin#addFileEvent
|
||||
* @since 3.16.0
|
||||
*
|
||||
* @param {(string|Phaser.Loader.FileTypes.SpineFileConfig|Phaser.Loader.FileTypes.SpineFileConfig[])} key - The key to use for this file, or a file configuration object, or array of them.
|
||||
* @param {string|string[]} [textureURL] - The absolute or relative URL to load the texture image file from. If undefined or `null` it will be set to `<key>.png`, i.e. if `key` was "alien" then the URL will be "alien.png".
|
||||
* @param {string} [atlasURL] - The absolute or relative URL to load the texture atlas data file from. If undefined or `null` it will be set to `<key>.txt`, i.e. if `key` was "alien" then the URL will be "alien.txt".
|
||||
* @param {XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
|
||||
* @param {XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas data file. Used in replacement of the Loaders default XHR Settings.
|
||||
*
|
||||
* @return {Phaser.Loader.LoaderPlugin} The Loader instance.
|
||||
FileTypesManager.register('spine', function (key, jsonURL, atlasURL, jsonXhrSettings, atlasXhrSettings)
|
||||
{
|
||||
var multifile;
|
||||
|
||||
// Supports an Object file definition in the key argument
|
||||
// Or an array of objects in the key argument
|
||||
// Or a single entry where all arguments have been defined
|
||||
|
||||
if (Array.isArray(key))
|
||||
{
|
||||
for (var i = 0; i < key.length; i++)
|
||||
{
|
||||
multifile = new SpineFile(this, key[i]);
|
||||
|
||||
this.addFile(multifile.files);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
multifile = new SpineFile(this, key, jsonURL, atlasURL, jsonXhrSettings, atlasXhrSettings);
|
||||
|
||||
this.addFile(multifile.files);
|
||||
}
|
||||
|
||||
return this;
|
||||
});
|
||||
*/
|
||||
|
||||
module.exports = SpineFile;
|
||||
|
|
File diff suppressed because it is too large
Load diff
13
plugins/spine/src/events/COMPLETE_EVENT.js
Normal file
13
plugins/spine/src/events/COMPLETE_EVENT.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* The Complete Event.
|
||||
*
|
||||
* @event SpinePluginEvents#COMPLETE
|
||||
* @since 3.19.0
|
||||
*/
|
||||
module.exports = 'complete';
|
13
plugins/spine/src/events/DISPOSE_EVENT.js
Normal file
13
plugins/spine/src/events/DISPOSE_EVENT.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* The Dispose Event.
|
||||
*
|
||||
* @event SpinePluginEvents#DISPOSE
|
||||
* @since 3.19.0
|
||||
*/
|
||||
module.exports = 'dispose';
|
13
plugins/spine/src/events/END_EVENT.js
Normal file
13
plugins/spine/src/events/END_EVENT.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* The End Event.
|
||||
*
|
||||
* @event SpinePluginEvents#END
|
||||
* @since 3.19.0
|
||||
*/
|
||||
module.exports = 'end';
|
13
plugins/spine/src/events/EVENT_EVENT.js
Normal file
13
plugins/spine/src/events/EVENT_EVENT.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* The Custom Event Event.
|
||||
*
|
||||
* @event SpinePluginEvents#EVENT
|
||||
* @since 3.19.0
|
||||
*/
|
||||
module.exports = 'event';
|
13
plugins/spine/src/events/INTERRUPTED_EVENT.js
Normal file
13
plugins/spine/src/events/INTERRUPTED_EVENT.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* The Interrupted Event.
|
||||
*
|
||||
* @event SpinePluginEvents#INTERRUPTED
|
||||
* @since 3.19.0
|
||||
*/
|
||||
module.exports = 'interrupted';
|
13
plugins/spine/src/events/START_EVENT.js
Normal file
13
plugins/spine/src/events/START_EVENT.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* The Start Event.
|
||||
*
|
||||
* @event SpinePluginEvents#START
|
||||
* @since 3.19.0
|
||||
*/
|
||||
module.exports = 'start';
|
20
plugins/spine/src/events/index.js
Normal file
20
plugins/spine/src/events/index.js
Normal file
|
@ -0,0 +1,20 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* @namespace SpinePluginEvents
|
||||
*/
|
||||
|
||||
module.exports = {
|
||||
|
||||
COMPLETE: require('./COMPLETE_EVENT'),
|
||||
DISPOSE: require('./DISPOSE_EVENT'),
|
||||
END: require('./END_EVENT'),
|
||||
EVENT: require('./EVENT_EVENT'),
|
||||
INTERRUPTED: require('./INTERRUPTED_EVENT'),
|
||||
START: require('./START_EVENT')
|
||||
|
||||
};
|
File diff suppressed because it is too large
Load diff
|
@ -1,22 +1,24 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2018 Photon Storm Ltd.
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
|
||||
*/
|
||||
|
||||
var SetTransform = require('../../../../src/renderer/canvas/utils/SetTransform');
|
||||
var CounterClockwise = require('../../../../src/math/angle/CounterClockwise');
|
||||
var RadToDeg = require('../../../../src/math/RadToDeg');
|
||||
var Wrap = require('../../../../src/math/Wrap');
|
||||
|
||||
/**
|
||||
* Renders this Game Object with the Canvas Renderer to the given Camera.
|
||||
* The object will not render if any of its renderFlags are set or it is being actively filtered out by the Camera.
|
||||
* This method should not be called directly. It is a utility function of the Render module.
|
||||
*
|
||||
* @method Phaser.GameObjects.SpineGameObject#renderCanvas
|
||||
* @since 3.16.0
|
||||
* @method SpineGameObject#renderCanvas
|
||||
* @since 3.19.0
|
||||
* @private
|
||||
*
|
||||
* @param {Phaser.Renderer.Canvas.CanvasRenderer} renderer - A reference to the current active Canvas renderer.
|
||||
* @param {Phaser.GameObjects.SpineGameObject} src - The Game Object being rendered in this call.
|
||||
* @param {SpineGameObject} src - The Game Object being rendered in this call.
|
||||
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
|
||||
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
|
||||
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
|
||||
|
@ -29,28 +31,94 @@ var SpineGameObjectCanvasRenderer = function (renderer, src, interpolationPercen
|
|||
var skeleton = src.skeleton;
|
||||
var skeletonRenderer = plugin.skeletonRenderer;
|
||||
|
||||
if (!skeleton || !SetTransform(renderer, context, src, camera, parentMatrix))
|
||||
var GameObjectRenderMask = 15;
|
||||
|
||||
var willRender = !(GameObjectRenderMask !== src.renderFlags || (src.cameraFilter !== 0 && (src.cameraFilter & camera.id)));
|
||||
|
||||
if (!skeleton || !willRender)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var camMatrix = renderer._tempMatrix1;
|
||||
var spriteMatrix = renderer._tempMatrix2;
|
||||
var calcMatrix = renderer._tempMatrix3;
|
||||
|
||||
spriteMatrix.applyITRS(src.x, src.y, src.rotation, Math.abs(src.scaleX), Math.abs(src.scaleY));
|
||||
|
||||
camMatrix.copyFrom(camera.matrix);
|
||||
|
||||
if (parentMatrix)
|
||||
{
|
||||
// Multiply the camera by the parent matrix
|
||||
camMatrix.multiplyWithOffset(parentMatrix, -camera.scrollX * src.scrollFactorX, -camera.scrollY * src.scrollFactorY);
|
||||
|
||||
// Undo the camera scroll
|
||||
spriteMatrix.e = src.x;
|
||||
spriteMatrix.f = src.y;
|
||||
|
||||
// Multiply by the Sprite matrix, store result in calcMatrix
|
||||
camMatrix.multiply(spriteMatrix, calcMatrix);
|
||||
}
|
||||
else
|
||||
{
|
||||
spriteMatrix.e -= camera.scrollX * src.scrollFactorX;
|
||||
spriteMatrix.f -= camera.scrollY * src.scrollFactorY;
|
||||
|
||||
// Multiply by the Sprite matrix, store result in calcMatrix
|
||||
camMatrix.multiply(spriteMatrix, calcMatrix);
|
||||
}
|
||||
|
||||
skeleton.x = calcMatrix.tx;
|
||||
skeleton.y = calcMatrix.ty;
|
||||
|
||||
skeleton.scaleX = calcMatrix.scaleX;
|
||||
|
||||
// Inverse or we get upside-down skeletons
|
||||
skeleton.scaleY = calcMatrix.scaleY * -1;
|
||||
|
||||
if (src.scaleX < 0)
|
||||
{
|
||||
skeleton.scaleX *= -1;
|
||||
|
||||
src.root.rotation = RadToDeg(calcMatrix.rotationNormalized);
|
||||
}
|
||||
else
|
||||
{
|
||||
// +90 degrees to account for the difference in Spine vs. Phaser rotation
|
||||
src.root.rotation = Wrap(RadToDeg(CounterClockwise(calcMatrix.rotationNormalized)) + 90, 0, 360);
|
||||
}
|
||||
|
||||
if (src.scaleY < 0)
|
||||
{
|
||||
skeleton.scaleY *= -1;
|
||||
|
||||
if (src.scaleX < 0)
|
||||
{
|
||||
src.root.rotation -= (RadToDeg(calcMatrix.rotationNormalized) * 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
src.root.rotation += (RadToDeg(calcMatrix.rotationNormalized) * 2);
|
||||
}
|
||||
}
|
||||
|
||||
if (camera.renderToTexture)
|
||||
{
|
||||
skeleton.y = calcMatrix.ty;
|
||||
skeleton.scaleY *= -1;
|
||||
}
|
||||
|
||||
// Add autoUpdate option
|
||||
skeleton.updateWorldTransform();
|
||||
|
||||
skeletonRenderer.ctx = context;
|
||||
skeletonRenderer.debugRendering = (plugin.drawDebug || src.drawDebug);
|
||||
|
||||
context.save();
|
||||
|
||||
skeletonRenderer.draw(skeleton);
|
||||
|
||||
if (plugin.drawDebug || src.drawDebug)
|
||||
{
|
||||
context.strokeStyle = '#00ff00';
|
||||
context.beginPath();
|
||||
context.moveTo(-1000, 0);
|
||||
context.lineTo(1000, 0);
|
||||
context.moveTo(0, -1000);
|
||||
context.lineTo(0, 1000);
|
||||
context.stroke();
|
||||
}
|
||||
|
||||
context.restore();
|
||||
};
|
||||
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2018 Photon Storm Ltd.
|
||||
* @license {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
|
||||
*/
|
||||
|
||||
var SpineGameObject = require('./SpineGameObject');
|
||||
var GameObjectFactory = require('../../../../src/gameobjects/GameObjectFactory');
|
||||
|
||||
/**
|
||||
* Creates a new Spine Game Object Game Object and adds it to the Scene.
|
||||
*
|
||||
* Note: This method will only be available if the Spine Plugin has been built or loaded into Phaser.
|
||||
*
|
||||
* @method Phaser.GameObjects.GameObjectFactory#spine
|
||||
* @since 3.16.0
|
||||
*
|
||||
* @param {number} x - The horizontal position of this Game Object.
|
||||
* @param {number} y - The vertical position of this Game Object.
|
||||
* @param {string} texture - The key of the Texture this Game Object will use to render with, as stored in the Texture Manager.
|
||||
* @param {(string|integer)} [frame] - An optional frame from the Texture this Game Object is rendering with.
|
||||
*
|
||||
* @return {Phaser.GameObjects.SpineGameObject} The Game Object that was created.
|
||||
*/
|
||||
GameObjectFactory.register('spine', function (x, y, key, animation)
|
||||
{
|
||||
var spine = new SpineGameObject(this.scene, x, y, key, animation);
|
||||
|
||||
this.displayList.add(spine);
|
||||
this.updateList.add(spine);
|
||||
|
||||
return spine;
|
||||
});
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2018 Photon Storm Ltd.
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
|
||||
*/
|
||||
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2018 Photon Storm Ltd.
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
|
||||
*/
|
||||
|
||||
var CounterClockwise = require('../../../../src/math/angle/CounterClockwise');
|
||||
var RadToDeg = require('../../../../src/math/RadToDeg');
|
||||
var Wrap = require('../../../../src/math/Wrap');
|
||||
|
||||
/**
|
||||
* Renders this Game Object with the Canvas Renderer to the given Camera.
|
||||
* Renders this Game Object with the WebGL Renderer to the given Camera.
|
||||
* The object will not render if any of its renderFlags are set or it is being actively filtered out by the Camera.
|
||||
* This method should not be called directly. It is a utility function of the Render module.
|
||||
*
|
||||
* @method Phaser.GameObjects.SpineGameObject#renderCanvas
|
||||
* @since 3.16.0
|
||||
* @method SpineGameObject#renderWebGL
|
||||
* @since 3.19.0
|
||||
* @private
|
||||
*
|
||||
* @param {Phaser.Renderer.Canvas.CanvasRenderer} renderer - A reference to the current active Canvas renderer.
|
||||
* @param {Phaser.GameObjects.SpineGameObject} src - The Game Object being rendered in this call.
|
||||
* @param {Phaser.Renderer.WebGL.WebGLRenderer} renderer - A reference to the current active WebGL renderer.
|
||||
* @param {SpineGameObject} src - The Game Object being rendered in this call.
|
||||
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
|
||||
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
|
||||
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
|
||||
|
@ -25,16 +26,27 @@ var RadToDeg = require('../../../../src/math/RadToDeg');
|
|||
var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
|
||||
{
|
||||
var plugin = src.plugin;
|
||||
var mvp = plugin.mvp;
|
||||
|
||||
var shader = plugin.shader;
|
||||
var batcher = plugin.batcher;
|
||||
var runtime = plugin.runtime;
|
||||
var skeleton = src.skeleton;
|
||||
var skeletonRenderer = plugin.skeletonRenderer;
|
||||
var sceneRenderer = plugin.sceneRenderer;
|
||||
|
||||
if (!skeleton)
|
||||
var GameObjectRenderMask = 15;
|
||||
|
||||
var willRender = !(GameObjectRenderMask !== src.renderFlags || (src.cameraFilter !== 0 && (src.cameraFilter & camera.id)));
|
||||
|
||||
if (!skeleton || !willRender)
|
||||
{
|
||||
// Reset the current type
|
||||
renderer.currentType = '';
|
||||
|
||||
// If there is already a batch running, we need to close it
|
||||
if (!renderer.nextTypeMatch)
|
||||
{
|
||||
// The next object in the display list is not a Spine object, so we end the batch
|
||||
sceneRenderer.end();
|
||||
|
||||
renderer.rebindPipeline(renderer.pipelines.TextureTintPipeline);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -47,8 +59,7 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
|
|||
var spriteMatrix = renderer._tempMatrix2;
|
||||
var calcMatrix = renderer._tempMatrix3;
|
||||
|
||||
// - 90 degrees to account for the difference in Spine vs. Phaser rotation
|
||||
spriteMatrix.applyITRS(src.x, src.y, src.rotation - 1.5707963267948966, src.scaleX, src.scaleY);
|
||||
spriteMatrix.applyITRS(src.x, src.y, src.rotation, Math.abs(src.scaleX), Math.abs(src.scaleY));
|
||||
|
||||
camMatrix.copyFrom(camera.matrix);
|
||||
|
||||
|
@ -73,82 +84,79 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
|
|||
camMatrix.multiply(spriteMatrix, calcMatrix);
|
||||
}
|
||||
|
||||
var width = renderer.width;
|
||||
var height = renderer.height;
|
||||
var viewportHeight = renderer.height;
|
||||
|
||||
skeleton.x = calcMatrix.tx;
|
||||
skeleton.y = viewportHeight - calcMatrix.ty;
|
||||
|
||||
skeleton.scaleX = calcMatrix.scaleX;
|
||||
skeleton.scaleY = calcMatrix.scaleY;
|
||||
|
||||
if (src.scaleX < 0)
|
||||
{
|
||||
skeleton.scaleX *= -1;
|
||||
|
||||
src.root.rotation = RadToDeg(calcMatrix.rotationNormalized);
|
||||
}
|
||||
else
|
||||
{
|
||||
// +90 degrees to account for the difference in Spine vs. Phaser rotation
|
||||
src.root.rotation = Wrap(RadToDeg(CounterClockwise(calcMatrix.rotationNormalized)) + 90, 0, 360);
|
||||
}
|
||||
|
||||
if (src.scaleY < 0)
|
||||
{
|
||||
skeleton.scaleY *= -1;
|
||||
|
||||
if (src.scaleX < 0)
|
||||
{
|
||||
src.root.rotation -= (RadToDeg(calcMatrix.rotationNormalized) * 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
src.root.rotation += (RadToDeg(calcMatrix.rotationNormalized) * 2);
|
||||
}
|
||||
}
|
||||
|
||||
if (camera.renderToTexture)
|
||||
{
|
||||
skeleton.y = calcMatrix.ty;
|
||||
skeleton.scaleY = calcMatrix.scaleY * -1;
|
||||
skeleton.scaleY *= -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
skeleton.y = height - calcMatrix.ty;
|
||||
skeleton.scaleY = calcMatrix.scaleY;
|
||||
}
|
||||
|
||||
src.root.rotation = RadToDeg(CounterClockwise(calcMatrix.rotation));
|
||||
|
||||
// Add autoUpdate option
|
||||
skeleton.updateWorldTransform();
|
||||
|
||||
if (renderer.newType)
|
||||
{
|
||||
mvp.ortho(0, width, 0, height, 0, 1);
|
||||
|
||||
shader.bind();
|
||||
shader.setUniformi(runtime.Shader.SAMPLER, 0);
|
||||
shader.setUniform4x4f(runtime.Shader.MVP_MATRIX, mvp.val);
|
||||
|
||||
batcher.begin(shader);
|
||||
|
||||
skeletonRenderer.premultipliedAlpha = true;
|
||||
}
|
||||
|
||||
if (renderer.nextTypeMatch)
|
||||
{
|
||||
batcher.isDrawing = false;
|
||||
sceneRenderer.begin();
|
||||
}
|
||||
|
||||
// Draw the current skeleton
|
||||
skeletonRenderer.draw(batcher, skeleton);
|
||||
sceneRenderer.drawSkeleton(skeleton, src.preMultipliedAlpha);
|
||||
|
||||
if (plugin.drawDebug || src.drawDebug)
|
||||
{
|
||||
// Because if we don't, the bones render positions are completely wrong (*sigh*)
|
||||
var oldX = skeleton.x;
|
||||
var oldY = skeleton.y;
|
||||
|
||||
skeleton.x = 0;
|
||||
skeleton.y = 0;
|
||||
|
||||
sceneRenderer.drawSkeletonDebug(skeleton, src.preMultipliedAlpha);
|
||||
|
||||
skeleton.x = oldX;
|
||||
skeleton.y = oldY;
|
||||
}
|
||||
|
||||
if (!renderer.nextTypeMatch)
|
||||
{
|
||||
// The next object in the display list is not a Spine object, so we end the batch
|
||||
batcher.isDrawing = true;
|
||||
|
||||
batcher.end();
|
||||
|
||||
shader.unbind();
|
||||
sceneRenderer.end();
|
||||
|
||||
renderer.rebindPipeline(renderer.pipelines.TextureTintPipeline);
|
||||
}
|
||||
|
||||
/*
|
||||
var drawDebug = (plugin.drawDebug || src.drawDebug);
|
||||
|
||||
if (drawDebug)
|
||||
{
|
||||
var debugShader = plugin.debugShader;
|
||||
var debugRenderer = plugin.debugRenderer;
|
||||
var shapes = plugin.shapes;
|
||||
|
||||
debugShader.bind();
|
||||
debugShader.setUniform4x4f(runtime.Shader.MVP_MATRIX, mvp.val);
|
||||
|
||||
shapes.begin(debugShader);
|
||||
|
||||
debugRenderer.draw(shapes, skeleton);
|
||||
|
||||
shapes.end();
|
||||
|
||||
debugShader.unbind();
|
||||
}
|
||||
*/
|
||||
};
|
||||
|
||||
module.exports = SpineGameObjectWebGLRenderer;
|
||||
|
|
File diff suppressed because one or more lines are too long
1
plugins/spine/src/runtimes/spine-both.js.map
Normal file
1
plugins/spine/src/runtimes/spine-both.js.map
Normal file
File diff suppressed because one or more lines are too long
1
plugins/spine/src/runtimes/spine-canvas.js.map
Normal file
1
plugins/spine/src/runtimes/spine-canvas.js.map
Normal file
File diff suppressed because one or more lines are too long
1
plugins/spine/src/runtimes/spine-webgl.js.map
Normal file
1
plugins/spine/src/runtimes/spine-webgl.js.map
Normal file
File diff suppressed because one or more lines are too long
|
@ -1,8 +1,8 @@
|
|||
'use strict';
|
||||
|
||||
const webpack = require('webpack');
|
||||
const CleanWebpackPlugin = require('clean-webpack-plugin');
|
||||
const exec = require('child_process').exec;
|
||||
const RemovePlugin = require('remove-files-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
mode: 'development',
|
||||
|
@ -10,14 +10,14 @@ module.exports = {
|
|||
context: `${__dirname}/src/`,
|
||||
|
||||
entry: {
|
||||
'SpinePlugin': './SpinePlugin.js'
|
||||
'SpinePluginDebug': './SpinePlugin.js'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: `${__dirname}/dist/`,
|
||||
filename: '[name].js',
|
||||
library: 'SpinePlugin',
|
||||
libraryTarget: 'umd',
|
||||
libraryTarget: 'window',
|
||||
sourceMapFilename: '[file].map',
|
||||
devtoolModuleFilenameTemplate: 'webpack:///[resource-path]', // string
|
||||
devtoolFallbackModuleFilenameTemplate: 'webpack:///[resource-path]?[hash]', // string
|
||||
|
@ -45,22 +45,17 @@ module.exports = {
|
|||
}
|
||||
},
|
||||
|
||||
/*
|
||||
resolve: {
|
||||
alias: {
|
||||
'SpineWebGL': './runtimes/spine-all.js',
|
||||
'SpineCanvas': './runtimes/spine-all.js',
|
||||
'SpineAuto': './runtimes/spine-all.js'
|
||||
}
|
||||
},
|
||||
*/
|
||||
|
||||
plugins: [
|
||||
new webpack.DefinePlugin({
|
||||
"typeof CANVAS_RENDERER": JSON.stringify(true),
|
||||
"typeof WEBGL_RENDERER": JSON.stringify(true)
|
||||
}),
|
||||
new CleanWebpackPlugin([ 'dist' ]),
|
||||
new RemovePlugin({
|
||||
before: {
|
||||
root: './plugins/spine/dist/',
|
||||
include: [ 'SpinePluginDebug.js', 'SpinePluginDebug.js.map' ]
|
||||
}
|
||||
}),
|
||||
{
|
||||
apply: (compiler) => {
|
||||
compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
const webpack = require('webpack');
|
||||
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
|
||||
const CleanWebpackPlugin = require('clean-webpack-plugin');
|
||||
const exec = require('child_process').exec;
|
||||
const RemovePlugin = require('remove-files-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
mode: 'production',
|
||||
|
@ -11,19 +11,15 @@ module.exports = {
|
|||
context: `${__dirname}/src/`,
|
||||
|
||||
entry: {
|
||||
'SpinePlugin': './SpineWebGLPlugin.js',
|
||||
'SpinePlugin.min': './SpineWebGLPlugin.js'
|
||||
'SpinePlugin': './SpinePlugin.js',
|
||||
'SpinePlugin.min': './SpinePlugin.js'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: `${__dirname}/dist/`,
|
||||
filename: '[name].js',
|
||||
library: 'SpinePlugin',
|
||||
libraryTarget: 'umd',
|
||||
sourceMapFilename: '[file].map',
|
||||
devtoolModuleFilenameTemplate: 'webpack:///[resource-path]', // string
|
||||
devtoolFallbackModuleFilenameTemplate: 'webpack:///[resource-path]?[hash]', // string
|
||||
umdNamedDefine: true
|
||||
libraryTarget: 'window'
|
||||
},
|
||||
|
||||
performance: { hints: false },
|
||||
|
@ -31,19 +27,11 @@ module.exports = {
|
|||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
test: require.resolve('./src/runtimes/spine-both.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'exports-loader?spine'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
test: require.resolve('./src/runtimes/spine-both.js'),
|
||||
use: 'exports-loader?spine'
|
||||
}
|
||||
]
|
||||
|
@ -51,8 +39,7 @@ module.exports = {
|
|||
|
||||
resolve: {
|
||||
alias: {
|
||||
'SpineCanvas': './runtimes/spine-canvas.js',
|
||||
'SpineWebGL': './runtimes/spine-webgl.js'
|
||||
'Spine': './runtimes/spine-both.js'
|
||||
},
|
||||
},
|
||||
|
||||
|
@ -79,7 +66,12 @@ module.exports = {
|
|||
"typeof CANVAS_RENDERER": JSON.stringify(true),
|
||||
"typeof WEBGL_RENDERER": JSON.stringify(true)
|
||||
}),
|
||||
new CleanWebpackPlugin([ 'dist' ]),
|
||||
new RemovePlugin({
|
||||
before: {
|
||||
root: './plugins/spine/dist/',
|
||||
include: [ 'SpinePlugin.js', 'SpinePlugin.min.js' ]
|
||||
}
|
||||
}),
|
||||
{
|
||||
apply: (compiler) => {
|
||||
compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
'use strict';
|
||||
|
||||
const webpack = require('webpack');
|
||||
const CleanWebpackPlugin = require('clean-webpack-plugin');
|
||||
const exec = require('child_process').exec;
|
||||
const RemovePlugin = require('remove-files-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
mode: 'development',
|
||||
|
@ -10,14 +10,14 @@ module.exports = {
|
|||
context: `${__dirname}/src/`,
|
||||
|
||||
entry: {
|
||||
'SpineCanvasPlugin': './SpineCanvasPlugin.js'
|
||||
'SpineCanvasPluginDebug': './SpinePlugin.js'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: `${__dirname}/dist/`,
|
||||
filename: '[name].js',
|
||||
library: 'SpineCanvasPlugin',
|
||||
libraryTarget: 'umd',
|
||||
library: 'SpinePlugin',
|
||||
libraryTarget: 'window',
|
||||
sourceMapFilename: '[file].map',
|
||||
devtoolModuleFilenameTemplate: 'webpack:///[resource-path]', // string
|
||||
devtoolFallbackModuleFilenameTemplate: 'webpack:///[resource-path]?[hash]', // string
|
||||
|
@ -35,23 +35,14 @@ module.exports = {
|
|||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'exports-loader?spine'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'exports-loader?spine'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
resolve: {
|
||||
alias: {
|
||||
'SpineCanvas': './runtimes/spine-canvas.js',
|
||||
'SpineWebGL': './runtimes/spine-webgl.js'
|
||||
},
|
||||
'Spine': './runtimes/spine-canvas.js'
|
||||
}
|
||||
},
|
||||
|
||||
plugins: [
|
||||
|
@ -59,7 +50,14 @@ module.exports = {
|
|||
"typeof CANVAS_RENDERER": JSON.stringify(true),
|
||||
"typeof WEBGL_RENDERER": JSON.stringify(false)
|
||||
}),
|
||||
new CleanWebpackPlugin([ 'dist' ]),
|
||||
new RemovePlugin({
|
||||
before: {
|
||||
before: {
|
||||
root: './plugins/spine/dist/',
|
||||
include: [ 'SpineCanvasPluginDebug.js', 'SpineCanvasPluginDebug.js.map' ]
|
||||
}
|
||||
}
|
||||
}),
|
||||
{
|
||||
apply: (compiler) => {
|
||||
compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
const webpack = require('webpack');
|
||||
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
|
||||
const CleanWebpackPlugin = require('clean-webpack-plugin');
|
||||
const exec = require('child_process').exec;
|
||||
const RemovePlugin = require('remove-files-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
mode: 'production',
|
||||
|
@ -11,19 +11,15 @@ module.exports = {
|
|||
context: `${__dirname}/src/`,
|
||||
|
||||
entry: {
|
||||
'SpineCanvasPlugin': './SpineCanvasPlugin.js',
|
||||
'SpineCanvasPlugin.min': './SpineCanvasPlugin.js'
|
||||
'SpineCanvasPlugin': './SpinePlugin.js',
|
||||
'SpineCanvasPlugin.min': './SpinePlugin.js'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: `${__dirname}/dist/`,
|
||||
filename: '[name].js',
|
||||
library: 'SpineCanvasPlugin',
|
||||
libraryTarget: 'umd',
|
||||
sourceMapFilename: '[file].map',
|
||||
devtoolModuleFilenameTemplate: 'webpack:///[resource-path]', // string
|
||||
devtoolFallbackModuleFilenameTemplate: 'webpack:///[resource-path]?[hash]', // string
|
||||
umdNamedDefine: true
|
||||
library: 'SpinePlugin',
|
||||
libraryTarget: 'window'
|
||||
},
|
||||
|
||||
performance: { hints: false },
|
||||
|
@ -37,23 +33,14 @@ module.exports = {
|
|||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'exports-loader?spine'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'exports-loader?spine'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
resolve: {
|
||||
alias: {
|
||||
'SpineCanvas': './runtimes/spine-canvas.js',
|
||||
'SpineWebGL': './runtimes/spine-webgl.js'
|
||||
},
|
||||
'Spine': './runtimes/spine-canvas.js'
|
||||
}
|
||||
},
|
||||
|
||||
optimization: {
|
||||
|
@ -79,7 +66,14 @@ module.exports = {
|
|||
"typeof CANVAS_RENDERER": JSON.stringify(true),
|
||||
"typeof WEBGL_RENDERER": JSON.stringify(false)
|
||||
}),
|
||||
new CleanWebpackPlugin([ 'dist' ]),
|
||||
new RemovePlugin({
|
||||
before: {
|
||||
before: {
|
||||
root: './plugins/spine/dist/',
|
||||
include: [ 'SpineCanvasPlugin.js', 'SpineCanvasPlugin.min.js' ]
|
||||
}
|
||||
}
|
||||
}),
|
||||
{
|
||||
apply: (compiler) => {
|
||||
compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
'use strict';
|
||||
|
||||
const webpack = require('webpack');
|
||||
const CleanWebpackPlugin = require('clean-webpack-plugin');
|
||||
const exec = require('child_process').exec;
|
||||
const RemovePlugin = require('remove-files-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
mode: 'development',
|
||||
|
@ -10,14 +10,14 @@ module.exports = {
|
|||
context: `${__dirname}/src/`,
|
||||
|
||||
entry: {
|
||||
'SpineWebGLPlugin': './SpineWebGLPlugin.js'
|
||||
'SpineWebGLPluginDebug': './SpinePlugin.js'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: `${__dirname}/dist/`,
|
||||
filename: '[name].js',
|
||||
library: 'SpineWebGLPlugin',
|
||||
libraryTarget: 'umd',
|
||||
library: 'SpinePlugin',
|
||||
libraryTarget: 'window',
|
||||
sourceMapFilename: '[file].map',
|
||||
devtoolModuleFilenameTemplate: 'webpack:///[resource-path]', // string
|
||||
devtoolFallbackModuleFilenameTemplate: 'webpack:///[resource-path]?[hash]', // string
|
||||
|
@ -28,14 +28,6 @@ module.exports = {
|
|||
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'exports-loader?spine'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
|
@ -49,8 +41,7 @@ module.exports = {
|
|||
|
||||
resolve: {
|
||||
alias: {
|
||||
'SpineCanvas': './runtimes/spine-canvas.js',
|
||||
'SpineWebGL': './runtimes/spine-webgl.js'
|
||||
'Spine': './runtimes/spine-webgl.js'
|
||||
},
|
||||
},
|
||||
|
||||
|
@ -59,7 +50,14 @@ module.exports = {
|
|||
"typeof CANVAS_RENDERER": JSON.stringify(false),
|
||||
"typeof WEBGL_RENDERER": JSON.stringify(true)
|
||||
}),
|
||||
new CleanWebpackPlugin([ 'dist' ]),
|
||||
new RemovePlugin({
|
||||
before: {
|
||||
before: {
|
||||
root: './plugins/spine/dist/',
|
||||
include: [ 'SpineWebGLPluginDebug.js', 'SpineWebGLPluginDebug.js.map' ]
|
||||
}
|
||||
}
|
||||
}),
|
||||
{
|
||||
apply: (compiler) => {
|
||||
compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
const webpack = require('webpack');
|
||||
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
|
||||
const CleanWebpackPlugin = require('clean-webpack-plugin');
|
||||
const exec = require('child_process').exec;
|
||||
const RemovePlugin = require('remove-files-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
mode: 'production',
|
||||
|
@ -11,33 +11,21 @@ module.exports = {
|
|||
context: `${__dirname}/src/`,
|
||||
|
||||
entry: {
|
||||
'SpineWebGLPlugin': './SpineWebGLPlugin.js',
|
||||
'SpineWebGLPlugin.min': './SpineWebGLPlugin.js'
|
||||
'SpineWebGLPlugin': './SpinePlugin.js',
|
||||
'SpineWebGLPlugin.min': './SpinePlugin.js'
|
||||
},
|
||||
|
||||
output: {
|
||||
path: `${__dirname}/dist/`,
|
||||
filename: '[name].js',
|
||||
library: 'SpineWebGLPlugin',
|
||||
libraryTarget: 'umd',
|
||||
sourceMapFilename: '[file].map',
|
||||
devtoolModuleFilenameTemplate: 'webpack:///[resource-path]', // string
|
||||
devtoolFallbackModuleFilenameTemplate: 'webpack:///[resource-path]?[hash]', // string
|
||||
umdNamedDefine: true
|
||||
library: 'SpinePlugin',
|
||||
libraryTarget: 'window'
|
||||
},
|
||||
|
||||
performance: { hints: false },
|
||||
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-canvas.js'),
|
||||
use: 'exports-loader?spine'
|
||||
},
|
||||
{
|
||||
test: require.resolve('./src/runtimes/spine-webgl.js'),
|
||||
use: 'imports-loader?this=>window'
|
||||
|
@ -51,9 +39,8 @@ module.exports = {
|
|||
|
||||
resolve: {
|
||||
alias: {
|
||||
'SpineCanvas': './runtimes/spine-canvas.js',
|
||||
'SpineWebGL': './runtimes/spine-webgl.js'
|
||||
},
|
||||
'Spine': './runtimes/spine-webgl.js'
|
||||
}
|
||||
},
|
||||
|
||||
optimization: {
|
||||
|
@ -79,7 +66,14 @@ module.exports = {
|
|||
"typeof CANVAS_RENDERER": JSON.stringify(false),
|
||||
"typeof WEBGL_RENDERER": JSON.stringify(true)
|
||||
}),
|
||||
new CleanWebpackPlugin([ 'dist' ]),
|
||||
new RemovePlugin({
|
||||
before: {
|
||||
before: {
|
||||
root: './plugins/spine/dist/',
|
||||
include: [ 'SpineWebGLPlugin.js', 'SpineWebGLPlugin.min.js' ]
|
||||
}
|
||||
}
|
||||
}),
|
||||
{
|
||||
apply: (compiler) => {
|
||||
compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
|
||||
|
|
|
@ -620,7 +620,7 @@ var Camera = new Class({
|
|||
* @since 3.0.0
|
||||
*
|
||||
* @param {integer} [duration=100] - The duration of the effect in milliseconds.
|
||||
* @param {number} [intensity=0.05] - The intensity of the shake.
|
||||
* @param {(number|Phaser.Math.Vector2)} [intensity=0.05] - The intensity of the shake.
|
||||
* @param {boolean} [force=false] - Force the shake effect to start immediately, even if already running.
|
||||
* @param {function} [callback] - This callback will be invoked every frame for the duration of the effect.
|
||||
* It is sent two arguments: A reference to the camera and a progress amount between 0 and 1 indicating how complete the effect is.
|
||||
|
|
|
@ -149,7 +149,7 @@ var Shake = new Class({
|
|||
* @since 3.5.0
|
||||
*
|
||||
* @param {integer} [duration=100] - The duration of the effect in milliseconds.
|
||||
* @param {number} [intensity=0.05] - The intensity of the shake.
|
||||
* @param {(number|Phaser.Math.Vector2)} [intensity=0.05] - The intensity of the shake.
|
||||
* @param {boolean} [force=false] - Force the shake effect to start immediately, even if already running.
|
||||
* @param {Phaser.Types.Cameras.Scene2D.CameraShakeCallback} [callback] - This callback will be invoked every frame for the duration of the effect.
|
||||
* It is sent two arguments: A reference to the camera and a progress amount between 0 and 1 indicating how complete the effect is.
|
||||
|
|
|
@ -20,7 +20,7 @@ var CONST = {
|
|||
* @type {string}
|
||||
* @since 3.0.0
|
||||
*/
|
||||
VERSION: '3.19.0-beta1',
|
||||
VERSION: '3.20.0-beta1',
|
||||
|
||||
BlendModes: require('./renderer/BlendModes'),
|
||||
|
||||
|
|
|
@ -337,6 +337,11 @@ var Config = new Class({
|
|||
*/
|
||||
this.antialias = GetValue(renderConfig, 'antialias', true);
|
||||
|
||||
/**
|
||||
* @const {boolean} Phaser.Core.Config#antialiasGL - Sets the `antialias` property when the WebGL context is created. Setting this value does not impact any subsequent textures that are created, or the canvas style attributes.
|
||||
*/
|
||||
this.antialiasGL = GetValue(renderConfig, 'antialiasGL', true);
|
||||
|
||||
/**
|
||||
* @const {boolean} Phaser.Core.Config#desynchronized - When set to `true` it will create a desynchronized context for both 2D and WebGL. See https://developers.google.com/web/updates/2019/05/desynchronized for details.
|
||||
*/
|
||||
|
|
|
@ -248,7 +248,7 @@ var Game = new Class({
|
|||
* You can disable the inclusion of the Sound Manager in your build by toggling the webpack `FEATURE_SOUND` flag.
|
||||
*
|
||||
* @name Phaser.Game#sound
|
||||
* @type {Phaser.Sound.BaseSoundManager}
|
||||
* @type {(Phaser.Sound.NoAudioSoundManager|Phaser.Sound.HTML5AudioSoundManager|Phaser.Sound.WebAudioSoundManager)}
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.sound = null;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
* @since 3.0.0
|
||||
*
|
||||
* @property {boolean} [antialias=true] - When set to `true`, WebGL uses linear interpolation to draw scaled or rotated textures, giving a smooth appearance. When set to `false`, WebGL uses nearest-neighbor interpolation, giving a crisper appearance. `false` also disables antialiasing of the game canvas itself, if the browser supports it, when the game canvas is scaled.
|
||||
* @property {boolean} [antialiasGL=true] - Sets the `antialias` property when the WebGL context is created. Setting this value does not impact any subsequent textures that are created, or the canvas style attributes.
|
||||
* @property {boolean} [desynchronized=false] - When set to `true` it will create a desynchronized context for both 2D and WebGL. See https://developers.google.com/web/updates/2019/05/desynchronized for details.
|
||||
* @property {boolean} [pixelArt=false] - Sets `antialias` and `roundPixels` to true. This is the best setting for pixel-art games.
|
||||
* @property {boolean} [roundPixels=false] - Draw texture-based Game Objects at only whole-integer positions. Game Objects without textures, like Graphics, ignore this property.
|
||||
|
|
|
@ -18,7 +18,7 @@ var CreateDOMContainer = function (game)
|
|||
// DOM Element Container
|
||||
var div = document.createElement('div');
|
||||
|
||||
div.style = [
|
||||
div.style.cssText = [
|
||||
'display: block;',
|
||||
'width: ' + game.scale.width + 'px;',
|
||||
'height: ' + game.scale.height + 'px;',
|
||||
|
|
|
@ -65,7 +65,7 @@ var Size = {
|
|||
|
||||
get: function ()
|
||||
{
|
||||
return this.scaleX * this.frame.realWidth;
|
||||
return Math.abs(this.scaleX * this.frame.realWidth);
|
||||
},
|
||||
|
||||
set: function (value)
|
||||
|
@ -90,7 +90,7 @@ var Size = {
|
|||
|
||||
get: function ()
|
||||
{
|
||||
return this.scaleY * this.frame.realHeight;
|
||||
return Math.abs(this.scaleY * this.frame.realHeight);
|
||||
},
|
||||
|
||||
set: function (value)
|
||||
|
|
|
@ -296,6 +296,7 @@ var Tint = {
|
|||
|
||||
/**
|
||||
* The tint value being applied to the whole of the Game Object.
|
||||
* This property is a setter-only. Use the properties `tintTopLeft` etc to read the current tint value.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.Tint#tint
|
||||
* @type {integer}
|
||||
|
|
|
@ -195,8 +195,9 @@ var Transform = {
|
|||
|
||||
/**
|
||||
* The angle of this Game Object as expressed in degrees.
|
||||
*
|
||||
* Where 0 is to the right, 90 is down, 180 is left.
|
||||
*
|
||||
* Phaser uses a right-hand clockwise rotation system, where 0 is right, 90 is down, 180/-180 is left
|
||||
* and -90 is up.
|
||||
*
|
||||
* If you prefer to work in radians, see the `rotation` property instead.
|
||||
*
|
||||
|
@ -221,6 +222,9 @@ var Transform = {
|
|||
|
||||
/**
|
||||
* The angle of this Game Object in radians.
|
||||
*
|
||||
* Phaser uses a right-hand clockwise rotation system, where 0 is right, 90 is down, 180/-180 is left
|
||||
* and -90 is up.
|
||||
*
|
||||
* If you prefer to work in degrees, see the `angle` property instead.
|
||||
*
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
var Class = require('../../utils/Class');
|
||||
var MATH_CONST = require('../../math/const');
|
||||
var Vector2 = require('../../math/Vector2');
|
||||
|
||||
/**
|
||||
|
@ -25,8 +26,8 @@ var Vector2 = require('../../math/Vector2');
|
|||
* @since 3.0.0
|
||||
*
|
||||
* @param {number} [a=1] - The Scale X value.
|
||||
* @param {number} [b=0] - The Shear Y value.
|
||||
* @param {number} [c=0] - The Shear X value.
|
||||
* @param {number} [b=0] - The Skew Y value.
|
||||
* @param {number} [c=0] - The Skew X value.
|
||||
* @param {number} [d=1] - The Scale Y value.
|
||||
* @param {number} [tx=0] - The Translate X value.
|
||||
* @param {number} [ty=0] - The Translate Y value.
|
||||
|
@ -91,7 +92,7 @@ var TransformMatrix = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* The Shear Y value.
|
||||
* The Skew Y value.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.TransformMatrix#b
|
||||
* @type {number}
|
||||
|
@ -112,7 +113,7 @@ var TransformMatrix = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* The Shear X value.
|
||||
* The Skew X value.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.TransformMatrix#c
|
||||
* @type {number}
|
||||
|
@ -238,7 +239,7 @@ var TransformMatrix = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* The rotation of the Matrix.
|
||||
* The rotation of the Matrix. Value is in radians.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.TransformMatrix#rotation
|
||||
* @type {number}
|
||||
|
@ -249,13 +250,53 @@ var TransformMatrix = new Class({
|
|||
|
||||
get: function ()
|
||||
{
|
||||
return Math.acos(this.a / this.scaleX) * (Math.atan(-this.c / this.a) < 0 ? -1 : 1);
|
||||
return Math.acos(this.a / this.scaleX) * ((Math.atan(-this.c / this.a) < 0) ? -1 : 1);
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* The horizontal scale of the Matrix.
|
||||
* The rotation of the Matrix, normalized to be within the Phaser right-handed
|
||||
* clockwise rotation space. Value is in radians.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.TransformMatrix#rotationNormalized
|
||||
* @type {number}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
rotationNormalized: {
|
||||
|
||||
get: function ()
|
||||
{
|
||||
var matrix = this.matrix;
|
||||
|
||||
var a = matrix[0];
|
||||
var b = matrix[1];
|
||||
var c = matrix[2];
|
||||
var d = matrix[3];
|
||||
|
||||
if (a || b)
|
||||
{
|
||||
// var r = Math.sqrt(a * a + b * b);
|
||||
|
||||
return (b > 0) ? Math.acos(a / this.scaleX) : -Math.acos(a / this.scaleX);
|
||||
}
|
||||
else if (c || d)
|
||||
{
|
||||
// var s = Math.sqrt(c * c + d * d);
|
||||
|
||||
return MATH_CONST.TAU - ((d > 0) ? Math.acos(-c / this.scaleY) : -Math.acos(c / this.scaleY));
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* The decomposed horizontal scale of the Matrix. This value is always positive.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.TransformMatrix#scaleX
|
||||
* @type {number}
|
||||
|
@ -266,13 +307,13 @@ var TransformMatrix = new Class({
|
|||
|
||||
get: function ()
|
||||
{
|
||||
return Math.sqrt((this.a * this.a) + (this.c * this.c));
|
||||
return Math.sqrt((this.a * this.a) + (this.b * this.b));
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* The vertical scale of the Matrix.
|
||||
* The decomposed vertical scale of the Matrix. This value is always positive.
|
||||
*
|
||||
* @name Phaser.GameObjects.Components.TransformMatrix#scaleY
|
||||
* @type {number}
|
||||
|
@ -283,7 +324,7 @@ var TransformMatrix = new Class({
|
|||
|
||||
get: function ()
|
||||
{
|
||||
return Math.sqrt((this.b * this.b) + (this.d * this.d));
|
||||
return Math.sqrt((this.c * this.c) + (this.d * this.d));
|
||||
}
|
||||
|
||||
},
|
||||
|
|
|
@ -65,7 +65,7 @@ var ContainerCanvasRenderer = function (renderer, container, interpolationPercen
|
|||
continue;
|
||||
}
|
||||
|
||||
var childAlpha = child._alpha;
|
||||
var childAlpha = child.alpha;
|
||||
var childBlendMode = child._blendMode;
|
||||
var childScrollFactorX = child.scrollFactorX;
|
||||
var childScrollFactorY = child.scrollFactorY;
|
||||
|
|
|
@ -65,7 +65,7 @@ var ContainerWebGLRenderer = function (renderer, container, interpolationPercent
|
|||
continue;
|
||||
}
|
||||
|
||||
var childAlpha = child._alpha;
|
||||
var childAlpha = child.alpha;
|
||||
var childScrollFactorX = child.scrollFactorX;
|
||||
var childScrollFactorY = child.scrollFactorY;
|
||||
|
||||
|
|
|
@ -349,7 +349,10 @@ var RenderTexture = new Class({
|
|||
|
||||
this.canvas.width = width;
|
||||
this.canvas.height = height;
|
||||
|
||||
|
||||
this.texture.width = width;
|
||||
this.texture.height = height;
|
||||
|
||||
if (this.gl)
|
||||
{
|
||||
var gl = this.gl;
|
||||
|
|
|
@ -345,16 +345,6 @@ var Shader = new Class({
|
|||
*/
|
||||
this.texture = null;
|
||||
|
||||
/**
|
||||
* Internal saved texture key.
|
||||
*
|
||||
* @name Phaser.GameObjects.Shader#_savedKey
|
||||
* @type {boolean}
|
||||
* @private
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this._savedKey = '';
|
||||
|
||||
this.setPosition(x, y);
|
||||
this.setSize(width, height);
|
||||
this.setOrigin(0.5, 0.5);
|
||||
|
@ -448,12 +438,24 @@ var Shader = new Class({
|
|||
|
||||
if (key)
|
||||
{
|
||||
this._savedKey = key;
|
||||
|
||||
this.texture = this.scene.sys.textures.addGLTexture(key, this.glTexture, width, height);
|
||||
}
|
||||
}
|
||||
|
||||
// And now render at least once, so our texture isn't blank on the first update
|
||||
|
||||
if (this.shader)
|
||||
{
|
||||
var pipeline = renderer.currentPipeline;
|
||||
|
||||
renderer.clearPipeline();
|
||||
|
||||
this.load();
|
||||
this.flush();
|
||||
|
||||
renderer.rebindPipeline(pipeline);
|
||||
}
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
|
@ -792,7 +794,7 @@ var Shader = new Class({
|
|||
*
|
||||
* @param {string} key - The key of the uniform to return the value for.
|
||||
*
|
||||
* @return {this} This Shader instance.
|
||||
* @return {any} A reference to the uniform object. This is not a copy, so modifying it will update the original object also.
|
||||
*/
|
||||
getUniform: function (key)
|
||||
{
|
||||
|
|
|
@ -8,6 +8,7 @@ var Class = require('../../utils/Class');
|
|||
var Contains = require('./Contains');
|
||||
var GetPoint = require('./GetPoint');
|
||||
var GetPoints = require('./GetPoints');
|
||||
var GEOM_CONST = require('../const');
|
||||
var Random = require('./Random');
|
||||
|
||||
/**
|
||||
|
@ -37,6 +38,17 @@ var Circle = new Class({
|
|||
if (y === undefined) { y = 0; }
|
||||
if (radius === undefined) { radius = 0; }
|
||||
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.CIRCLE`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Circle#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.CIRCLE;
|
||||
|
||||
/**
|
||||
* The x position of the center of the circle.
|
||||
*
|
||||
|
|
74
src/geom/const.js
Normal file
74
src/geom/const.js
Normal file
|
@ -0,0 +1,74 @@
|
|||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2019 Photon Storm Ltd.
|
||||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
var GEOM_CONST = {
|
||||
|
||||
/**
|
||||
* A Circle Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.CIRCLE
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
CIRCLE: 0,
|
||||
|
||||
/**
|
||||
* An Ellipse Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.ELLIPSE
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
ELLIPSE: 1,
|
||||
|
||||
/**
|
||||
* A Line Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.LINE
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
LINE: 2,
|
||||
|
||||
/**
|
||||
* A Point Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.POINT
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
POINT: 3,
|
||||
|
||||
/**
|
||||
* A Polygon Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.POLYGON
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
POLYGON: 4,
|
||||
|
||||
/**
|
||||
* A Rectangle Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.RECTANGLE
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
RECTANGLE: 5,
|
||||
|
||||
/**
|
||||
* A Triangle Geometry object type.
|
||||
*
|
||||
* @name Phaser.Geom.TRIANGLE
|
||||
* @type {integer}
|
||||
* @since 3.19.0
|
||||
*/
|
||||
TRIANGLE: 6
|
||||
|
||||
};
|
||||
|
||||
module.exports = GEOM_CONST;
|
|
@ -8,6 +8,7 @@ var Class = require('../../utils/Class');
|
|||
var Contains = require('./Contains');
|
||||
var GetPoint = require('./GetPoint');
|
||||
var GetPoints = require('./GetPoints');
|
||||
var GEOM_CONST = require('../const');
|
||||
var Random = require('./Random');
|
||||
|
||||
/**
|
||||
|
@ -39,6 +40,17 @@ var Ellipse = new Class({
|
|||
if (width === undefined) { width = 0; }
|
||||
if (height === undefined) { height = 0; }
|
||||
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.ELLIPSE`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Ellipse#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.ELLIPSE;
|
||||
|
||||
/**
|
||||
* The x position of the center of the ellipse.
|
||||
*
|
||||
|
|
|
@ -4,11 +4,14 @@
|
|||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
var CONST = require('./const');
|
||||
var Extend = require('../utils/object/Extend');
|
||||
|
||||
/**
|
||||
* @namespace Phaser.Geom
|
||||
*/
|
||||
|
||||
module.exports = {
|
||||
var Geom = {
|
||||
|
||||
Circle: require('./circle'),
|
||||
Ellipse: require('./ellipse'),
|
||||
|
@ -20,3 +23,8 @@ module.exports = {
|
|||
Triangle: require('./triangle')
|
||||
|
||||
};
|
||||
|
||||
// Merge in the consts
|
||||
Geom = Extend(false, Geom, CONST);
|
||||
|
||||
module.exports = Geom;
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
var Class = require('../../utils/Class');
|
||||
var GetPoint = require('./GetPoint');
|
||||
var GetPoints = require('./GetPoints');
|
||||
var GEOM_CONST = require('../const');
|
||||
var Random = require('./Random');
|
||||
var Vector2 = require('../../math/Vector2');
|
||||
|
||||
|
@ -35,6 +36,17 @@ var Line = new Class({
|
|||
if (x2 === undefined) { x2 = 0; }
|
||||
if (y2 === undefined) { y2 = 0; }
|
||||
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.LINE`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Line#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.LINE;
|
||||
|
||||
/**
|
||||
* The x coordinate of the lines starting point.
|
||||
*
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
var Class = require('../../utils/Class');
|
||||
var GEOM_CONST = require('../const');
|
||||
|
||||
/**
|
||||
* @classdesc
|
||||
|
@ -27,6 +28,17 @@ var Point = new Class({
|
|||
if (x === undefined) { x = 0; }
|
||||
if (y === undefined) { y = x; }
|
||||
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.POINT`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Point#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.POINT;
|
||||
|
||||
/**
|
||||
* The x coordinate of this Point.
|
||||
*
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
var Class = require('../../utils/Class');
|
||||
var Contains = require('./Contains');
|
||||
var GetPoints = require('./GetPoints');
|
||||
var GEOM_CONST = require('../const');
|
||||
|
||||
/**
|
||||
* @classdesc
|
||||
|
@ -37,6 +38,17 @@ var Polygon = new Class({
|
|||
|
||||
function Polygon (points)
|
||||
{
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.POLYGON`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Polygon#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.POLYGON;
|
||||
|
||||
/**
|
||||
* The area of this Polygon.
|
||||
*
|
||||
|
|
|
@ -8,6 +8,7 @@ var Class = require('../../utils/Class');
|
|||
var Contains = require('./Contains');
|
||||
var GetPoint = require('./GetPoint');
|
||||
var GetPoints = require('./GetPoints');
|
||||
var GEOM_CONST = require('../const');
|
||||
var Line = require('../line/Line');
|
||||
var Random = require('./Random');
|
||||
|
||||
|
@ -36,6 +37,17 @@ var Rectangle = new Class({
|
|||
if (width === undefined) { width = 0; }
|
||||
if (height === undefined) { height = 0; }
|
||||
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.RECTANGLE`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Rectangle#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.RECTANGLE;
|
||||
|
||||
/**
|
||||
* The X coordinate of the top left corner of the Rectangle.
|
||||
*
|
||||
|
|
|
@ -8,6 +8,7 @@ var Class = require('../../utils/Class');
|
|||
var Contains = require('./Contains');
|
||||
var GetPoint = require('./GetPoint');
|
||||
var GetPoints = require('./GetPoints');
|
||||
var GEOM_CONST = require('../const');
|
||||
var Line = require('../line/Line');
|
||||
var Random = require('./Random');
|
||||
|
||||
|
@ -42,6 +43,17 @@ var Triangle = new Class({
|
|||
if (x3 === undefined) { x3 = 0; }
|
||||
if (y3 === undefined) { y3 = 0; }
|
||||
|
||||
/**
|
||||
* The geometry constant type of this object: `GEOM_CONST.TRIANGLE`.
|
||||
* Used for fast type comparisons.
|
||||
*
|
||||
* @name Phaser.Geom.Triangle#type
|
||||
* @type {integer}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this.type = GEOM_CONST.TRIANGLE;
|
||||
|
||||
/**
|
||||
* `x` coordinate of the first point.
|
||||
*
|
||||
|
|
|
@ -37,6 +37,7 @@ var CreateInteractiveObject = function (gameObject, hitArea, hitAreaCallback)
|
|||
|
||||
hitArea: hitArea,
|
||||
hitAreaCallback: hitAreaCallback,
|
||||
hitAreaDebug: null,
|
||||
|
||||
// Has the dev specified their own shape, or is this bound to the texture size?
|
||||
customHitArea: false,
|
||||
|
|
|
@ -458,7 +458,7 @@ var InputManager = new Class({
|
|||
*/
|
||||
resetCursor: function (interactiveObject)
|
||||
{
|
||||
if (interactiveObject.cursor)
|
||||
if (interactiveObject.cursor && this.canvas)
|
||||
{
|
||||
this.canvas.style.cursor = this.defaultCursor;
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ var EllipseContains = require('../geom/ellipse/Contains');
|
|||
var Events = require('./events');
|
||||
var EventEmitter = require('eventemitter3');
|
||||
var GetFastValue = require('../utils/object/GetFastValue');
|
||||
var GEOM_CONST = require('../geom/const');
|
||||
var InputPluginCache = require('./InputPluginCache');
|
||||
var IsPlainObject = require('../utils/object/IsPlainObject');
|
||||
var PluginCache = require('../plugins/PluginCache');
|
||||
|
@ -1327,6 +1328,9 @@ var InputPlugin = new Class({
|
|||
var dxRotated = dx * Math.cos(rotation) + dy * Math.sin(rotation);
|
||||
var dyRotated = dy * Math.cos(rotation) - dx * Math.sin(rotation);
|
||||
|
||||
dxRotated *= (1 / gameObject.parentContainer.scaleX);
|
||||
dyRotated *= (1 / gameObject.parentContainer.scaleY);
|
||||
|
||||
dragX = dxRotated + input.dragStartX;
|
||||
dragY = dyRotated + input.dragStartY;
|
||||
}
|
||||
|
@ -2340,6 +2344,145 @@ var InputPlugin = new Class({
|
|||
return this.setHitArea(gameObjects, shape, callback);
|
||||
},
|
||||
|
||||
/**
|
||||
* Creates an Input Debug Shape for the given Game Object.
|
||||
*
|
||||
* The Game Object must have _already_ been enabled for input prior to calling this method.
|
||||
*
|
||||
* This is intended to assist you during development and debugging.
|
||||
*
|
||||
* Debug Shapes can only be created for Game Objects that are using standard Phaser Geometry for input,
|
||||
* including: Circle, Ellipse, Line, Polygon, Rectangle and Triangle.
|
||||
*
|
||||
* Game Objects that are using their automatic hit areas are using Rectangles by default, so will also work.
|
||||
*
|
||||
* The Debug Shape is created and added to the display list and is then kept in sync with the Game Object
|
||||
* it is connected with. Should you need to modify it yourself, such as to hide it, you can access it via
|
||||
* the Game Object property: `GameObject.input.hitAreaDebug`.
|
||||
*
|
||||
* Calling this method on a Game Object that already has a Debug Shape will first destroy the old shape,
|
||||
* before creating a new one. If you wish to remove the Debug Shape entirely, you should call the
|
||||
* method `InputPlugin.removeDebug`.
|
||||
*
|
||||
* Note that the debug shape will only show the outline of the input area. If the input test is using a
|
||||
* pixel perfect check, for example, then this is not displayed. If you are using a custom shape, that
|
||||
* doesn't extend one of the base Phaser Geometry objects, as your hit area, then this method will not
|
||||
* work.
|
||||
*
|
||||
* @method Phaser.Input.InputPlugin#enableDebug
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.GameObjects.GameObject} gameObject - The Game Object to create the input debug shape for.
|
||||
* @param {number} [color=0x00ff00] - The outline color of the debug shape.
|
||||
*
|
||||
* @return {Phaser.Input.InputPlugin} This Input Plugin.
|
||||
*/
|
||||
enableDebug: function (gameObject, color)
|
||||
{
|
||||
if (color === undefined) { color = 0x00ff00; }
|
||||
|
||||
var input = gameObject.input;
|
||||
|
||||
if (!input || !input.hitArea)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
var shape = input.hitArea;
|
||||
var shapeType = shape.type;
|
||||
var debug = input.hitAreaDebug;
|
||||
var factory = this.systems.add;
|
||||
var updateList = this.systems.updateList;
|
||||
|
||||
if (debug)
|
||||
{
|
||||
updateList.remove(debug);
|
||||
|
||||
debug.destroy();
|
||||
|
||||
debug = null;
|
||||
}
|
||||
|
||||
switch (shapeType)
|
||||
{
|
||||
case GEOM_CONST.CIRCLE:
|
||||
debug = factory.arc(0, 0, shape.radius);
|
||||
break;
|
||||
|
||||
case GEOM_CONST.ELLIPSE:
|
||||
debug = factory.ellipse(0, 0, shape.width, shape.height);
|
||||
break;
|
||||
|
||||
case GEOM_CONST.LINE:
|
||||
debug = factory.line(0, 0, shape.x1, shape.y1, shape.x2, shape.y2);
|
||||
break;
|
||||
|
||||
case GEOM_CONST.POLYGON:
|
||||
debug = factory.polygon(0, 0, shape.points);
|
||||
break;
|
||||
|
||||
case GEOM_CONST.RECTANGLE:
|
||||
debug = factory.rectangle(0, 0, shape.width, shape.height);
|
||||
break;
|
||||
|
||||
case GEOM_CONST.TRIANGLE:
|
||||
debug = factory.triangle(0, 0, shape.x1, shape.y1, shape.x2, shape.y2, shape.x3, shape.y3);
|
||||
break;
|
||||
}
|
||||
|
||||
if (debug)
|
||||
{
|
||||
debug.isFilled = false;
|
||||
|
||||
debug.preUpdate = function ()
|
||||
{
|
||||
debug.setStrokeStyle(1 / gameObject.scale, color);
|
||||
|
||||
debug.setDisplayOrigin(gameObject.displayOriginX, gameObject.displayOriginY);
|
||||
debug.setRotation(gameObject.rotation);
|
||||
debug.setScale(gameObject.scaleX, gameObject.scaleY);
|
||||
debug.setPosition(gameObject.x, gameObject.y);
|
||||
debug.setScrollFactor(gameObject.scrollFactorX, gameObject.scrollFactorY);
|
||||
};
|
||||
|
||||
updateList.add(debug);
|
||||
|
||||
input.hitAreaDebug = debug;
|
||||
}
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Removes an Input Debug Shape from the given Game Object.
|
||||
*
|
||||
* The shape is destroyed immediately and the `hitAreaDebug` property is set to `null`.
|
||||
*
|
||||
* @method Phaser.Input.InputPlugin#removeDebug
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.GameObjects.GameObject} gameObject - The Game Object to remove the input debug shape from.
|
||||
*
|
||||
* @return {Phaser.Input.InputPlugin} This Input Plugin.
|
||||
*/
|
||||
removeDebug: function (gameObject)
|
||||
{
|
||||
var input = gameObject.input;
|
||||
|
||||
if (input && input.hitAreaDebug)
|
||||
{
|
||||
var debug = input.hitAreaDebug;
|
||||
|
||||
this.systems.updateList.remove(debug);
|
||||
|
||||
debug.destroy();
|
||||
|
||||
input.hitAreaDebug = null;
|
||||
}
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Sets the Pointers to always poll.
|
||||
*
|
||||
|
|
|
@ -259,6 +259,9 @@ var Pointer = new Class({
|
|||
|
||||
/**
|
||||
* The x position of this Pointer, translated into the coordinate space of the most recent Camera it interacted with.
|
||||
*
|
||||
* If you wish to use this value _outside_ of an input event handler then you should update it first by calling
|
||||
* the `Pointer.updateWorldPoint` method.
|
||||
*
|
||||
* @name Phaser.Input.Pointer#worldX
|
||||
* @type {number}
|
||||
|
@ -269,6 +272,9 @@ var Pointer = new Class({
|
|||
|
||||
/**
|
||||
* The y position of this Pointer, translated into the coordinate space of the most recent Camera it interacted with.
|
||||
*
|
||||
* If you wish to use this value _outside_ of an input event handler then you should update it first by calling
|
||||
* the `Pointer.updateWorldPoint` method.
|
||||
*
|
||||
* @name Phaser.Input.Pointer#worldY
|
||||
* @type {number}
|
||||
|
@ -486,6 +492,40 @@ var Pointer = new Class({
|
|||
this.deltaZ = 0;
|
||||
},
|
||||
|
||||
/**
|
||||
* Takes a Camera and updates this Pointer's `worldX` and `worldY` values so they are
|
||||
* the result of a translation through the given Camera.
|
||||
*
|
||||
* Note that the values will be automatically replaced the moment the Pointer is
|
||||
* updated by an input event, such as a mouse move, so should be used immediately.
|
||||
*
|
||||
* @method Phaser.Input.Pointer#updateWorldPoint
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera which is being tested against.
|
||||
*
|
||||
* @return {this} This Pointer object.
|
||||
*/
|
||||
updateWorldPoint: function (camera)
|
||||
{
|
||||
var x = this.x;
|
||||
var y = this.y;
|
||||
|
||||
if (camera.resolution !== 1)
|
||||
{
|
||||
x += camera._x;
|
||||
y += camera._y;
|
||||
}
|
||||
|
||||
// Stores the world point inside of tempPoint
|
||||
var temp = camera.getWorldPoint(x, y);
|
||||
|
||||
this.worldX = temp.x;
|
||||
this.worldY = temp.y;
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Takes a Camera and returns a Vector2 containing the translated position of this Pointer
|
||||
* within that Camera. This can be used to convert this Pointers position into camera space.
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
* @property {Phaser.Cameras.Scene2D.Camera} camera - The most recent Camera to be tested against this Interactive Object.
|
||||
* @property {any} hitArea - The hit area for this Interactive Object. Typically a geometry shape, like a Rectangle or Circle.
|
||||
* @property {Phaser.Types.Input.HitAreaCallback} hitAreaCallback - The 'contains' check callback that the hit area shape will use for all hit tests.
|
||||
* @property {Phaser.GameObjects.Shape} hitAreaDebug - If this Interactive Object has been enabled for debug, via `InputPlugin.enableDebug` then this property holds its debug shape.
|
||||
* @property {boolean} customHitArea - Was the hitArea for this Interactive Object created based on texture size (false), or a custom shape? (true)
|
||||
* @property {number} localX - The x coordinate that the Pointer interacted with this object on, relative to the Game Object's top-left position.
|
||||
* @property {number} localY - The y coordinate that the Pointer interacted with this object on, relative to the Game Object's top-left position.
|
||||
|
|
|
@ -28,6 +28,11 @@ var CONST = require('../const');
|
|||
*/
|
||||
var CounterClockwise = function (angle)
|
||||
{
|
||||
if (angle > Math.PI)
|
||||
{
|
||||
angle -= CONST.PI2;
|
||||
}
|
||||
|
||||
return Math.abs((((angle + CONST.TAU) % CONST.PI2) - CONST.PI2) % CONST.PI2);
|
||||
};
|
||||
|
||||
|
|
|
@ -1060,19 +1060,21 @@ var Body = new Class({
|
|||
var bx = (this.worldBounce) ? -this.worldBounce.x : -this.bounce.x;
|
||||
var by = (this.worldBounce) ? -this.worldBounce.y : -this.bounce.y;
|
||||
|
||||
var wasSet = false;
|
||||
|
||||
if (pos.x < bounds.x && check.left)
|
||||
{
|
||||
pos.x = bounds.x;
|
||||
this.velocity.x *= bx;
|
||||
this.blocked.left = true;
|
||||
this.blocked.none = false;
|
||||
wasSet = true;
|
||||
}
|
||||
else if (this.right > bounds.right && check.right)
|
||||
{
|
||||
pos.x = bounds.right - this.width;
|
||||
this.velocity.x *= bx;
|
||||
this.blocked.right = true;
|
||||
this.blocked.none = false;
|
||||
wasSet = true;
|
||||
}
|
||||
|
||||
if (pos.y < bounds.y && check.up)
|
||||
|
@ -1080,17 +1082,22 @@ var Body = new Class({
|
|||
pos.y = bounds.y;
|
||||
this.velocity.y *= by;
|
||||
this.blocked.up = true;
|
||||
this.blocked.none = false;
|
||||
wasSet = true;
|
||||
}
|
||||
else if (this.bottom > bounds.bottom && check.down)
|
||||
{
|
||||
pos.y = bounds.bottom - this.height;
|
||||
this.velocity.y *= by;
|
||||
this.blocked.down = true;
|
||||
wasSet = true;
|
||||
}
|
||||
|
||||
if (wasSet)
|
||||
{
|
||||
this.blocked.none = false;
|
||||
}
|
||||
|
||||
return !this.blocked.none;
|
||||
return wasSet;
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
|
@ -4,6 +4,10 @@
|
|||
* @license {@link https://opensource.org/licenses/MIT|MIT License}
|
||||
*/
|
||||
|
||||
/**
|
||||
* @namespace Phaser.Physics.Matter.Matter
|
||||
*/
|
||||
|
||||
var Matter = require('./lib/core/Matter');
|
||||
|
||||
Matter.Body = require('./lib/body/Body');
|
||||
|
|
|
@ -17,6 +17,7 @@ module.exports = {
|
|||
PolyDecomp: require('./poly-decomp'),
|
||||
Sprite: require('./MatterSprite'),
|
||||
TileBody: require('./MatterTileBody'),
|
||||
PhysicsEditorParser: require('./PhysicsEditorParser'),
|
||||
World: require('./World')
|
||||
|
||||
};
|
||||
|
|
|
@ -59,7 +59,7 @@ var WebGLRenderer = new Class({
|
|||
alpha: gameConfig.transparent,
|
||||
desynchronized: gameConfig.desynchronized,
|
||||
depth: false,
|
||||
antialias: gameConfig.antialias,
|
||||
antialias: gameConfig.antialiasGL,
|
||||
premultipliedAlpha: gameConfig.premultipliedAlpha,
|
||||
stencil: true,
|
||||
failIfMajorPerformanceCaveat: gameConfig.failIfMajorPerformanceCaveat,
|
||||
|
|
|
@ -260,6 +260,16 @@ var ScaleManager = new Class({
|
|||
*/
|
||||
this.zoom = 1;
|
||||
|
||||
/**
|
||||
* Internal flag set when the game zoom factor is modified.
|
||||
*
|
||||
* @name Phaser.Scale.ScaleManager#_resetZoom
|
||||
* @type {boolean}
|
||||
* @readonly
|
||||
* @since 3.19.0
|
||||
*/
|
||||
this._resetZoom = false;
|
||||
|
||||
/**
|
||||
* The scale factor between the baseSize and the canvasBounds.
|
||||
*
|
||||
|
@ -554,6 +564,11 @@ var ScaleManager = new Class({
|
|||
|
||||
this.zoom = zoom;
|
||||
|
||||
if (zoom !== 1)
|
||||
{
|
||||
this._resetZoom = true;
|
||||
}
|
||||
|
||||
// The modified game size, which is the w/h * resolution
|
||||
this.baseSize.setSize(width * resolution, height * resolution);
|
||||
|
||||
|
@ -868,6 +883,7 @@ var ScaleManager = new Class({
|
|||
setZoom: function (value)
|
||||
{
|
||||
this.zoom = value;
|
||||
this._resetZoom = true;
|
||||
|
||||
return this.refresh();
|
||||
},
|
||||
|
@ -884,6 +900,7 @@ var ScaleManager = new Class({
|
|||
setMaxZoom: function ()
|
||||
{
|
||||
this.zoom = this.getMaxZoom();
|
||||
this._resetZoom = true;
|
||||
|
||||
return this.refresh();
|
||||
},
|
||||
|
@ -996,10 +1013,12 @@ var ScaleManager = new Class({
|
|||
styleHeight = Math.floor(styleHeight);
|
||||
}
|
||||
|
||||
if (zoom > 1)
|
||||
if (this._resetZoom)
|
||||
{
|
||||
style.width = styleWidth + 'px';
|
||||
style.height = styleHeight + 'px';
|
||||
|
||||
this._resetZoom = false;
|
||||
}
|
||||
}
|
||||
else if (this.scaleMode === CONST.SCALE_MODE.RESIZE)
|
||||
|
|
|
@ -175,7 +175,7 @@ var Systems = new Class({
|
|||
* In the default set-up you can access this from within a Scene via the `this.sound` property.
|
||||
*
|
||||
* @name Phaser.Scenes.Systems#sound
|
||||
* @type {Phaser.Sound.BaseSoundManager}
|
||||
* @type {(Phaser.Sound.NoAudioSoundManager|Phaser.Sound.HTML5AudioSoundManager|Phaser.Sound.WebAudioSoundManager)}
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.sound;
|
||||
|
|
|
@ -482,7 +482,6 @@ var Size = new Class({
|
|||
if ((fit && this.aspectRatio > newRatio) || (!fit && this.aspectRatio < newRatio))
|
||||
{
|
||||
// We need to change the height to fit the width
|
||||
// height = width / this.aspectRatio;
|
||||
|
||||
width = SnapFloor(width, snap.x);
|
||||
|
||||
|
@ -499,7 +498,6 @@ var Size = new Class({
|
|||
else if ((fit && this.aspectRatio < newRatio) || (!fit && this.aspectRatio > newRatio))
|
||||
{
|
||||
// We need to change the width to fit the height
|
||||
// width = height * this.aspectRatio;
|
||||
|
||||
height = SnapFloor(height, snap.y);
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
var Class = require('../utils/Class');
|
||||
var Clamp = require('../math/Clamp');
|
||||
var Color = require('../display/color/Color');
|
||||
var CONST = require('../const');
|
||||
var IsSizePowerOfTwo = require('../math/pow2/IsSizePowerOfTwo');
|
||||
var Texture = require('./Texture');
|
||||
|
||||
|
@ -201,6 +202,11 @@ var CanvasTexture = new Class({
|
|||
this.pixels = this.imageData.data;
|
||||
}
|
||||
|
||||
if (this.manager.game.config.renderType === CONST.WEBGL)
|
||||
{
|
||||
this.refresh();
|
||||
}
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
|
@ -417,15 +423,18 @@ var CanvasTexture = new Class({
|
|||
* @method Phaser.Textures.CanvasTexture#getPixels
|
||||
* @since 3.16.0
|
||||
*
|
||||
* @param {integer} x - The x coordinate of the top-left of the region. Must lay within the dimensions of this CanvasTexture and be an integer.
|
||||
* @param {integer} y - The y coordinate of the top-left of the region. Must lay within the dimensions of this CanvasTexture and be an integer.
|
||||
* @param {integer} width - The width of the region to get. Must be an integer.
|
||||
* @param {integer} [x=0] - The x coordinate of the top-left of the region. Must lay within the dimensions of this CanvasTexture and be an integer.
|
||||
* @param {integer} [y=0] - The y coordinate of the top-left of the region. Must lay within the dimensions of this CanvasTexture and be an integer.
|
||||
* @param {integer} [width] - The width of the region to get. Must be an integer. Defaults to the canvas width if not given.
|
||||
* @param {integer} [height] - The height of the region to get. Must be an integer. If not given will be set to the `width`.
|
||||
*
|
||||
* @return {Phaser.Types.Textures.PixelConfig[]} An array of Pixel objects.
|
||||
*/
|
||||
getPixels: function (x, y, width, height)
|
||||
{
|
||||
if (x === undefined) { x = 0; }
|
||||
if (y === undefined) { y = 0; }
|
||||
if (width === undefined) { width = this.width; }
|
||||
if (height === undefined) { height = width; }
|
||||
|
||||
x = Math.abs(Math.round(x));
|
||||
|
|
|
@ -707,16 +707,18 @@ var Frame = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* Destroys this Frames references.
|
||||
* Destroys this Frame by nulling its reference to the parent Texture and and data objects.
|
||||
*
|
||||
* @method Phaser.Textures.Frame#destroy
|
||||
* @since 3.0.0
|
||||
*/
|
||||
destroy: function ()
|
||||
{
|
||||
this.texture = null;
|
||||
|
||||
this.source = null;
|
||||
this.texture = null;
|
||||
this.glTexture = null;
|
||||
this.customData = null;
|
||||
this.data = null;
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
|
@ -177,6 +177,35 @@ var Texture = new Class({
|
|||
return frame;
|
||||
},
|
||||
|
||||
/**
|
||||
* Removes the given Frame from this Texture. The Frame is destroyed immediately.
|
||||
*
|
||||
* Any Game Objects using this Frame should stop using it _before_ you remove it,
|
||||
* as it does not happen automatically.
|
||||
*
|
||||
* @method Phaser.Textures.Texture#remove
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {string} name - The key of the Frame to remove.
|
||||
*
|
||||
* @return {boolean} True if a Frame with the matching key was removed from this Texture.
|
||||
*/
|
||||
remove: function (name)
|
||||
{
|
||||
if (this.has(name))
|
||||
{
|
||||
var frame = this.get(name);
|
||||
|
||||
frame.destroy();
|
||||
|
||||
delete this.frames[name];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
},
|
||||
|
||||
/**
|
||||
* Checks to see if a Frame matching the given key exists within this Texture.
|
||||
*
|
||||
|
|
|
@ -274,7 +274,7 @@ var Timeline = new Class({
|
|||
* @method Phaser.Tweens.Timeline#dispatchTimelineEvent
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.Tweens.Events} event - The Event to be dispatched.
|
||||
* @param {Phaser.Types.Tweens.Event} event - The Event to be dispatched.
|
||||
* @param {function} callback - The callback to be invoked. Can be `null` or `undefined` to skip invocation.
|
||||
*/
|
||||
dispatchTimelineEvent: function (event, callback)
|
||||
|
|
|
@ -265,12 +265,42 @@ var TweenManager = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* Creates a stagger function and returns it.
|
||||
* Creates a Stagger function to be used by a Tween property.
|
||||
*
|
||||
* The stagger function will allow you to stagger changes to the value of the property across all targets of the tween.
|
||||
*
|
||||
* This is only worth using if the tween has multiple targets.
|
||||
*
|
||||
* The following will stagger the delay by 100ms across all targets of the tween, causing them to scale down to 0.2
|
||||
* over the duration specified:
|
||||
*
|
||||
* ```javascript
|
||||
* this.tweens.add({
|
||||
* targets: [ ... ],
|
||||
* scale: 0.2,
|
||||
* ease: 'linear',
|
||||
* duration: 1000,
|
||||
* delay: this.tweens.stagger(100)
|
||||
* });
|
||||
* ```
|
||||
*
|
||||
* The following will stagger the delay by 500ms across all targets of the tween using a 10 x 6 grid, staggering
|
||||
* from the center out, using a cubic ease.
|
||||
*
|
||||
* ```javascript
|
||||
* this.tweens.add({
|
||||
* targets: [ ... ],
|
||||
* scale: 0.2,
|
||||
* ease: 'linear',
|
||||
* duration: 1000,
|
||||
* delay: this.tweens.stagger(500, { grid: [ 10, 6 ], from: 'center', ease: 'cubic.out' })
|
||||
* });
|
||||
* ```
|
||||
*
|
||||
* @method Phaser.Tweens.TweenManager#stagger
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.Types.Tweens.StaggerBuilderConfig} config - The configuration object for the Stagger function.
|
||||
* @param {Phaser.Types.Tweens.StaggerConfig} config - The configuration object for the Stagger function.
|
||||
*
|
||||
* @return {function} The stagger function.
|
||||
*/
|
||||
|
|
|
@ -1228,7 +1228,7 @@ var Tween = new Class({
|
|||
* @method Phaser.Tweens.Tween#dispatchTweenDataEvent
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.Tweens.Events} event - The Event to be dispatched.
|
||||
* @param {Phaser.Types.Tweens.Event} event - The Event to be dispatched.
|
||||
* @param {function} callback - The callback to be invoked. Can be `null` or `undefined` to skip invocation.
|
||||
* @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData object that caused this event.
|
||||
*/
|
||||
|
@ -1253,7 +1253,7 @@ var Tween = new Class({
|
|||
* @method Phaser.Tweens.Tween#dispatchTweenEvent
|
||||
* @since 3.19.0
|
||||
*
|
||||
* @param {Phaser.Tweens.Events} event - The Event to be dispatched.
|
||||
* @param {Phaser.Types.Tweens.Event} event - The Event to be dispatched.
|
||||
* @param {function} callback - The callback to be invoked. Can be `null` or `undefined` to skip invocation.
|
||||
*/
|
||||
dispatchTweenEvent: function (event, callback)
|
||||
|
|
4
src/tweens/typedefs/Event.js
Normal file
4
src/tweens/typedefs/Event.js
Normal file
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* @typedef {string} Phaser.Types.Tweens.Event - A Tween Event.
|
||||
* @since 3.19.0
|
||||
*/
|
3501
types/matter.d.ts
vendored
Normal file
3501
types/matter.d.ts
vendored
Normal file
File diff suppressed because it is too large
Load diff
1444
types/phaser.d.ts
vendored
1444
types/phaser.d.ts
vendored
File diff suppressed because it is too large
Load diff
1280
types/spine-canvas.d.ts
vendored
Normal file
1280
types/spine-canvas.d.ts
vendored
Normal file
File diff suppressed because it is too large
Load diff
1684
types/spine-webgl.d.ts
vendored
Normal file
1684
types/spine-webgl.d.ts
vendored
Normal file
File diff suppressed because it is too large
Load diff
1667
types/spine.d.ts
vendored
Normal file
1667
types/spine.d.ts
vendored
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue