piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start to make possible use of "full analog surface". (useful for triggers on some silly physical gamepads)

Browse Source
This commit is contained in:
Jordan Woyak 2013-01-17 15:40:44 -06:00
parent 69c91a20ea
commit 38b01d176a
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
View File

@ -461,7 +461,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
i = device->Inputs().begin(), i = device->Inputs().begin(),
e = device->Inputs().end(); e = device->Inputs().end();
for (std::vector<bool>::iterator state = states.begin(); i != e; ++i) for (std::vector<bool>::iterator state = states.begin(); i != e; ++i)
*state++ = ((*i)->GetState() > INPUT_DETECT_THRESHOLD); *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD));
while (time < ms) while (time < ms)
{ {
@ -477,7 +477,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
if (false == *state) if (false == *state)
return *i; return *i;
} }
else else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD))
*state = false; *state = false;
} }
Common::SleepCurrentThread(10); time += 10; Common::SleepCurrentThread(10); time += 10;

32
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
View File

@ -87,7 +87,7 @@ public:
Input* ToInput() { return this; } Input* ToInput() { return this; }
}; };
// //
// Output // Output
// //
@ -122,6 +122,36 @@ public:
protected: protected:
void AddInput(Input* const i); void AddInput(Input* const i);
void AddOutput(Output* const o); void AddOutput(Output* const o);
class FullAnalogSurface : public Input
{
public:
FullAnalogSurface(Input* low, Input* high)
: m_low(*low), m_high(*high)
{}
ControlState GetState() const
{
return (1 + m_high.GetState() - m_low.GetState()) / 2;
}
std::string GetName() const
{
return m_low.GetName() + *m_high.GetName().rbegin();
}
private:
Input& m_low;
Input& m_high;
};
void AddAnalogInputs(Input* low, Input* high)
{
AddInput(low);
AddInput(high);
AddInput(new FullAnalogSurface(low, high));
AddInput(new FullAnalogSurface(high, low));
}
private: private:
std::vector<Input*> m_inputs; std::vector<Input*> m_inputs;