diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index a36ddbf..f42928e 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -34,7 +34,7 @@ * Will return a HTML Image of the target * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLImageElement} HTML Image of the target */ image(target) @@ -51,7 +51,7 @@ * `CanvasExtract.getCanvas` and then running toDataURL on that. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {string} A base64 encoded string of the texture. */ base64(target) @@ -63,7 +63,7 @@ * Creates a Canvas element, renders this target to it and then returns it. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLCanvasElement} A Canvas element with the texture rendered on. */ canvas(target) @@ -118,7 +118,7 @@ * order, with integer values between 0 and 255 (included). * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {Uint8ClampedArray} One-dimensional array containing the pixel data of the entire texture */ pixels(target) diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index a36ddbf..f42928e 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -34,7 +34,7 @@ * Will return a HTML Image of the target * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLImageElement} HTML Image of the target */ image(target) @@ -51,7 +51,7 @@ * `CanvasExtract.getCanvas` and then running toDataURL on that. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {string} A base64 encoded string of the texture. */ base64(target) @@ -63,7 +63,7 @@ * Creates a Canvas element, renders this target to it and then returns it. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLCanvasElement} A Canvas element with the texture rendered on. */ canvas(target) @@ -118,7 +118,7 @@ * order, with integer values between 0 and 255 (included). * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {Uint8ClampedArray} One-dimensional array containing the pixel data of the entire texture */ pixels(target) diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index b7a36ab..82f10b3 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -35,7 +35,7 @@ * Will return a HTML Image of the target * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLImageElement} HTML Image of the target */ image(target) @@ -52,7 +52,7 @@ * `Extract.getCanvas` and then running toDataURL on that. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {string} A base64 encoded string of the texture. */ base64(target) @@ -64,7 +64,7 @@ * Creates a Canvas element, renders this target to it and then returns it. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLCanvasElement} A Canvas element with the texture rendered on. */ canvas(target) @@ -157,7 +157,7 @@ * order, with integer values between 0 and 255 (included). * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {Uint8ClampedArray} One-dimensional array containing the pixel data of the entire texture */ pixels(target) diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index a36ddbf..f42928e 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -34,7 +34,7 @@ * Will return a HTML Image of the target * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLImageElement} HTML Image of the target */ image(target) @@ -51,7 +51,7 @@ * `CanvasExtract.getCanvas` and then running toDataURL on that. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {string} A base64 encoded string of the texture. */ base64(target) @@ -63,7 +63,7 @@ * Creates a Canvas element, renders this target to it and then returns it. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLCanvasElement} A Canvas element with the texture rendered on. */ canvas(target) @@ -118,7 +118,7 @@ * order, with integer values between 0 and 255 (included). * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {Uint8ClampedArray} One-dimensional array containing the pixel data of the entire texture */ pixels(target) diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index b7a36ab..82f10b3 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -35,7 +35,7 @@ * Will return a HTML Image of the target * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLImageElement} HTML Image of the target */ image(target) @@ -52,7 +52,7 @@ * `Extract.getCanvas` and then running toDataURL on that. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {string} A base64 encoded string of the texture. */ base64(target) @@ -64,7 +64,7 @@ * Creates a Canvas element, renders this target to it and then returns it. * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {HTMLCanvasElement} A Canvas element with the texture rendered on. */ canvas(target) @@ -157,7 +157,7 @@ * order, with integer values between 0 and 255 (included). * * @param {PIXI.DisplayObject|PIXI.RenderTexture} target - A displayObject or renderTexture - * to convert. If left empty will use use the main renderer + * to convert. If left empty will use the main renderer * @return {Uint8ClampedArray} One-dimensional array containing the pixel data of the entire texture */ pixels(target) diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd46b06..36b060f 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1768,8 +1768,8 @@ if (typeof touch.pointerType === 'undefined') touch.pointerType = 'touch'; if (typeof touch.pointerId === 'undefined') touch.pointerId = touch.identifier || 0; if (typeof touch.pressure === 'undefined') touch.pressure = touch.force || 0.5; - touch.twist = 0; - touch.tangentialPressure = 0; + if (typeof touch.twist === 'undefined') touch.twist = 0; + if (typeof touch.tangentialPressure === 'undefined') touch.tangentialPressure = 0; // TODO: Remove these, as layerX/Y is not a standard, is deprecated, has uneven // support, and the fill ins are not quite the same // offsetX/Y might be okay, but is not the same as clientX/Y when the canvas's top @@ -1794,8 +1794,8 @@ if (typeof event.pointerType === 'undefined') event.pointerType = 'mouse'; if (typeof event.pointerId === 'undefined') event.pointerId = MOUSE_POINTER_ID; if (typeof event.pressure === 'undefined') event.pressure = 0.5; - event.twist = 0; - event.tangentialPressure = 0; + if (typeof event.twist === 'undefined') event.twist = 0; + if (typeof event.tangentialPressure === 'undefined') event.tangentialPressure = 0; // mark the mouse event as normalized, just so that we know we did it event.isNormalized = true;