From 3f1ffbad0d02e3ac68d7d8e12adef12ea8db75a6 Mon Sep 17 00:00:00 2001 From: Rukai Date: Sun, 28 Jan 2018 00:35:02 +1100 Subject: Qt: Implement GC TAS input window --- Source/Core/DolphinQt2/MainWindow.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'Source/Core/DolphinQt2/MainWindow.cpp') diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 8b5e23bc6f..661fa2f83b 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -64,6 +64,7 @@ #include "DolphinQt2/QtUtils/WindowActivationEventFilter.h" #include "DolphinQt2/Resources.h" #include "DolphinQt2/Settings.h" +#include "DolphinQt2/TAS/GCTASInputWindow.h" #include "DolphinQt2/WiiUpdate.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" @@ -167,6 +168,14 @@ void MainWindow::CreateComponents() m_controllers_window = new ControllersWindow(this); m_settings_window = new SettingsWindow(this); + std::generate(m_gc_tas_input_windows.begin(), m_gc_tas_input_windows.end(), + [this] { return new GCTASInputWindow(this); }); + Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) { + m_gc_tas_input_windows[controller_id]->GetValues(pad_status); + }); + + // TODO: create wii input windows + m_hotkey_window = new MappingWindow(this, MappingWindow::Type::MAPPING_HOTKEYS, 0); m_log_widget = new LogWidget(this); @@ -249,6 +258,7 @@ void MainWindow::ConnectMenuBar() connect(m_menu_bar, &MenuBar::StartRecording, this, &MainWindow::OnStartRecording); connect(m_menu_bar, &MenuBar::StopRecording, this, &MainWindow::OnStopRecording); connect(m_menu_bar, &MenuBar::ExportRecording, this, &MainWindow::OnExportRecording); + connect(m_menu_bar, &MenuBar::ShowTASInput, this, &MainWindow::ShowTASInput); // View connect(m_menu_bar, &MenuBar::ShowList, m_game_list, &GameList::SetListView); @@ -1079,6 +1089,24 @@ void MainWindow::OnExportRecording() Movie::SaveRecording(dtm_file.toStdString()); } +void MainWindow::ShowTASInput() +{ + for (int i = 0; i < 4; i++) + { + if (SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_NONE && + SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_GC_GBA) + { + m_gc_tas_input_windows[i]->show(); + m_gc_tas_input_windows[i]->raise(); + m_gc_tas_input_windows[i]->activateWindow(); + m_gc_tas_input_windows[i]->setWindowTitle( + tr("TAS Input - Gamecube Controller %1").arg(i + 1)); + } + } + + // TODO: show wii input windows +} + void MainWindow::OnConnectWiiRemote(int id) { const auto ios = IOS::HLE::GetIOS(); -- cgit v1.2.3