Fix issue with preparing Graphics without shader #6540
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
_resolveDirectShader is needed in a renderer parameter, otherwise it will fail [there|https://github.com/pixijs/pixi.js/blob/dev/packages/graphics/src/Graphics.ts#L1157]
ivanpopelyshev
approved these changes
Apr 10, 2020
|
oops :) |
bigtimebuddy
approved these changes
Apr 10, 2020
bigtimebuddy
added
the
✅ Ready To Merge
| @@ -67,7 +67,7 @@ function uploadGraphics(renderer: AbstractRenderer | BasePrepare, item: IDisplay | |||
| // if its not batchable - update vao for particular shader | |||
| if (!geometry.batchable) | |||
| { | |||
| (renderer as Renderer).geometry.bind(geometry, (item as any)._resolveDirectShader()); | |||
| (renderer as Renderer).geometry.bind(geometry, (item as any)._resolveDirectShader((renderer as Renderer))); | |||
There was a problem hiding this comment.
Why is item cast as any? We should have caught this issue way sooner.
There was a problem hiding this comment.
Some kind of legacy?
There was a problem hiding this comment.
I think was just an issue with with this package being converted to TypeScript #6481. We should followup with a PR, that creates an Interface for batchable objects.
bigtimebuddy
added
the
⏰ Future Work
bigtimebuddy
pushed a commit
that referenced
this pull request
Apr 10, 2020
Merged
guansss
pushed a commit
to guansss/pixi.js
that referenced
this pull request
Apr 13, 2020
This was referenced May 13, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
_resolveDirectShader is needed in a renderer parameter, otherwise it will fail there
Description of change
Just passing down renderer to the _resolveDirectShader.
Pre-Merge Checklist
npm run lint)npm run test)