diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index 46e7dcb..c25b840 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -2862,10 +2862,10 @@ * @return {Button} A reference to the button for chaining. */ hide() { - this.opts.strokeAlpha = 0; - this.opts.strokeActiveAlpha = 0; - this.opts.fillAlpha = 0; - this.opts.fillActiveAlpha = 0; + this.opts.strokeAlpha = 0.0; + this.opts.strokeActiveAlpha = 0.0; + this.opts.fillAlpha = 0.0000000001; // WORKAROUND: See https://github.com/pixijs/pixi.js/wiki/v5-Migration-Guide#graphics-interaction + this.opts.fillActiveAlpha = 0.0000000001; this.layout(); @@ -14604,7 +14604,7 @@ } tiltToLineWidth(value) { - return Math.round(Math.abs(value / 10) + 1) + return 16 // Math.round(Math.abs(value / 10) + 1) } drawStroke(stroke) { @@ -14612,9 +14612,15 @@ let start = stroke[0]; this.beginFill(0, 0); this.moveTo(start.x, start.y); + let lineWidth = this.tiltToLineWidth(start.tiltY); + this.lineStyle(lineWidth, start.color, this.colorAlpha); for (let i = 1; i < stroke.length; i++) { let info = stroke[i]; - this.lineStyle(this.tiltToLineWidth(info.tiltY), info.color, this.colorAlpha); + let lw = this.tiltToLineWidth(info.tiltY); + if (lw != lineWidth) { + lineWidth = lw; + this.lineStyle(lineWidth, info.color, this.colorAlpha); + } this.lineTo(info.x, info.y); } this.endFill(); diff --git a/lib/pixi/button.js b/lib/pixi/button.js index 1212677..a454e86 100644 --- a/lib/pixi/button.js +++ b/lib/pixi/button.js @@ -632,10 +632,10 @@ export default class Button extends PIXI.Container { * @return {Button} A reference to the button for chaining. */ hide() { - this.opts.strokeAlpha = 0 - this.opts.strokeActiveAlpha = 0 - this.opts.fillAlpha = 0 - this.opts.fillActiveAlpha = 0 + this.opts.strokeAlpha = 0.0 + this.opts.strokeActiveAlpha = 0.0 + this.opts.fillAlpha = 0.0000000001 // WORKAROUND: See https://github.com/pixijs/pixi.js/wiki/v5-Migration-Guide#graphics-interaction + this.opts.fillActiveAlpha = 0.0000000001 this.layout() diff --git a/lib/pixi/index.html b/lib/pixi/index.html index 0e8cfcc..7a106e5 100644 --- a/lib/pixi/index.html +++ b/lib/pixi/index.html @@ -51,7 +51,8 @@ const index = new Index(itemTemplate, [ ['Flip Effect', 'flipeffect.html'], ['Blur Filter', 'blurfilter.html'], ['Text', 'text.html'], - ['Scrollview', 'scrollview.html'] + ['Scrollview', 'scrollview.html'], + ['Stylus', 'stylus.html'] ], null) index.load() diff --git a/lib/pixi/stylus.js b/lib/pixi/stylus.js index 7a5c118..62b0693 100755 --- a/lib/pixi/stylus.js +++ b/lib/pixi/stylus.js @@ -305,9 +305,15 @@ export default class Stylus extends PIXI.Graphics { let start = stroke[0] this.beginFill(0, 0) this.moveTo(start.x, start.y) + let lineWidth = this.tiltToLineWidth(start.tiltY) + this.lineStyle(lineWidth, start.color, this.colorAlpha) for (let i = 1; i < stroke.length; i++) { let info = stroke[i] - this.lineStyle(this.tiltToLineWidth(info.tiltY), info.color, this.colorAlpha) + let lw = this.tiltToLineWidth(info.tiltY) + if (lw != lineWidth) { + lineWidth = lw + this.lineStyle(lineWidth, info.color, this.colorAlpha) + } this.lineTo(info.x, info.y) } this.endFill()