Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WebGLRenderer: Support custom painter sort functions. #16909

Merged

Conversation

ranbuch
Copy link
Contributor

@ranbuch ranbuch commented Jun 25, 2019

As discussed here I've created a PR that enables support for dynamic sort functions.

@Mugen87
Copy link
Collaborator

Mugen87 commented Oct 8, 2019

@mrdoob The PR seems okay to me. If merged, I can add the docs and also update the TS file (unless @ranbuch does it in the meanwhile^^).

@ranbuch
Copy link
Contributor Author

ranbuch commented Oct 10, 2019

@mrdoob The PR seems okay to me. If merged, I can add the docs and also update the TS file (unless @ranbuch does it in the meanwhile^^).

Thank you @Mugen87

Do you want me to provide the documentation? Should I use this feature branch to do so?
I suppose I'm should edit the WebGLRenderer.html file for the documentation.

About the ts, I see that there's a WebGLRenderer.d.ts file but it's probably auto generated. Where is the relevant ts source file?

@Mugen87
Copy link
Collaborator

Mugen87 commented Oct 10, 2019

see that there's a WebGLRenderer.d.ts file but it's probably auto generated.

No, it's manually maintained.

Should I use this feature branch to do so?

Yes, that's fine. Adding docs would be great.

@ranbuch
Copy link
Contributor Author

ranbuch commented Nov 26, 2019

@Mugen87 I don't mean to push it but is there an ETA?
I just delaying my viewer's update until the approval 😉

@Mugen87
Copy link
Collaborator

Mugen87 commented Nov 26, 2019

I'm afraid you have to wait for @mrdoob's review 😇

@WestLangley WestLangley changed the title support costume painter sort functions support custom painter sort functions Nov 26, 2019
@ranbuch
Copy link
Contributor Author

ranbuch commented Nov 27, 2019

@WestLangley I've fixed all of the issues above on my local branch and can push if you want me to.

@Mugen87
Copy link
Collaborator

Mugen87 commented Nov 27, 2019

and can push if you want me to.

I think that would be good 👍

@Mugen87
Copy link
Collaborator

Mugen87 commented Nov 27, 2019

Please don't push build files. It seems they sneaked in with the last commit.

@ranbuch
Copy link
Contributor Author

ranbuch commented Nov 27, 2019

@Mugen87 it seems I have conflicts, sorry about that.
The Resolve conflicts button is grayed out for me due to my write access.
Do you want me to do anything?

@Mugen87
Copy link
Collaborator

Mugen87 commented Nov 27, 2019

Do this on your system:

git reset HEAD~

Then undo the changes to the build files and make a new commit. (Force) push it like so:

git push origin feature/support-costume-painter-sort-functions-2 -f

@ranbuch ranbuch force-pushed the feature/support-costume-painter-sort-functions-2 branch from c40d465 to 7839814 Compare November 27, 2019 19:50
@Mugen87 Mugen87 changed the title support custom painter sort functions WebGLRenderer: Support custom painter sort functions. Dec 17, 2019
@mrdoob mrdoob added this to the r112 milestone Dec 18, 2019
@mrdoob mrdoob merged commit 7af21db into mrdoob:dev Dec 18, 2019
@mrdoob
Copy link
Owner

mrdoob commented Dec 18, 2019

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants