-
Notifications
You must be signed in to change notification settings - Fork 24
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
feat: Upstream Vivy material system #600
base: dev
Are you sure you want to change the base?
Conversation
Vivy is a new material system that is based around the concept of templates instead of generation. I created it in my spare time in 2023 and used it for my new year's piece https://www.standingpad.org/posts/2023/12/new-years/#vivy Initially, I have said that I didn't want to upstream Vivy in MCprep to avoid users from opening bug reports after underestimating the complexity of using the system. That said, #274 already had plans to revamp the material system for greater user flexibility, and I'm unable to maintain Vivy on my own (given the fast pace of upstream MCprep). Therefore, I've decided to begin the work of upstreaming Vivy into MCprep itself. I initially tried to merge Vivy into a separate branch, but that turned out to be impossible due to massive changes in mainline MCprep. Thus, I've included the Vivy files here and added the necessary changes to `conf.py` and `load_modules.py`. This was made easier by the fact that Vivy does not change anything internal, mostly due to laziness on my part (instead, I just copied and pasted functions I needed to modify for Vivy). As such, everything in Vivy is a separate operator, using the `vivy` prefix instead of `mcprep`. I've not included the necessary reference changes for Vivy, since I don't want to start overriding operators yet. As it stands, Vivy is lacking in the following areas: - UI for setting up materials - Documentation for using - Integration in the rest of MCprep (like mob rigs) In addition, Vivy also has the following issues due to the way its designed: - Use of `VIVY` and `vivy` prefixes - Lose integration (again, due to laziness on my part) - No tests Seeing as this is more of a long term project however, I think we can get these tackled sometime by MCprep 4.0. Once those are done, we'd also need to discuss how this would coexist with the existing generation based system (should we choose to keep it). Closes #274 Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Just to be clear as well, after MCprep 3.6 releases, I'll be taking a break from MCprep development to focus more on college applications and BpyBuild, so @TheDuckCow if you want, you can develop on this branch without conflicts for the most part. This is more of a long term thing anyway. |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
After a little effort (mostly with missing stuff), I've added the ability to build MCprep with Vivy exposed in the UI through the Make sure when enabling Vivy support, you have |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Updated some of the references so basic things work. Vivy-based textureswap seems to not want to work for some reason, but prepping materials in general works fine |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Got the Vivy-based textureswap fixed partially (issue was due to an outdated check for |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Fixed the last remaining issue with Vivy-based textureswap, so now it should work on all texture packs |
Alright, got an idea to make merging this PR less of a pain: what if we make this PR solely dedicated to cleaning up and properly upstreaming the Vivy code (for say MCprep 3.7), and then gate the loading of Vivy behind a runtime check (which we do for the UI, but not the actual registration)? This does mean the UI is technically in an incomplete when merged, but it also means less of a pain with merge conflicts as the PR wouldn't be too far behind. We could also make Vivy usable to end users using the experimental flag in MCprep, so we can get some community feedback (especially when we do start working on the UI). |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
@TheDuckCow ready for first review. To be clear, this is a long term feature that will be developed over multiple PRs, and perhaps won't be enabled for users until MCprep 4.0. This PR specifically works on cleaning up the code for the Vivy material system, and getting it up to par with upstream standards. That way, we don't have to worry about a single long PR that gains conflicts over time, and instead have smaller PRs merged over a longer period of time. It does mean having unstable code in production, but I think that's a reasonable tradeoff to make. By default, Vivy modules won't even be registered unless |
Hey @StandingPadAnimations thanks for making a great head start on this! To make things easier, would you be able to record a short demo video of how it's mean to be used right now? That way you save some time documenting and it's easier for me to see how it's currently working. I installed the branch to see that at the very least, nothing appears broken per-se, but wasn't too sure where to go after there (without diving more into the code first). We can either treat this as a feature branch, or try to merge parts of it at a time until the UI side is fully ready. |
Here's some demos I uploaded on Mastodon a long time back (not much has changed though): |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
I've implemented refinements in the UI now, although mappings are not yet updated (so the UI won't show that a material is a refinement of X for instance) |
Testing the resource pack inconsistencies at the moment. Here's the texture packs I have tested with and their passing status:
These packs are definitely outdated a bit, but that's what I currently have locally. Will test some more based on suggestions. |
So weirdly it seems to be that the errors occur if swap textures has been called once. This is likely due to fallbacks that occur the first time interfering with later calls |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Subsequent uses of Vivy's texture swap has been fixed, albeit with a band-aid solution. Since a lot of the code feels rough, I'm going to spend some time simplifying it as much as possible |
Ok thanks @StandingPadAnimations - if you want, consider whether you want to split this up into several PRs or keep this one single one here. We could always create a feature branch. At some point, when it's ready, you and I should sit down and do a live review so I can make sure I grasp all of the current state of it and how it's working. Just let me know (via ping and/or request review) |
The plan is to have several PRs for Vivy, with this one primarily focusing on the initial upstreaming (getting major bugs ironed out + cleaning up the code to meet existing standards). I think it should be fine to merge this into
Sure thing! |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Pushed refactoring changes and pulled in the latest updates to |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed, I'll be tagged for re-review once the small little hiccups we ran into today are resolved, and I'll do more of a deep review then for the scope as-is (I'll create a new issue for the follow up UX discussions around this, while the scope of this PR will still be in the experimental feature set)
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
@TheDuckCow Gotten all the bugs encountered during our meeting yesterday fixed, and the general editing pipeline seems to work on my end now. All that's left are a few minor things (like changing |
I'll also look into the |
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Fixed the I also fixed the test suite, it was downloading MCprep 3.5.3 for sourcing assets as opposed to the latest release |
Vivy is a new material system that is based around the concept of templates instead of generation. I created it in my spare time in 2023 and used it for my new year's piece
https://www.standingpad.org/posts/2023/12/new-years/#vivy
Initially, I have said that I didn't want to upstream Vivy in MCprep to avoid users from opening bug reports after underestimating the complexity of using the system. That said, #274 already had plans to revamp the material system for greater user flexibility, and I'm unable to maintain Vivy on my own (given the fast pace of upstream MCprep). Therefore, I've decided to begin the work of upstreaming Vivy into MCprep itself.
I initially tried to merge Vivy into a separate branch, but that turned out to be impossible due to massive changes in mainline MCprep. Thus, I've included the Vivy files here and added the necessary changes to
conf.py
andload_modules.py
. This was made easier by the fact that Vivy does not change anything internal, mostly due to laziness on my part (instead, I just copied and pasted functions I needed to modify for Vivy). As such, everything in Vivy is a separate operator, using thevivy
prefix instead ofmcprep
. I've not included the necessary reference changes for Vivy, since I don't want to start overriding operators yet.As it stands, Vivy is lacking in the following areas:
In addition, Vivy also has the following issues due to the way its designed:
VIVY
andvivy
prefixesSeeing as this is more of a long term project however, I think we can get these tackled sometime by MCprep 4.0. Once those are done, we'd also need to discuss how this would coexist with the existing generation based system (should we choose to keep it).
Closes #274