diff --git a/doc/out/AbstractPopup.html b/doc/out/AbstractPopup.html index 2b4f160..be8c805 100644 --- a/doc/out/AbstractPopup.html +++ b/doc/out/AbstractPopup.html @@ -2918,7 +2918,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/Badge.html b/doc/out/Badge.html index eebaec4..776683d 100644 --- a/doc/out/Badge.html +++ b/doc/out/Badge.html @@ -2374,7 +2374,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/BlurFilter.html b/doc/out/BlurFilter.html index b93c5a5..1d6e785 100644 --- a/doc/out/BlurFilter.html +++ b/doc/out/BlurFilter.html @@ -1639,7 +1639,7 @@ const app = new PIXIApp({ }).setup().run() // Add a video sprite -const sprite = new PIXI.Sprite(PIXI.Texture.fromVideo("assets/blurfilter.mp4")) +const sprite = new PIXI.Sprite(PIXI.Texture.from("assets/blurfilter.mp4")) sprite.width = app.size.width sprite.height = app.size.height app.scene.addChild(sprite) @@ -1798,7 +1798,7 @@ app.scene.filters = [blurFilter] diff --git a/doc/out/Button.html b/doc/out/Button.html index 4372069..ab0c7cd 100644 --- a/doc/out/Button.html +++ b/doc/out/Button.html @@ -3816,7 +3816,7 @@ the tint property of the icon sprite.

diff --git a/doc/out/ButtonGroup.html b/doc/out/ButtonGroup.html index bd9dedb..8624714 100644 --- a/doc/out/ButtonGroup.html +++ b/doc/out/ButtonGroup.html @@ -3578,7 +3578,7 @@ app.scene.addChild(buttonGroup) diff --git a/doc/out/DeepZoomImage.html b/doc/out/DeepZoomImage.html index 3c4e8d0..11968a7 100644 --- a/doc/out/DeepZoomImage.html +++ b/doc/out/DeepZoomImage.html @@ -5096,7 +5096,7 @@ i.e. after loading a single tile

diff --git a/doc/out/DeepZoomInfo.html b/doc/out/DeepZoomInfo.html index 850a568..e0deab3 100644 --- a/doc/out/DeepZoomInfo.html +++ b/doc/out/DeepZoomInfo.html @@ -2609,7 +2609,7 @@ on completion.

diff --git a/doc/out/Flippable.html b/doc/out/Flippable.html index bef08a0..691b5d0 100644 --- a/doc/out/Flippable.html +++ b/doc/out/Flippable.html @@ -1575,7 +1575,7 @@ -PIXI.WebGLRenderer +PIXI.Renderer | PIXI.CanvasRenderer @@ -2243,8 +2243,8 @@ -
const front = PIXI.Sprite.fromImage('./assets/front.jpg')
-const back = PIXI.Sprite.fromImage('./assets/back.jpg')
+    
const front = PIXI.Sprite.from('./assets/front.jpg')
+const back = PIXI.Sprite.from('./assets/back.jpg')
 app.scene.addChild(front)
 
 // Create the flippable
@@ -2512,7 +2512,7 @@ front.on('click', event => flippable.toggle())
diff --git a/doc/out/FontInfo.html b/doc/out/FontInfo.html index 683beeb..20eb092 100644 --- a/doc/out/FontInfo.html +++ b/doc/out/FontInfo.html @@ -1559,7 +1559,7 @@
diff --git a/doc/out/Hypenate.html b/doc/out/Hypenate.html index dfa88ad..45abd93 100644 --- a/doc/out/Hypenate.html +++ b/doc/out/Hypenate.html @@ -1761,7 +1761,7 @@
diff --git a/doc/out/InteractivePopup.html b/doc/out/InteractivePopup.html index 5292d13..bc8f329 100644 --- a/doc/out/InteractivePopup.html +++ b/doc/out/InteractivePopup.html @@ -2343,7 +2343,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/LabeledGraphics.exports.LabeledGraphics.html b/doc/out/LabeledGraphics.exports.LabeledGraphics.html index 406b03c..d58b5ad 100644 --- a/doc/out/LabeledGraphics.exports.LabeledGraphics.html +++ b/doc/out/LabeledGraphics.exports.LabeledGraphics.html @@ -1561,7 +1561,7 @@
diff --git a/doc/out/LabeledGraphics.html b/doc/out/LabeledGraphics.html index 743579d..9564420 100644 --- a/doc/out/LabeledGraphics.html +++ b/doc/out/LabeledGraphics.html @@ -2626,7 +2626,7 @@ than wanted

diff --git a/doc/out/List.html b/doc/out/List.html index 884d912..111083c 100644 --- a/doc/out/List.html +++ b/doc/out/List.html @@ -1931,8 +1931,8 @@ scroll your list.

-
const elephant1 = PIXI.Sprite.fromImage('./assets/elephant-1.jpg')
-const elephant2 = PIXI.Sprite.fromImage('./assets/elephant-2.jpg')
+    
const elephant1 = PIXI.Sprite.from('./assets/elephant-1.jpg')
+const elephant2 = PIXI.Sprite.from('./assets/elephant-2.jpg')
 
 // Create the list
 const list = new List([elephant1, elephant2])
@@ -2585,7 +2585,7 @@ app.scene.addChild(list)
diff --git a/doc/out/Message.html b/doc/out/Message.html index 954d27b..5535d0e 100644 --- a/doc/out/Message.html +++ b/doc/out/Message.html @@ -2441,7 +2441,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/MessageInteractivePopup.html b/doc/out/MessageInteractivePopup.html index c7c1e59..620c84a 100644 --- a/doc/out/MessageInteractivePopup.html +++ b/doc/out/MessageInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/MessageMessageInteractivePopup.html b/doc/out/MessageMessageInteractivePopup.html index 339bee0..e12b83a 100644 --- a/doc/out/MessageMessageInteractivePopup.html +++ b/doc/out/MessageMessageInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/Modal.html b/doc/out/Modal.html index e287173..9268b22 100644 --- a/doc/out/Modal.html +++ b/doc/out/Modal.html @@ -2342,7 +2342,7 @@ a string or a PIXI.Text object.

diff --git a/doc/out/ModalInteractivePopup.html b/doc/out/ModalInteractivePopup.html index a145c20..d6810e2 100644 --- a/doc/out/ModalInteractivePopup.html +++ b/doc/out/ModalInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/ModalModalInteractivePopup.html b/doc/out/ModalModalInteractivePopup.html index 37764ea..5606f80 100644 --- a/doc/out/ModalModalInteractivePopup.html +++ b/doc/out/ModalModalInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PIXIApp.html b/doc/out/PIXIApp.html index 0bf2f92..b12b5cc 100644 --- a/doc/out/PIXIApp.html +++ b/doc/out/PIXIApp.html @@ -2322,7 +2322,7 @@ const app = new PIXIApp({ @@ -2429,7 +2429,7 @@ const app = new PIXIApp({ @@ -2558,7 +2558,7 @@ handler for the orientationchange event.

@@ -2755,7 +2755,7 @@ to browser page coordinates.

@@ -2952,7 +2952,7 @@ to local DisplayObject coordinates.

@@ -3029,7 +3029,7 @@ to the layout method.

@@ -3194,7 +3194,7 @@ to the layout method.

@@ -3353,7 +3353,7 @@ adapt their layout to the new app size.

@@ -3686,7 +3686,7 @@ renderer resolution?

@@ -4019,7 +4019,7 @@ renderer resolution?

@@ -4176,7 +4176,7 @@ renderer resolution?

@@ -4333,7 +4333,7 @@ renderer resolution?

@@ -4534,7 +4534,7 @@ rejected with an error. @@ -4639,7 +4639,7 @@ rejected with an error. @@ -4775,7 +4775,7 @@ rejected with an error. @@ -4936,7 +4936,7 @@ called without a parameter. @@ -5137,7 +5137,7 @@ rejected with an error. @@ -5434,7 +5434,7 @@ rejected with an error. @@ -5540,7 +5540,7 @@ Overwrite this method if you need additonal views and components.

@@ -5743,7 +5743,7 @@ rejected with an error.
diff --git a/doc/out/Popup.html b/doc/out/Popup.html index 5eaee60..a41018e 100644 --- a/doc/out/Popup.html +++ b/doc/out/Popup.html @@ -2336,7 +2336,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/PopupInteractivePopup.html b/doc/out/PopupInteractivePopup.html index 7d7c6ea..f60b3d7 100644 --- a/doc/out/PopupInteractivePopup.html +++ b/doc/out/PopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenu.html b/doc/out/PopupMenu.html index 8e89dab..2d17f33 100644 --- a/doc/out/PopupMenu.html +++ b/doc/out/PopupMenu.html @@ -2390,7 +2390,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/PopupMenuPopupInteractivePopup.html b/doc/out/PopupMenuPopupInteractivePopup.html index 55f0aa9..2fdb7a8 100644 --- a/doc/out/PopupMenuPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html b/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html index d8b943e..843463d 100644 --- a/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html b/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html index ce31ea3..82c6ea4 100644 --- a/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupPopupInteractivePopup.html b/doc/out/PopupMenuPopupPopupInteractivePopup.html index f8f3a8d..2d16281 100644 --- a/doc/out/PopupMenuPopupPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupPopupInteractivePopup.html b/doc/out/PopupPopupInteractivePopup.html index 8e3533f..2051677 100644 --- a/doc/out/PopupPopupInteractivePopup.html +++ b/doc/out/PopupPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/Progress.html b/doc/out/Progress.html index 33ba061..33b97e4 100644 --- a/doc/out/Progress.html +++ b/doc/out/Progress.html @@ -2875,7 +2875,7 @@ app.scene.addChild(progress)
diff --git a/doc/out/Scrollview.html b/doc/out/Scrollview.html index 6b8b88e..b2459f6 100644 --- a/doc/out/Scrollview.html +++ b/doc/out/Scrollview.html @@ -1707,7 +1707,7 @@ app.loader diff --git a/doc/out/Slider.html b/doc/out/Slider.html index e0fbf29..875cec4 100644 --- a/doc/out/Slider.html +++ b/doc/out/Slider.html @@ -2966,7 +2966,7 @@ app.scene.addChild(slider)
diff --git a/doc/out/Switch.html b/doc/out/Switch.html index aaf87c0..9ae523a 100644 --- a/doc/out/Switch.html +++ b/doc/out/Switch.html @@ -3396,7 +3396,7 @@ app.scene.addChild(switch1) diff --git a/doc/out/TextLabel.TextLabel.html b/doc/out/TextLabel.TextLabel.html index a684c5b..6db9c5a 100644 --- a/doc/out/TextLabel.TextLabel.html +++ b/doc/out/TextLabel.TextLabel.html @@ -1690,7 +1690,7 @@ diff --git a/doc/out/Theme.html b/doc/out/Theme.html index d2d975a..93ce9b2 100644 --- a/doc/out/Theme.html +++ b/doc/out/Theme.html @@ -3165,7 +3165,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeDark.html b/doc/out/ThemeDark.html index 0755ce6..8d50d9a 100644 --- a/doc/out/ThemeDark.html +++ b/doc/out/ThemeDark.html @@ -1586,7 +1586,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeLight.html b/doc/out/ThemeLight.html index c1ca02a..ad3e230 100644 --- a/doc/out/ThemeLight.html +++ b/doc/out/ThemeLight.html @@ -1598,7 +1598,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeRed.html b/doc/out/ThemeRed.html index 3f9d70e..dbe0598 100644 --- a/doc/out/ThemeRed.html +++ b/doc/out/ThemeRed.html @@ -1598,7 +1598,7 @@ const app = new PIXIApp({ diff --git a/doc/out/TileQuadNode.html b/doc/out/TileQuadNode.html index 08c128a..7ffe431 100644 --- a/doc/out/TileQuadNode.html +++ b/doc/out/TileQuadNode.html @@ -2050,7 +2050,7 @@ an indicator of tiles to free.

diff --git a/doc/out/Tooltip.html b/doc/out/Tooltip.html index 9953523..283ad2e 100644 --- a/doc/out/Tooltip.html +++ b/doc/out/Tooltip.html @@ -2512,7 +2512,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/UITest.html b/doc/out/UITest.html index 3c51f45..c99ae63 100644 --- a/doc/out/UITest.html +++ b/doc/out/UITest.html @@ -4183,7 +4183,7 @@ test.start() diff --git a/doc/out/Volatile.html b/doc/out/Volatile.html index 9242a85..e9355ad 100644 --- a/doc/out/Volatile.html +++ b/doc/out/Volatile.html @@ -2099,7 +2099,7 @@ app.scene.addChild(button) diff --git a/doc/out/global.html b/doc/out/global.html index 1a0e826..f2d7dbc 100644 --- a/doc/out/global.html +++ b/doc/out/global.html @@ -3320,7 +3320,7 @@ diff --git a/doc/out/index.html b/doc/out/index.html index 409a239..00a3954 100644 --- a/doc/out/index.html +++ b/doc/out/index.html @@ -1485,7 +1485,7 @@ diff --git a/doc/out/pixi_abstractpopup.js.html b/doc/out/pixi_abstractpopup.js.html index 592fc93..b5e0fa6 100644 --- a/doc/out/pixi_abstractpopup.js.html +++ b/doc/out/pixi_abstractpopup.js.html @@ -1808,7 +1808,7 @@ export default class AbstractPopup extends PIXI.Graphics { diff --git a/doc/out/pixi_app.js.html b/doc/out/pixi_app.js.html index f1cbcfb..17a1309 100644 --- a/doc/out/pixi_app.js.html +++ b/doc/out/pixi_app.js.html @@ -1562,8 +1562,7 @@ export default class PIXIApp extends PIXI.Application { resolution, autoResize, backgroundColor, - forceCanvas, - roundPixels // not needed for PixiJS >= 5 + forceCanvas }) this.width = width @@ -2189,7 +2188,7 @@ class FpsDisplay extends PIXI.Graphics { diff --git a/doc/out/pixi_badge.js.html b/doc/out/pixi_badge.js.html index 3a27f6c..ee69dd5 100644 --- a/doc/out/pixi_badge.js.html +++ b/doc/out/pixi_badge.js.html @@ -1569,7 +1569,7 @@ export default class Badge extends AbstractPopup { diff --git a/doc/out/pixi_blurfilter.js.html b/doc/out/pixi_blurfilter.js.html index 214f256..04ccf3c 100644 --- a/doc/out/pixi_blurfilter.js.html +++ b/doc/out/pixi_blurfilter.js.html @@ -1461,7 +1461,7 @@ * }).setup().run() * * // Add a video sprite - * const sprite = new PIXI.Sprite(PIXI.Texture.fromVideo("assets/blurfilter.mp4")) + * const sprite = new PIXI.Sprite(PIXI.Texture.from("assets/blurfilter.mp4")) * sprite.width = app.size.width * sprite.height = app.size.height * app.scene.addChild(sprite) @@ -1487,10 +1487,15 @@ export default class BlurFilter extends PIXI.Filter { } apply(filterManager, input, output) { - let renderTarget = filterManager.getRenderTarget(true) + let renderTarget = filterManager.getFilterTexture() this.tiltShiftXFilter.apply(filterManager, input, renderTarget) this.tiltShiftYFilter.apply(filterManager, renderTarget, output) - filterManager.returnRenderTarget(renderTarget) + filterManager.returnFilterTexture(renderTarget) + + // let renderTarget = filterManager.getRenderTarget(true) + // this.tiltShiftXFilter.apply(filterManager, input, renderTarget) + // this.tiltShiftYFilter.apply(filterManager, renderTarget, output) + // filterManager.returnRenderTarget(renderTarget) } /** @@ -1567,19 +1572,23 @@ class TiltShiftAxisFilter extends PIXI.Filter { uniform mat3 projectionMatrix; + varying vec2 vVertexPosition; varying vec2 vTextureCoord; void main(void) { - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vVertexPosition = aVertexPosition; vTextureCoord = aTextureCoord; + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); } ` const fragment = ` + + varying vec2 vVertexPosition; varying vec2 vTextureCoord; - uniform vec4 filterArea; uniform sampler2D uSampler; + uniform int shape; uniform vec4 rectangle; uniform vec3 circle; @@ -1592,15 +1601,12 @@ class TiltShiftAxisFilter extends PIXI.Filter { } void main(void) { - // textureCoord to pixelCoord - vec2 pixelCoord = vTextureCoord * filterArea.xy - vec2(4.0, 4.0); // FIXME: There's a shift of 4 * 4 pixels, don't know why... - bool inside = false; if (shape == 1) { - inside = distance(pixelCoord, circle.xy) <= circle.z; + inside = distance(vVertexPosition, circle.xy) <= circle.z; } else if (shape == 2) { - inside = pixelCoord.x >= rectangle.x && pixelCoord.x <= rectangle.z && pixelCoord.y >= rectangle.y && pixelCoord.y <= rectangle.w; + inside = vVertexPosition.x >= rectangle.x && vVertexPosition.x <= rectangle.z && vVertexPosition.y >= rectangle.y && vVertexPosition.y <= rectangle.w; } if (inside) { @@ -1727,7 +1733,7 @@ class TiltShiftYFilter extends TiltShiftAxisFilter { diff --git a/doc/out/pixi_button.js.html b/doc/out/pixi_button.js.html index 6a5dd66..d1773c0 100644 --- a/doc/out/pixi_button.js.html +++ b/doc/out/pixi_button.js.html @@ -2110,7 +2110,7 @@ export default class Button extends PIXI.Container { } const url = Button.iconIsUrl(icon) ? icon : `../../assets/icons/${icon}.png` - const iconTexture = PIXI.Texture.fromImage(url, true) + const iconTexture = PIXI.Texture.from(url) const sprite = new PIXI.Sprite(iconTexture) sprite.tint = color @@ -2171,7 +2171,7 @@ export default class Button extends PIXI.Container { diff --git a/doc/out/pixi_buttongroup.js.html b/doc/out/pixi_buttongroup.js.html index 9725a4f..5c9817b 100644 --- a/doc/out/pixi_buttongroup.js.html +++ b/doc/out/pixi_buttongroup.js.html @@ -2174,7 +2174,7 @@ export default class ButtonGroup extends PIXI.Container { diff --git a/doc/out/pixi_deepzoom_image.js.html b/doc/out/pixi_deepzoom_image.js.html index 6a0f7eb..fc460b4 100644 --- a/doc/out/pixi_deepzoom_image.js.html +++ b/doc/out/pixi_deepzoom_image.js.html @@ -2041,7 +2041,7 @@ export class DeepZoomImage extends PIXI.Container { * @return {Sprite} sprite - A sprite with a single tile texture */ thumbnail() { - return new PIXI.Sprite.fromImage(this.info.baseURL) + return new PIXI.Sprite.from(this.info.baseURL) } /** Returns a list of all tiles of a given level. @@ -2512,7 +2512,7 @@ export class DeepZoomImage extends PIXI.Container { diff --git a/doc/out/pixi_flippable.js.html b/doc/out/pixi_flippable.js.html index 1101d93..b924957 100644 --- a/doc/out/pixi_flippable.js.html +++ b/doc/out/pixi_flippable.js.html @@ -1472,8 +1472,8 @@ * Class that represents a PixiJS Flippable. * * @example - * const front = PIXI.Sprite.fromImage('./assets/front.jpg') - * const back = PIXI.Sprite.fromImage('./assets/back.jpg') + * const front = PIXI.Sprite.from('./assets/front.jpg') + * const back = PIXI.Sprite.from('./assets/back.jpg') * app.scene.addChild(front) * * // Create the flippable @@ -1494,7 +1494,7 @@ export default class Flippable extends PIXI.projection.Camera3d { * @constructor * @param {PIXI.DisplayObject} front - The object to show initially. Should have been added to the scene. * @param {PIXI.DisplayObject} back - The object to show on the backside. Should have not been added to the scene. - * @param {PIXI.WebGLRenderer|PIXI.CanvasRenderer} renderer - The renderer of the application. + * @param {PIXI.Renderer|PIXI.CanvasRenderer} renderer - The renderer of the application. * @param {object} [opts] - An options object which can contain the following properties. * @param {number} [opts.duration=1] - The duration of the flip animation in seconds. * @param {GSAP.Ease} [opts.ease=Power2.easeOut] - The ease of the flip animation. @@ -1578,7 +1578,7 @@ export default class Flippable extends PIXI.projection.Camera3d { // shadow //-------------------- - const shadow = new PIXI.projection.Sprite3d(PIXI.Texture.fromImage('../../assets/images/shadow.png')) + const shadow = new PIXI.projection.Sprite3d(PIXI.Texture.from('../../assets/images/shadow.png')) shadow.renderable = false shadow.anchor.set(0.5) shadow.scale3d.set(0.98) @@ -1906,7 +1906,7 @@ export default class Flippable extends PIXI.projection.Camera3d { diff --git a/doc/out/pixi_labeledgraphics.js.html b/doc/out/pixi_labeledgraphics.js.html index 0b4cbbe..719ea72 100644 --- a/doc/out/pixi_labeledgraphics.js.html +++ b/doc/out/pixi_labeledgraphics.js.html @@ -1855,7 +1855,7 @@ export class BitmapLabeledGraphics extends LabeledGraphics { diff --git a/doc/out/pixi_list.js.html b/doc/out/pixi_list.js.html index cc36167..e333569 100644 --- a/doc/out/pixi_list.js.html +++ b/doc/out/pixi_list.js.html @@ -1453,8 +1453,8 @@ import Events from '../events.js' * Class that represents a PixiJS List. * * @example - * const elephant1 = PIXI.Sprite.fromImage('./assets/elephant-1.jpg') - * const elephant2 = PIXI.Sprite.fromImage('./assets/elephant-2.jpg') + * const elephant1 = PIXI.Sprite.from('./assets/elephant-1.jpg') + * const elephant2 = PIXI.Sprite.from('./assets/elephant-2.jpg') * * // Create the list * const list = new List([elephant1, elephant2]) @@ -1834,7 +1834,7 @@ export default class List extends PIXI.Container { diff --git a/doc/out/pixi_message.js.html b/doc/out/pixi_message.js.html index 335f73e..e9e2715 100644 --- a/doc/out/pixi_message.js.html +++ b/doc/out/pixi_message.js.html @@ -1583,7 +1583,7 @@ export default class Message extends InteractivePopup { diff --git a/doc/out/pixi_modal.js.html b/doc/out/pixi_modal.js.html index 4fd6986..6e9de34 100644 --- a/doc/out/pixi_modal.js.html +++ b/doc/out/pixi_modal.js.html @@ -1664,7 +1664,7 @@ export default class Modal extends PIXI.Container { diff --git a/doc/out/pixi_popup.js.html b/doc/out/pixi_popup.js.html index 8516dbe..3a876bc 100644 --- a/doc/out/pixi_popup.js.html +++ b/doc/out/pixi_popup.js.html @@ -1519,7 +1519,7 @@ export class InteractivePopup extends AbstractPopup { // closeButton //----------------- if (this.opts.closeButton) { - let closeButton = PIXI.Sprite.fromImage('../../assets/icons/close.png', true) + let closeButton = PIXI.Sprite.from('../../assets/icons/close.png') closeButton.width = this.headerStyle.fontSize closeButton.height = closeButton.width closeButton.tint = this.theme.color2 @@ -1674,7 +1674,7 @@ export default class Popup extends InteractivePopup { diff --git a/doc/out/pixi_popupmenu.js.html b/doc/out/pixi_popupmenu.js.html index 66bad0d..63c6813 100644 --- a/doc/out/pixi_popupmenu.js.html +++ b/doc/out/pixi_popupmenu.js.html @@ -1577,7 +1577,7 @@ export default class PopupMenu extends Popup { diff --git a/doc/out/pixi_progress.js.html b/doc/out/pixi_progress.js.html index e7dae67..ff6cea3 100644 --- a/doc/out/pixi_progress.js.html +++ b/doc/out/pixi_progress.js.html @@ -1759,7 +1759,7 @@ export default class Progress extends PIXI.Container { diff --git a/doc/out/pixi_scrollview.js.html b/doc/out/pixi_scrollview.js.html index 78c52eb..10c9c23 100644 --- a/doc/out/pixi_scrollview.js.html +++ b/doc/out/pixi_scrollview.js.html @@ -1518,7 +1518,7 @@ export default class Scrollview extends Scrollbox { diff --git a/doc/out/pixi_slider.js.html b/doc/out/pixi_slider.js.html index 4c2517a..d8ea763 100644 --- a/doc/out/pixi_slider.js.html +++ b/doc/out/pixi_slider.js.html @@ -1923,7 +1923,7 @@ export default class Slider extends PIXI.Container { diff --git a/doc/out/pixi_switch.js.html b/doc/out/pixi_switch.js.html index 7f4d6dd..c00acea 100644 --- a/doc/out/pixi_switch.js.html +++ b/doc/out/pixi_switch.js.html @@ -1977,7 +1977,7 @@ export default class Switch extends PIXI.Container { diff --git a/doc/out/pixi_theme.js.html b/doc/out/pixi_theme.js.html index 02765f3..e46a5b2 100644 --- a/doc/out/pixi_theme.js.html +++ b/doc/out/pixi_theme.js.html @@ -1718,7 +1718,7 @@ export class ThemeRed extends Theme { diff --git a/doc/out/pixi_tooltip.js.html b/doc/out/pixi_tooltip.js.html index 3705b89..b6ac906 100644 --- a/doc/out/pixi_tooltip.js.html +++ b/doc/out/pixi_tooltip.js.html @@ -1611,7 +1611,7 @@ export default class Tooltip extends AbstractPopup { diff --git a/doc/out/pixi_volatile.js.html b/doc/out/pixi_volatile.js.html index 0c676da..6369efc 100644 --- a/doc/out/pixi_volatile.js.html +++ b/doc/out/pixi_volatile.js.html @@ -1615,7 +1615,7 @@ export default class Volatile { diff --git a/doc/out/uitest.js.html b/doc/out/uitest.js.html index 6da95cf..8c88d2f 100644 --- a/doc/out/uitest.js.html +++ b/doc/out/uitest.js.html @@ -2466,7 +2466,7 @@ class Event { diff --git a/package-lock.json b/package-lock.json index 6cd15dc..8d78f96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2415,9 +2415,9 @@ } }, "eslint-config-prettier": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.2.0.tgz", - "integrity": "sha512-VLsgK/D+S/FEsda7Um1+N8FThec6LqE3vhcMyp8mlmto97y3fGf3DX7byJexGuOb1QY0Z/zz222U5t+xSfcZDQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.3.0.tgz", + "integrity": "sha512-EWaGjlDAZRzVFveh2Jsglcere2KK5CJBhkNSa1xs3KfMUGdRiT7lG089eqPdvlzWHpAqaekubOsOMu8W8Yk71A==", "dev": true, "requires": { "get-stdin": "^6.0.0" diff --git a/package.json b/package.json index 92592a1..ceb1efa 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@pixi/jsdoc-template": "^2.4.3", "eslint": "^6.3.0", - "eslint-config-prettier": "^6.2.0", + "eslint-config-prettier": "^6.3.0", "eslint-plugin-prettier": "^3.1.0", "fs-extra": "^8.0.1", "gulp": "^4.0.2",