Skip to content

support deck gyro #5920

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

Draft
briaguya0 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

support deck gyro #5920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libultraship
Open in desktop
Submodule libultraship updated 2 files
+2 −0 cmake/cvars.cmake
+8 −0 src/libultraship/libultra/os.cpp
24 changes: 24 additions & 0 deletions soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,20 @@ void SohInputEditorWindow::DrawDpadControlPanel() {
Ship::GuiWindow::EndGroupPanel(0);
}

void SohInputEditorWindow::DrawAdvancedControlPanel() {
ImVec2 cursor = ImGui::GetCursorPos();
ImGui::SetCursorPos(ImVec2(cursor.x + 5, cursor.y + 5));
Ship::GuiWindow::BeginGroupPanel("Advanced Options", ImGui::GetContentRegionAvail());

CVarCheckbox("Disable Steam virtual gamepad", CVAR_CONTROLLER_DISABLE_STEAM_VIRTUAL_GAMEPAD,
CheckboxOptions()
.Color(THEME_COLOR)
.DefaultValue(false)
.Tooltip("Requires Restart. Must be checked for Steam Deck gyro."));

Ship::GuiWindow::EndGroupPanel(0);
}

void SohInputEditorWindow::DrawDeviceToggles(uint8_t portIndex) {
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);

Expand Down Expand Up @@ -1680,6 +1694,16 @@ void SohInputEditorWindow::DrawLinkTab() {
ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
}

if (ImGui::CollapsingHeader("Advanced Options")) {
ImGui::PopStyleColor();
ImGui::PopStyleColor();
ImGui::PopStyleColor();
DrawAdvancedControlPanel();
ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.133f, 0.133f, 0.133f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
}

ImGui::PopStyleColor();
ImGui::PopStyleColor();
ImGui::PopStyleColor();
Expand Down
1 change: 1 addition & 0 deletions soh/soh/Enhancements/controls/SohInputEditorWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class SohInputEditorWindow final : public Ship::GuiWindow {
void DrawOcarinaControlPanel();
void DrawCameraControlPanel();
void DrawDpadControlPanel();
void DrawAdvancedControlPanel();

int32_t mGameInputBlockTimer;
int32_t mMappingInputBlockTimer;
Expand Down
Loading