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

Runtime switching of experimental mode #802

Merged
merged 3 commits into from
Dec 21, 2024

Conversation

andybak
Copy link
Contributor

@andybak andybak commented Dec 19, 2024

Allows switching experimental brushes on and off at runtime. This fixes a couple of issues:

  1. Errors loading sketches with experimental brushes in them
  2. Issues with multiplayer where experimental brush strokes wouldn't appears if a user had experimental brushes disabled.

Now - the mode switch only affects the brush panel UI. All brushes from both manifests are always loaded.

This also cleans up and refactors some stuff that remained from the experimental mode removal (brush remapping is active all the time as it doesn't do anything unless you explicitly use it)

After merging - one change will be needed to the multiplayer branch. In MultiplayerStrokeSerialization.cs line 97:

foreach (BrushDescriptor brush in App.Instance.m_Manifest.UniqueBrushes())

becomes

foreach (BrushDescriptor brush in App.Instance.FullManifest.UniqueBrushes())

Assets/Scripts/Config.cs Outdated Show resolved Hide resolved
Assets/Scripts/BrushCatalog.cs Outdated Show resolved Hide resolved
@andybak andybak merged commit cbb54d6 into main Dec 21, 2024
42 checks passed
@andybak andybak deleted the feature/runtime-experimental-brush-switching branch December 21, 2024 14:30
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.

2 participants