godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Rename remaining WinRT references to UWP

Browse Source
This commit is contained in:
George Marques
2016-11-02 19:22:49 -02:00
parent b113c7b7a3
commit 411faaa6f4
18 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
platform/uwp/joystick_uwp.cpp
View File

@@ -32,15 +32,15 @@
using namespace Windows::Gaming::Input;
using namespace Windows::Foundation;
void JoystickWinrt::register_events() {
void JoystickUWP::register_events() {
Gamepad::GamepadAdded +=
ref new EventHandler<Gamepad^>(this, &JoystickWinrt::OnGamepadAdded);
ref new EventHandler<Gamepad^>(this, &JoystickUWP::OnGamepadAdded);
Gamepad::GamepadRemoved +=
ref new EventHandler<Gamepad^>(this, &JoystickWinrt::OnGamepadRemoved);
ref new EventHandler<Gamepad^>(this, &JoystickUWP::OnGamepadRemoved);
}
uint32_t JoystickWinrt::process_controllers(uint32_t p_last_id) {
uint32_t JoystickUWP::process_controllers(uint32_t p_last_id) {
for (int i = 0; i < MAX_CONTROLLERS; i++) {
@@ -74,20 +74,20 @@ uint32_t JoystickWinrt::process_controllers(uint32_t p_last_id) {
return p_last_id;
}
JoystickWinrt::JoystickWinrt() {
JoystickUWP::JoystickUWP() {
for (int i = 0; i < MAX_CONTROLLERS; i++)
controllers[i].id = i;
}
JoystickWinrt::JoystickWinrt(InputDefault * p_input) {
JoystickUWP::JoystickUWP(InputDefault * p_input) {
input = p_input;
JoystickWinrt();
JoystickUWP();
}
void JoystickWinrt::OnGamepadAdded(Platform::Object ^ sender, Windows::Gaming::Input::Gamepad ^ value) {
void JoystickUWP::OnGamepadAdded(Platform::Object ^ sender, Windows::Gaming::Input::Gamepad ^ value) {
short idx = -1;
@@ -106,10 +106,10 @@ void JoystickWinrt::OnGamepadAdded(Platform::Object ^ sender, Windows::Gaming::I
controllers[idx].id = idx;
controllers[idx].type = ControllerType::GAMEPAD_CONTROLLER;
input->joy_connection_changed(controllers[idx].id, true, "Xbox Controller", "__WINRT_GAMEPAD__");
input->joy_connection_changed(controllers[idx].id, true, "Xbox Controller", "__UWP_GAMEPAD__");
}
void JoystickWinrt::OnGamepadRemoved(Platform::Object ^ sender, Windows::Gaming::Input::Gamepad ^ value) {
void JoystickUWP::OnGamepadRemoved(Platform::Object ^ sender, Windows::Gaming::Input::Gamepad ^ value) {
short idx = -1;
@@ -136,7 +136,7 @@ void JoystickWinrt::OnGamepadRemoved(Platform::Object ^ sender, Windows::Gaming:
input->joy_connection_changed(idx, false, "Xbox Controller");
}
InputDefault::JoyAxis JoystickWinrt::axis_correct(double p_val, bool p_negate, bool p_trigger) const {
InputDefault::JoyAxis JoystickUWP::axis_correct(double p_val, bool p_negate, bool p_trigger) const {
InputDefault::JoyAxis jx;