Browse Source
Input: remove unused stuff & clean up
Input: remove unused stuff & clean up
1. removed zl, zr and c-stick from HID::PadState. They are handled by IR, not HID 2. removed button handling in EmuWindow 3. removed key_map 4. cleanup #includence_cpp
wwylele
9 years ago
9 changed files with 3 additions and 412 deletions
-
1src/citra_qt/bootmanager.cpp
-
2src/core/CMakeLists.txt
-
26src/core/frontend/emu_window.cpp
-
52src/core/frontend/emu_window.h
-
152src/core/frontend/key_map.cpp
-
93src/core/frontend/key_map.h
-
34src/core/hle/service/hid/hid.h
-
54src/core/settings.h
-
1src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@ -1,152 +0,0 @@ |
|||
// Copyright 2014 Citra Emulator Project
|
|||
// Licensed under GPLv2 or any later version
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include <map>
|
|||
#include "core/frontend/emu_window.h"
|
|||
#include "core/frontend/key_map.h"
|
|||
|
|||
namespace KeyMap { |
|||
|
|||
// TODO (wwylele): currently we treat c-stick as four direction buttons
|
|||
// and map it directly to EmuWindow::ButtonPressed.
|
|||
// It should go the analog input way like circle pad does.
|
|||
const std::array<KeyTarget, Settings::NativeInput::NUM_INPUTS> mapping_targets = {{ |
|||
Service::HID::PAD_A, |
|||
Service::HID::PAD_B, |
|||
Service::HID::PAD_X, |
|||
Service::HID::PAD_Y, |
|||
Service::HID::PAD_L, |
|||
Service::HID::PAD_R, |
|||
Service::HID::PAD_ZL, |
|||
Service::HID::PAD_ZR, |
|||
Service::HID::PAD_START, |
|||
Service::HID::PAD_SELECT, |
|||
Service::HID::PAD_NONE, |
|||
Service::HID::PAD_UP, |
|||
Service::HID::PAD_DOWN, |
|||
Service::HID::PAD_LEFT, |
|||
Service::HID::PAD_RIGHT, |
|||
Service::HID::PAD_C_UP, |
|||
Service::HID::PAD_C_DOWN, |
|||
Service::HID::PAD_C_LEFT, |
|||
Service::HID::PAD_C_RIGHT, |
|||
|
|||
IndirectTarget::CirclePadUp, |
|||
IndirectTarget::CirclePadDown, |
|||
IndirectTarget::CirclePadLeft, |
|||
IndirectTarget::CirclePadRight, |
|||
IndirectTarget::CirclePadModifier, |
|||
}}; |
|||
|
|||
static std::map<HostDeviceKey, KeyTarget> key_map; |
|||
static int next_device_id = 0; |
|||
|
|||
static bool circle_pad_up = false; |
|||
static bool circle_pad_down = false; |
|||
static bool circle_pad_left = false; |
|||
static bool circle_pad_right = false; |
|||
static bool circle_pad_modifier = false; |
|||
|
|||
static void UpdateCirclePad(EmuWindow& emu_window) { |
|||
constexpr float SQRT_HALF = 0.707106781f; |
|||
int x = 0, y = 0; |
|||
|
|||
if (circle_pad_right) |
|||
++x; |
|||
if (circle_pad_left) |
|||
--x; |
|||
if (circle_pad_up) |
|||
++y; |
|||
if (circle_pad_down) |
|||
--y; |
|||
|
|||
float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0f; |
|||
emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0f : SQRT_HALF), |
|||
y * modifier * (x == 0 ? 1.0f : SQRT_HALF)); |
|||
} |
|||
|
|||
int NewDeviceId() { |
|||
return next_device_id++; |
|||
} |
|||
|
|||
void SetKeyMapping(HostDeviceKey key, KeyTarget target) { |
|||
key_map[key] = target; |
|||
} |
|||
|
|||
void ClearKeyMapping(int device_id) { |
|||
auto iter = key_map.begin(); |
|||
while (iter != key_map.end()) { |
|||
if (iter->first.device_id == device_id) |
|||
key_map.erase(iter++); |
|||
else |
|||
++iter; |
|||
} |
|||
} |
|||
|
|||
void PressKey(EmuWindow& emu_window, HostDeviceKey key) { |
|||
auto target = key_map.find(key); |
|||
if (target == key_map.end()) |
|||
return; |
|||
|
|||
if (target->second.direct) { |
|||
emu_window.ButtonPressed({{target->second.target.direct_target_hex}}); |
|||
} else { |
|||
switch (target->second.target.indirect_target) { |
|||
case IndirectTarget::CirclePadUp: |
|||
circle_pad_up = true; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadDown: |
|||
circle_pad_down = true; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadLeft: |
|||
circle_pad_left = true; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadRight: |
|||
circle_pad_right = true; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadModifier: |
|||
circle_pad_modifier = true; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
} |
|||
} |
|||
} |
|||
|
|||
void ReleaseKey(EmuWindow& emu_window, HostDeviceKey key) { |
|||
auto target = key_map.find(key); |
|||
if (target == key_map.end()) |
|||
return; |
|||
|
|||
if (target->second.direct) { |
|||
emu_window.ButtonReleased({{target->second.target.direct_target_hex}}); |
|||
} else { |
|||
switch (target->second.target.indirect_target) { |
|||
case IndirectTarget::CirclePadUp: |
|||
circle_pad_up = false; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadDown: |
|||
circle_pad_down = false; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadLeft: |
|||
circle_pad_left = false; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadRight: |
|||
circle_pad_right = false; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
case IndirectTarget::CirclePadModifier: |
|||
circle_pad_modifier = false; |
|||
UpdateCirclePad(emu_window); |
|||
break; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -1,93 +0,0 @@ |
|||
// Copyright 2014 Citra Emulator Project |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include <array> |
|||
#include <tuple> |
|||
#include "core/hle/service/hid/hid.h" |
|||
|
|||
class EmuWindow; |
|||
|
|||
namespace KeyMap { |
|||
|
|||
/** |
|||
* Represents key mapping targets that are not real 3DS buttons. |
|||
* They will be handled by KeyMap and translated to 3DS input. |
|||
*/ |
|||
enum class IndirectTarget { |
|||
CirclePadUp, |
|||
CirclePadDown, |
|||
CirclePadLeft, |
|||
CirclePadRight, |
|||
CirclePadModifier, |
|||
}; |
|||
|
|||
/** |
|||
* Represents a key mapping target. It can be a PadState that represents real 3DS buttons, |
|||
* or an IndirectTarget. |
|||
*/ |
|||
struct KeyTarget { |
|||
bool direct; |
|||
union { |
|||
u32 direct_target_hex; |
|||
IndirectTarget indirect_target; |
|||
} target; |
|||
|
|||
KeyTarget() : direct(true) { |
|||
target.direct_target_hex = 0; |
|||
} |
|||
|
|||
KeyTarget(Service::HID::PadState pad) : direct(true) { |
|||
target.direct_target_hex = pad.hex; |
|||
} |
|||
|
|||
KeyTarget(IndirectTarget i) : direct(false) { |
|||
target.indirect_target = i; |
|||
} |
|||
}; |
|||
|
|||
/** |
|||
* Represents a key for a specific host device. |
|||
*/ |
|||
struct HostDeviceKey { |
|||
int key_code; |
|||
int device_id; ///< Uniquely identifies a host device |
|||
|
|||
bool operator<(const HostDeviceKey& other) const { |
|||
return std::tie(key_code, device_id) < std::tie(other.key_code, other.device_id); |
|||
} |
|||
|
|||
bool operator==(const HostDeviceKey& other) const { |
|||
return std::tie(key_code, device_id) == std::tie(other.key_code, other.device_id); |
|||
} |
|||
}; |
|||
|
|||
extern const std::array<KeyTarget, Settings::NativeInput::NUM_INPUTS> mapping_targets; |
|||
|
|||
/** |
|||
* Generates a new device id, which uniquely identifies a host device within KeyMap. |
|||
*/ |
|||
int NewDeviceId(); |
|||
|
|||
/** |
|||
* Maps a device-specific key to a target (a PadState or an IndirectTarget). |
|||
*/ |
|||
void SetKeyMapping(HostDeviceKey key, KeyTarget target); |
|||
|
|||
/** |
|||
* Clears all key mappings belonging to one device. |
|||
*/ |
|||
void ClearKeyMapping(int device_id); |
|||
|
|||
/** |
|||
* Maps a key press action and call the corresponding function in EmuWindow |
|||
*/ |
|||
void PressKey(EmuWindow& emu_window, HostDeviceKey key); |
|||
|
|||
/** |
|||
* Maps a key release action and call the corresponding function in EmuWindow |
|||
*/ |
|||
void ReleaseKey(EmuWindow& emu_window, HostDeviceKey key); |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue