Cardboard VR: Add an on-screen VR OFF button. Enable Cardboard on iOS.
This commit is contained in:
parent
9b8533c936
commit
5dc9acf839
3 changed files with 19 additions and 4 deletions
|
@ -964,6 +964,11 @@ void EmuScreen::CreateViews() {
|
|||
if (g_Config.bShowDeveloperMenu) {
|
||||
root_->Add(new Button(dev->T("DevMenu")))->OnClick.Handle(this, &EmuScreen::OnDevTools);
|
||||
}
|
||||
|
||||
cardboardDisableButton_ = root_->Add(new Button(sc->T("Cardboard VR OFF"), new AnchorLayoutParams(bounds.centerX(), NONE, NONE, 30, true)));
|
||||
cardboardDisableButton_->OnClick.Handle(this, &EmuScreen::OnDisableCardboard);
|
||||
cardboardDisableButton_->SetVisibility(V_GONE);
|
||||
|
||||
saveStatePreview_ = new AsyncImageFileView("", IS_FIXED, nullptr, new AnchorLayoutParams(bounds.centerX(), 100, NONE, NONE, true));
|
||||
saveStatePreview_->SetFixedSize(160, 90);
|
||||
saveStatePreview_->SetColor(0x90FFFFFF);
|
||||
|
@ -1029,6 +1034,11 @@ UI::EventReturn EmuScreen::OnDevTools(UI::EventParams ¶ms) {
|
|||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
UI::EventReturn EmuScreen::OnDisableCardboard(UI::EventParams ¶ms) {
|
||||
g_Config.bEnableCardboard = false;
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
void EmuScreen::update() {
|
||||
UIScreen::update();
|
||||
|
||||
|
@ -1282,6 +1292,7 @@ void EmuScreen::render() {
|
|||
return;
|
||||
|
||||
if (hasVisibleUI()) {
|
||||
cardboardDisableButton_->SetVisibility(g_Config.bEnableCardboard ? UI::V_VISIBLE : UI::V_GONE);
|
||||
screenManager()->getUIContext()->BeginFrame();
|
||||
renderUI();
|
||||
}
|
||||
|
@ -1310,7 +1321,8 @@ bool EmuScreen::hasVisibleUI() {
|
|||
return true;
|
||||
if (!osm.IsEmpty() || g_Config.bShowTouchControls || g_Config.iShowFPSCounter != 0)
|
||||
return true;
|
||||
|
||||
if (g_Config.bEnableCardboard)
|
||||
return true;
|
||||
// Debug UI.
|
||||
if (g_Config.bShowDebugStats || g_Config.bShowDeveloperMenu || g_Config.bShowAudioDebug || g_Config.bShowFrameProfiler)
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue