commit
a01bd96d7d
|
@ -461,7 +461,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
|
|||
i = device->Inputs().begin(),
|
||||
e = device->Inputs().end();
|
||||
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)
|
||||
{
|
||||
|
@ -477,7 +477,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
|
|||
if (false == *state)
|
||||
return *i;
|
||||
}
|
||||
else
|
||||
else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD))
|
||||
*state = false;
|
||||
}
|
||||
Common::SleepCurrentThread(10); time += 10;
|
||||
|
|
|
@ -87,7 +87,7 @@ public:
|
|||
|
||||
Input* ToInput() { return this; }
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// Output
|
||||
//
|
||||
|
@ -122,6 +122,36 @@ public:
|
|||
protected:
|
||||
void AddInput(Input* const i);
|
||||
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:
|
||||
std::vector<Input*> m_inputs;
|
||||
|
|
|
@ -267,8 +267,8 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
|
|||
const LONG& ax = (&m_state_in.lX)[offset];
|
||||
|
||||
// each axis gets a negative and a positive input instance associated with it
|
||||
AddInput(new Axis(offset, ax, base, range.lMin-base));
|
||||
AddInput(new Axis(offset, ax, base, range.lMax-base));
|
||||
AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base),
|
||||
new Axis(offset, ax, base, range.lMax-base));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -64,8 +64,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
|
|||
AddInput(new Hat(e, m_device, Hat::down));
|
||||
AddInput(new Hat(e, m_device, Hat::left));
|
||||
} else {
|
||||
AddInput(new Axis(e, m_device, Axis::negative));
|
||||
AddInput(new Axis(e, m_device, Axis::positive));
|
||||
AddAnalogInputs(new Axis(e, m_device, Axis::negative),
|
||||
new Axis(e, m_device, Axis::positive));
|
||||
}
|
||||
}
|
||||
CFRelease(axes);
|
||||
|
|
|
@ -86,8 +86,8 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
|
|||
for (u8 i = 0; i != SDL_JoystickNumAxes(m_joystick); ++i)
|
||||
{
|
||||
// each axis gets a negative and a positive input instance associated with it
|
||||
AddInput(new Axis(i, m_joystick, -32768));
|
||||
AddInput(new Axis(i, m_joystick, 32767));
|
||||
AddAnalogInputs(new Axis(i, m_joystick, -32768),
|
||||
new Axis(i, m_joystick, 32767));
|
||||
}
|
||||
|
||||
#ifdef USE_SDL_HAPTIC
|
||||
|
|
Loading…
Reference in New Issue