Rebasing on dev to get MockPointer changes for #3375 #3546
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the correct touch count
…moved an extraneous line in InteractionManager.js
… mixin for interactiveTarget will always set this
… the correct touch count
…moved an extraneous line in InteractionManager.js
… mixin for interactiveTarget will always set this
* 'dev' of github.com:starakaj/pixi.js: Removed an unnecessary check for _touchCount === undefined, since the mixin for interactiveTarget will always set this See pixijs#2662 --- Added _touchCount to interactiveTarget.js, and removed an extraneous line in InteractionManager.js See pixijs#2662 --- bending to the will of eslint Fix issue pixijs#2662 Added a touch counter instead of flag to ensure the correct touch count
* 'dev' of https://github.com/pixijs/pixi.js: Adds quotes around fontFamily (pixijs#3352) Fixes links to docs (pixijs#3324) Fixes the readme for bundle building excludes (pixijs#3325) Bower main fix, "bin" renamed "dist" (pixijs#3332) Expose the PIXI.Bounds class again (pixijs#3333) Update documentation (pixijs#3337) fixed settings not being respected (pixijs#3315) v4.2.2
…ts. Also updated InteractiveTarget to handle multiple touch or pointer events by recording pointerId for all tracked events, rather than just counting events. Finally, InteractionManager now updates on all tracked events, rather than just mouse events, so it should send move events when UI objects move underneath any held event, not just the mouse
…malized events for TouchEvents with multiple changedtouches
…os---trying to read pointerId from un-normalized events
…ight down are pointer properties, not mouse properties.
…that this is bound correctly, so that DisplayObjects can each get a unique object for tracking pointers
…d released InteractionData after touch up/cancelled events
* 'dev' of https://github.com/pixijs/pixi.js: (23 commits) Adds predist and prelib (pixijs#3441) Change the lines order in updateTransform. (pixijs#3435) fix for regular transform (pixijs#3424) Customize rendering process with "pluginName" field. (pixijs#3413) Change the code lines order in updateTransform in TransformStatic.js (pixijs#3404) Text style fixes (pixijs#3405) Further arc tests resolves pixijs#2016 Add Ellipse method unit tests Fixed createColoredCanvas() documentation Graphics - getLocalBounds after generateCanvasTexture (pixijs#3398) Reduce Graphics.getlocalBounds test (pixijs#3397) better code cocoonJS interaction position fix use private field fixed tests derp 0.01 -> 0.1 test description Fix for order of skew and scale in transform, plus a test v4.2.3 ...
…ointerType mouse or touch by emitting mouse and touch events, respectively
* 'dev' of https://github.com/pixijs/pixi.js: Update `clear` for a more thorough cleaning (pixijs#3445) added InteractionManager tests (pixijs#3472) Test case & fix for Graphics._calculateBounds calling updateLocalBounds every time (pixijs#3444) Do not unload generated textures when manually running the texture garbage collector. This already happens when it is run automatically, as it will cause the texture to not be able to be renderered again (pixijs#3342) v4.3.0 Allow '0x' notation of colours via strings to work in Text class (pixijs#3341) Add parameter kernelSize for blur filters. (pixijs#3410) target clarification (pixijs#3470) Fixes logic for spritesheet resolution (pixijs#3464) expose moveWhenInside docs (pixijs#3471)
…xijs#3375) * Fix issue pixijs#2662 Added a touch counter instead of flag to ensure the correct touch count * See pixijs#2662 --- bending to the will of eslint * See pixijs#2662 --- Added _touchCount to interactiveTarget.js, and removed an extraneous line in InteractionManager.js * Removed an unnecessary check for _touchCount === undefined, since the mixin for interactiveTarget will always set this * Fix issue pixijs#2662 Added a touch counter instead of flag to ensure the correct touch count * See pixijs#2662 --- bending to the will of eslint * See pixijs#2662 --- Added _touchCount to interactiveTarget.js, and removed an extraneous line in InteractionManager.js * Removed an unnecessary check for _touchCount === undefined, since the mixin for interactiveTarget will always set this * Adding cancel events to interaction manager * Refactoring InteractionManager to normalize all events to PointerEvents. Also updated InteractiveTarget to handle multiple touch or pointer events by recording pointerId for all tracked events, rather than just counting events. Finally, InteractionManager now updates on all tracked events, rather than just mouse events, so it should send move events when UI objects move underneath any held event, not just the mouse * Typo: mouse is not a function * InteractionManager normalizeToPointerData now returns an array of normalized events for TouchEvents with multiple changedtouches * Typo: no such thing as onPointerStart * Fixing some more typos: trying to read the pointerId of un-normalized events * Typos: un-normalized events don't have a pointerType * Added identifier property to InteractionData, and got rid of some typos---trying to read pointerId from un-normalized events * Forgot to bind onPointerCancel * Refactoring interactiveTarget.js a bit, so that over, left down and right down are pointer properties, not mouse properties. * Forgot an export default * Changed the mixin pattern for Pixi.interaction.interactiveTarget, so that this is bound correctly, so that DisplayObjects can each get a unique object for tracking pointers * Fixed some typos, moved interactiveTarget back to being an object, and released InteractionData after touch up/cancelled events * Small fixed * Safari compatibility * hasOwnProperty fix * Safer to use a string for mouse pointer than a number * InteractionManager should now handle native DOM pointer events with pointerType mouse or touch by emitting mouse and touch events, respectively * InteractionManager test now respects the refactored spec for InteractionManager * Pointer events exclusive * String.startsWith is not available in all browsers esp. older version of Safari. As it's just used in one place we can use a RegExp here too * Moving from regex, slightly faster
* dev: (30 commits) Moving from regex, slightly faster String.startsWith is not available in all browsers esp. older version of Safari. As it's just used in one place we can use a RegExp here too Pointer events exclusive InteractionManager test now respects the refactored spec for InteractionManager InteractionManager should now handle native DOM pointer events with pointerType mouse or touch by emitting mouse and touch events, respectively Safer to use a string for mouse pointer than a number hasOwnProperty fix Safari compatibility Small fixed Fixed some typos, moved interactiveTarget back to being an object, and released InteractionData after touch up/cancelled events Changed the mixin pattern for Pixi.interaction.interactiveTarget, so that this is bound correctly, so that DisplayObjects can each get a unique object for tracking pointers Forgot an export default Refactoring interactiveTarget.js a bit, so that over, left down and right down are pointer properties, not mouse properties. Forgot to bind onPointerCancel Added identifier property to InteractionData, and got rid of some typos---trying to read pointerId from un-normalized events Typos: un-normalized events don't have a pointerType Fixing some more typos: trying to read the pointerId of un-normalized events Typo: no such thing as onPointerStart InteractionManager normalizeToPointerData now returns an array of normalized events for TouchEvents with multiple changedtouches Typo: mouse is not a function ...
|
@bigtimebuddy does this work? |
|
Looks like it's still failing on these tests: https://travis-ci.org/pixijs/pixi.js/builds/189202921#L639-L662 can you take a look at that. Maybe @staff0rd can help. |
|
Yeah, it looks like some tests got added that have a different spec from the changes I made. I'll look at this today. |
|
I forked @starakaj's branch, and tried to make a PR, but result looks like i'm trying to push all commits since his last rebase into the branch also. Not sure what I should do here, the fix for the tests is in this commit; |
|
Yes, sorry, I can do that today. Happy to help!
…On Thu, Jan 19, 2017 at 4:50 PM, Matt Karl ***@***.***> wrote:
@starakaj <https://github.com/starakaj> could you incorporate @staff0rd
<https://github.com/staff0rd>'s fix? We would really like to get this
into our 4.4 release. Thanks for all your help.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#3546 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAf8BnS5zdQc7zoqQvwq3j0wP6xdzp6oks5rT9qLgaJpZM4LbwFr>
.
|
|
Cool, let me know if you need anything else! |
ivanpopelyshev
approved these changes
Jan 20, 2017
andrewstart
approved these changes
Jan 21, 2017
| * @private | ||
| */ | ||
| _pointerOver: false, | ||
| getTrackedPointers: function getTrackedPointers() |
There was a problem hiding this comment.
If mixins had the capability, would we want this to be get trackedPointers() instead of getTrackedPointers()? I'm just wondering for future changes (that I am making).
This was referenced Feb 1, 2017
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically making a new PR for #3375 so that it can pick up MockPointer changes