forked from dolphin-emu/dolphin
e1bbda1e18
Looking at the old code for the ButtonManager was a brainfsck. This fixes a ton of bugs I kept uncovering as I was moving along. Fixes the gamepad configuration file being incorrect. No longer treats touchscreen in a special way. Ends up as a regular device with a "Touchscreen" device name. Was incorrectly converting a index from integer to ButtonType. Wouldn't work due to the addition of some unused(in JNI) enumerators in ButtonType. Fixes an issue where a map had a key as an axis which was causing its binding to be overwritten for every axis that was used twice (eg main stick left and right); Fixes Triggers not working at all. Fixes DPad not working at all. Fixes C-Stick only half working. Removes touch screen specific nativelibrary types onTouchAxisEvent and onTouchEvent. Adds a configuration version configuration option. Allows easy configuration overwriting if the options need to be changed during updating. Supersedes github PR #291.
83 lines
2.4 KiB
C++
83 lines
2.4 KiB
C++
// Copyright 2013 Dolphin Emulator Project
|
|
// Licensed under GPLv2
|
|
// Refer to the license.txt file included.
|
|
|
|
#include "InputCommon/ControllerInterface/Android/Android.h"
|
|
|
|
namespace ciface
|
|
{
|
|
|
|
namespace Android
|
|
{
|
|
|
|
void Init( std::vector<Core::Device*>& devices )
|
|
{
|
|
devices.push_back(new Touchscreen(0));
|
|
devices.push_back(new Touchscreen(1));
|
|
devices.push_back(new Touchscreen(2));
|
|
devices.push_back(new Touchscreen(3));
|
|
}
|
|
|
|
// Touchscreens and stuff
|
|
std::string Touchscreen::GetName() const
|
|
{
|
|
return "Touchscreen";
|
|
}
|
|
|
|
std::string Touchscreen::GetSource() const
|
|
{
|
|
return "Android";
|
|
}
|
|
|
|
int Touchscreen::GetId() const
|
|
{
|
|
return 0;
|
|
}
|
|
Touchscreen::Touchscreen(int padID)
|
|
: _padID(padID)
|
|
{
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_A));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_B));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_START));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_X));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_Y));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_Z));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_UP));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_DOWN));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_LEFT));
|
|
AddInput(new Button(_padID, ButtonManager::BUTTON_RIGHT));
|
|
AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_LEFT), new Axis(_padID, ButtonManager::STICK_MAIN_RIGHT));
|
|
AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_UP), new Axis(_padID, ButtonManager::STICK_MAIN_DOWN));
|
|
AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_LEFT), new Axis(_padID, ButtonManager::STICK_C_RIGHT));
|
|
AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_UP), new Axis(_padID, ButtonManager::STICK_C_DOWN));
|
|
AddAnalogInputs(new Axis(_padID, ButtonManager::TRIGGER_L), new Axis(_padID, ButtonManager::TRIGGER_L));
|
|
AddAnalogInputs(new Axis(_padID, ButtonManager::TRIGGER_R), new Axis(_padID, ButtonManager::TRIGGER_R));
|
|
}
|
|
// Buttons and stuff
|
|
|
|
std::string Touchscreen::Button::GetName() const
|
|
{
|
|
std::ostringstream ss;
|
|
ss << "Button " << (int)_index;
|
|
return ss.str();
|
|
}
|
|
|
|
ControlState Touchscreen::Button::GetState() const
|
|
{
|
|
return ButtonManager::GetButtonPressed(_padID, _index);
|
|
}
|
|
std::string Touchscreen::Axis::GetName() const
|
|
{
|
|
std::ostringstream ss;
|
|
ss << "Axis " << (int)_index;
|
|
return ss.str();
|
|
}
|
|
|
|
ControlState Touchscreen::Axis::GetState() const
|
|
{
|
|
return ButtonManager::GetAxisValue(_padID, _index) * _neg;
|
|
}
|
|
|
|
}
|
|
}
|