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

Omnibus PR with fixes for #333, #334, #335, and README updates #340

Merged
merged 26 commits into from
Mar 23, 2022
Merged

Omnibus PR with fixes for #333, #334, #335, and README updates #340

merged 26 commits into from
Mar 23, 2022

Conversation

nukeandbeans
Copy link
Collaborator

@nukeandbeans nukeandbeans commented Mar 6, 2022

This PR fixes issues introduced with PR #333. It fixes #334 and closes #335. All changes that were not present in the release 7521cd7 and were in #333 are here, as well.

Changes introduced in #333:

  • The repo is now a package compatible with Unity Package Manager.
  • Icons are embedded into a generated class, which reduces clutter in the texture browser.

#333 fixes introduced in this PR:

  • The root folder of RealtimeCSG is now found using a directory search, instead of a file search. This removes the need for finding RealtimeCSG.asmdef or a text document.

#334 and #335 fixes:

  • UNITY_EDITOR define was added to the define constraints of RealtimeCSG.asmdef, and compatible platforms were defined, which fixes player builds failing due to editor classes included in build.

Other changes:

… is moved from Assets/Plugins

a data generator was used to create EmbeddedAssets. To update any icons should the need arise, one would just simply run the generator again to update it. (see Icon2EmbeddedAssetUtility). Icon2EmbeddedAssetUtility should(tm) find the correct folder automatically when generating icons. All one needs to do is place the icons in the Resources/Icons folder
…enerating RP materials.

instead of using the shader name to generate folders, it now uses URP and HDRP respectively (based on the default shader present in the RP) when creating RP materials, to reduce folder structure depth. additionally, RCSG now uses an assembly definition, which is used to locate RCSG when locating assets.
@nukeandbeans nukeandbeans self-assigned this Mar 6, 2022
@LogicalError
Copy link
Owner

Sorry made some tiny modifications to 2 files, didn't notice your PR until after that

@nukeandbeans
Copy link
Collaborator Author

Sorry made some tiny modifications to 2 files, didn't notice your PR until after that

No worries! I'll just bring the changes over when I have time.

@nukeandbeans
Copy link
Collaborator Author

All merge conflicts were resolved. If all is good, then I'll go ahead and merge the changes + create a release.

Some paths were hardcoded to use `Assets/`. This fixes that, and should now function identically from `Assets/` or `Packages/`
fixed some wording that was incorrect
@nukeandbeans
Copy link
Collaborator Author

Just occurred to me that there should probably be a FAQs section in the readme. I'll add that in after work later today. Beyond that, that is all the things I can think of that needed fixing or adding, unless someone else brings something up.

@nukeandbeans
Copy link
Collaborator Author

Trying this PR in an actual project seems to cause an extended load time, that seems to go on infinitely (freezes the editor basically). I'm looking into changing how MaterialUtility.CreateRenderPipelineVersionOfDefaultMaterial(Material, string) handles getting paths for things, as it appears that finding directories or files is extremely slow with a lot of folders (sensible). Due to this, I'm going to mark this PR as a draft until I can fully fix this problem. Additionally, it appears to not work as a local package (cannot find folder), and I'm hoping that fixing the above will also fix that.

@nukeandbeans nukeandbeans marked this pull request as draft March 11, 2022 07:13
@nukeandbeans
Copy link
Collaborator Author

Farther digging provides that the hang is related to render pipelines and material generation. Looking into how to fix this.

@nukeandbeans
Copy link
Collaborator Author

Last commit should hopefully fix the aforementioned material generation issue and allow RCSG to work with RPs properly, again.

@nukeandbeans nukeandbeans marked this pull request as ready for review March 22, 2022 17:12
@nukeandbeans nukeandbeans merged commit 904fc06 into LogicalError:master Mar 23, 2022
@nukeandbeans nukeandbeans deleted the fix-player-build branch April 14, 2022 22:40
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.

Latest update using .asmdef breaks monobehavior components
3 participants