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.

Sign up for GitHub

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

Jump to bottom

Remove almost all uses of Experimental Mode, and combine Monoscopic into the main releases #674

Merged
merged 72 commits into from
Apr 7, 2024
Merged

Remove almost all uses of Experimental Mode, and combine Monoscopic into the main releases #674

merged 72 commits into from
Apr 7, 2024

Conversation

andybak
Copy link
Contributor

@andybak andybak commented Apr 4, 2024 •
edited
Loading

#620 and #644 needed testing together before merging to main so I made a new PR that replaces them both.

Almost all uses of Experimental Mode removed

  • STL/WRL exports still use the flag. Import/export improvements #573 fixes this
  • The experimental setting still handles brushes - this essentially makes the setting an "experimental brush" setting

Monoscopic Mode is now integrated into the main build

  • Monoscopic mode is now built into the main release, and can be enabled by setting "EnableMonoscopicMode": true in the "Flags" section of the Open Brush.cfg file
  • Make monoscopic a config file setting
  • Allow XR SDK initialisation to be disabled via a config file setting (so the app launches into Sketch Viewer Mode)
  • UI improvements to Sketch Viewer Mode
  • Fix some bugs/inconsistencies in settings and help UI

New config file settings:

Flags/AdvancedKeyboardShortcuts
Flags/SkipIntro
Flags/EnableMonoscopicMode
Flags/DisableXrMode

@andybak
No need for experimental watermark any more
b5a27c5
@andybak
Brush replacement seems like an odd thing to tie to experimental mode…
49434be 
…. Make it an editor-only change.
@andybak
Promote the alternate gif modes to regular features
f43c654
@andybak
remove dead "jogging mode" code
b25764b
@andybak
Dead code for USD intro scene that doesn't exist any more
7f09f4d
@andybak
Make SkipIntro into a user setting
bd25df5
@andybak
No need to gatekeep USD import. Either it works or it doesn't
55faeb5
@andybak
Pretty sure this makes sense. There's no way to create non-batched st…
eb35114 
…rokes unless the main config switch is off
@andybak
Probably not worth keeping - might relate to skipping intro? Easy to …
cc2e8e6 
…fix if so.
@andybak
Move previous experimental mode shortcuts into a user config controll…
36ad0a8 
…ed mode.

Also remove some dead code from "ExportAll" which we removed in 2.4
@andybak
Moving the button to Labs so also move the related code
92d2674
@andybak
Remove an experimental guard that doesn't make a difference as there'…
0eb0ee2 
…s no way to trigger the command
@andybak
Allow all color picker modes that were previously experimental
c027a61
@andybak
Fixes a possible NRE
fdce3e5
@andybak
Probably safe to enable this now
97aed15
@andybak
I've never noticed the presence or absence of this. Let's enable it a…
4f0450e 
…nd get feedback
@andybak
Always show experimental buttons
840829f
@andybak
Dead code
b39d2d0
@andybak
Keep this code for reference but never execute it
6ce53a0
@andybak
More dead code
751ddae
@andybak
Move experimental buttons to labs. Hide twitch, youtube and poly buttons
d08d1ec
@andybak
Merge remote-tracking branch 'upstream/main' into feature/experimenta…
baed680 
…l-begone
@andybak
Update text for the experimental mode button as it now only effects b…
f248b7b 
…rushes
@andybak
Attempt at allowing monoscopic mode in any build
bcb42bb 
Also allow forcing 2d view-only mode even if headset is detected
[CI BUILD]
@andybak
Remove build window code for monoscopic builds
838b99f 
[CI BUILD]
@andybak
Don't init SDK on start. Move init logic to VrSdk
41d662b 
[CI BUILD]
@andybak
Merge branch 'main' into feature/monoscopic-for-all-builds
5ff3ce4
@andybak
Merge remote-tracking branch 'upstream/main' into feature/experimenta…
b6d1561 
…l-begone
@andybak
Keyboard overrides for vr and mono modes during launch
b2e99a6 
[CI BUILD]
@andybak
Merge branch 'main' into feature/monoscopic-for-all-builds
14d8502
@mikeage
Copy link
Member

mikeage commented Apr 4, 2024

From a merge POV, this looks good. I'm also happy with the monoscopic part. I didn't review the experimental side

@mikeage mikeage added the enhancement Feature added label Apr 4, 2024
@mikeage mikeage changed the title Merge PR of #620 and #644 Remove almost all uses of Experimental Mode, and combine Monoscopic into the main releases Apr 4, 2024
andybak and others added 15 commits April 4, 2024 16:11
@andybak
We can use the same help pop up for desktop and mobile. No need to wa…
91cbcdf 
…rn people about quitting open brush
@andybak
Fixes a harmless error
32cea3b
@andybak
This wasn't fixed during the localisation
f7d2c50
@andybak
Fix help popup on desktop
23cd9a1
@andybak
Clean up unused panel map options
1e46b34
@andybak
Center help popup on button
623fb14
@andybak
Merge branch 'main' into feature/no-experimental-and-monoscopic-merged
3783c01
@andybak
Still trying to fix the help popup which is broken only in builds.
9e9aebe
@mikeage
no change, just to trigger a build
de6149d
@andybak
Swap the button commands just to see if it helps shed some light the …
e9f3b09 
…popup bug
@andybak
Merge branch 'feature/no-experimental-and-monoscopic-merged' of https…
40f9d9d 
…://github.com/icosa-foundation/open-brush into feature/no-experimental-and-monoscopic-merged
@andybak
Revert "Swap the button commands just to see if it helps shed some li…
45a648e 
…ght the popup bug"

This reverts commit e9f3b09.
@andybak
swap the popup prefab references this time
51a1498
@andybak
Revert "swap the popup prefab references this time"
e3d98dd 
This reverts commit 51a1498.
@andybak
Try swapping out the popup prefab for dup
40d249f
@andybak andybak merged commit 5c3b945 into main Apr 7, 2024
42 checks passed
@mikeage mikeage deleted the feature/no-experimental-and-monoscopic-merged branch April 7, 2024 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikeage mikeage Awaiting requested review from mikeage

@mikeskydev mikeskydev Awaiting requested review from mikeskydev

Assignees
No one assigned
Labels
enhancement Feature added
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@andybak @mikeage