archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-04 14:01:17 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

first push

Browse source
This commit is contained in:
Gordie Schiebel 2022-09-07 04:10:06 -04:00
parent e20bfd00ec
commit d27f4ab081
2 changed files with 63 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/gui/MainWindow.cpp
View file

@ -1303,7 +1303,16 @@ void MainWindow::OnMouseMove(wxMouseEvent& event)
m_last_mouse_move_time = std::chrono::steady_clock::now(); m_last_mouse_move_time = std::chrono::steady_clock::now();
m_mouse_position = wxGetMousePosition(); m_mouse_position = wxGetMousePosition();
if (GetKeyState(VK_F1) & 1 && !(GetKeyState(VK_TAB) & 0x8000))
{
ShowCursor(false);
}
else
{
ShowCursor(true); ShowCursor(true);
}
auto& instance = InputManager::instance(); auto& instance = InputManager::instance();
std::unique_lock lock(instance.m_main_mouse.m_mutex); std::unique_lock lock(instance.m_main_mouse.m_mutex);
@ -1749,7 +1758,16 @@ void MainWindow::OnTimer(wxTimerEvent& event)
{ {
m_last_mouse_move_time = std::chrono::steady_clock::now(); m_last_mouse_move_time = std::chrono::steady_clock::now();
m_mouse_position = mouse_position; m_mouse_position = mouse_position;
if (GetKeyState(VK_F1) & 1 && !(GetKeyState(VK_TAB) & 0x8000))
{
ShowCursor(false);
}
else
{
ShowCursor(true); ShowCursor(true);
}
return; return;
} }

54
src/input/emulated/VPADController.cpp
View file

@ -69,8 +69,22 @@ void VPADController::VPADRead(VPADStatus_t& status, const BtnRepeat& repeat)
continue; continue;
} }
status.hold |= value; status.hold |= value;
} }
if (GetKeyState(VK_F1) & 1 && !(GetKeyState(VK_TAB) & 0x8000))
{
if (i == kButtonId_ZR && (GetKeyState(MK_LBUTTON) & 0x8000))
{
status.hold |= VPAD_ZR;
}
else if (i == kButtonId_R && (GetKeyState(MK_RBUTTON) & 0x8000))
{
status.hold |= VPAD_R;
}
}
} }
m_homebutton_down |= is_home_down(); m_homebutton_down |= is_home_down();
@ -133,7 +147,10 @@ void VPADController::VPADRead(VPADStatus_t& status, const BtnRepeat& repeat)
m_last_holdvalue = status.hold; m_last_holdvalue = status.hold;
// touch // touch
if (!GetKeyState(VK_F1) & 1 || (GetKeyState(VK_TAB) & 0x8000))
{
update_touch(status); update_touch(status);
}
// motion // motion
status.dir.x = {1, 0, 0}; status.dir.x = {1, 0, 0};
@ -233,6 +250,9 @@ void VPADController::update_touch(VPADStatus_t& status)
status.tpProcessed2 = status.tpData; status.tpProcessed2 = status.tpData;
} }
float oldPosX, oldPosY = 0;
float wx, wy = 0;
void VPADController::update_motion(VPADStatus_t& status) void VPADController::update_motion(VPADStatus_t& status)
{ {
if (has_motion()) if (has_motion())
@ -280,25 +300,33 @@ void VPADController::update_motion(VPADStatus_t& status)
bool pad_view; bool pad_view;
auto& input_manager = InputManager::instance(); auto& input_manager = InputManager::instance();
if (const auto right_mouse = input_manager.get_right_down_mouse_info(&pad_view)) const float sensitivity = 1;
if (GetKeyState(VK_F1) & 1 && !(GetKeyState(VK_TAB) & 0x8000))
{ {
const Vector2<float> mousePos(right_mouse->x, right_mouse->y); //auto mouse = input_manager.get_mouse_position(false);
int w, h; //Vector2<float> mousePos(mouse.x, mouse.y);
if (pad_view)
gui_getPadWindowSize(&w, &h);
else
gui_getWindowSize(&w, &h);
float wx = mousePos.x / w;
float wy = mousePos.y / h; POINT mousePos;
GetCursorPos(&mousePos);
float width = GetSystemMetrics(SM_CXSCREEN) / 2;
float height = GetSystemMetrics(SM_CYSCREEN) / 2;
wx += (mousePos.x) - width;
wy += (mousePos.y) - height;
static glm::vec3 m_lastGyroRotation{}, m_startGyroRotation{}; static glm::vec3 m_lastGyroRotation{}, m_startGyroRotation{};
static bool m_startGyroRotationSet{}; static bool m_startGyroRotationSet{};
float rotX = (wy * 2 - 1.0f) * 135.0f; // up/down best float rotX = (wy * 0.05) * 1; // up/down best
float rotY = (wx * 2 - 1.0f) * -180.0f; // left/right float rotY = (wx * -0.1) * 1; // left/right
float rotZ = input_manager.m_mouse_wheel * 14.0f + m_lastGyroRotation.z; float rotZ = 0; //input_manager.m_mouse_wheel * 14.0f + m_lastGyroRotation.z;
input_manager.m_mouse_wheel = 0.0f; input_manager.m_mouse_wheel = 0.0f;
if (!m_startGyroRotationSet) if (!m_startGyroRotationSet)
@ -348,6 +376,8 @@ void VPADController::update_motion(VPADStatus_t& status)
status.accXY = {1.0f, 0.0f}; status.accXY = {1.0f, 0.0f};
m_lastGyroRotation = {rotX, rotY, rotZ}; m_lastGyroRotation = {rotX, rotY, rotZ};
SetCursorPos(width, height);
} }
} }