izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adds better support for the tas input.

Browse Source
This commit is contained in:
unknown
2012-05-26 13:21:29 +10:00
committed by skidau
parent 9ea8d54343
commit 873437d58a
3 changed files with 724 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/Src/Frame.cpp
+1 -1
View File
@@ -950,7 +950,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
else
{
unsigned int i = NUM_HOTKEYS;
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->HasFocus())
{
for (i = 0; i < NUM_HOTKEYS; i++)
{
Source/Core/DolphinWX/Src/TASInputDlg.cpp
+704 -16
View File
File diff suppressed because it is too large Load Diff
Source/Core/DolphinWX/Src/TASInputDlg.h
+19 -2
View File
@@ -37,10 +37,19 @@ class TASInputDlg : public wxDialog
void OnCloseWindow(wxCloseEvent& event);
void UpdateFromSliders(wxCommandEvent& event);
void UpdateFromText(wxCommandEvent& event);
void OnMouseUpL(wxMouseEvent& event);
void OnMouseUpR(wxMouseEvent& event);
void ResetValues();
void GetValues(SPADStatus *PadStatus, int controllerID);
void TASInputDlg::SetTurbo(wxMouseEvent& event);
void TASInputDlg::SetTurboFalse(wxMouseEvent& event);
void TASInputDlg::ButtonTurbo();
void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus);
bool TASInputDlg::TextBoxHasFocus();
bool HasFocus();
wxBitmap CreateStickBitmap(int x, int y);
private:
u8 mainX, mainY, cX, cY, lTrig, rTrig;
@@ -71,13 +80,21 @@ class TASInputDlg : public wxDialog
ID_L,
ID_R,
ID_START,
ID_MAIN_STICK,
ID_C_STICK,
};
wxSlider *wx_mainX_s, *wx_mainY_s, *wx_cX_s, *wx_cY_s, *wx_l_s, *wx_r_s;
wxCheckBox *wx_up_button, *wx_down_button, *wx_left_button, *wx_right_button, *wx_a_button, *wx_b_button, *wx_x_button, *wx_y_button, *wx_l_button, *wx_r_button, *wx_z_button, *wx_start_button;
wxTextCtrl *wx_mainX_t, *wx_mainY_t, *wx_cX_t, *wx_cY_t, *wx_l_t, *wx_r_t;
wxMemoryDC dc_main, dc_c;
wxStaticBitmap* static_bitmap_main, *static_bitmap_c;
wxBitmap bitmap;
bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo;
bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, R_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont;
int xaxis,yaxis,c_xaxis,c_yaxis,update,update_axis;
DECLARE_EVENT_TABLE();
};
#endif
#endif