diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 4c9858fc25..76f7035416 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -12,7 +12,8 @@ if(WIN32) ControllerInterface/DInput/DInputJoystick.cpp ControllerInterface/DInput/DInputKeyboardMouse.cpp ControllerInterface/SDL/SDL.cpp - ControllerInterface/XInput/XInput.cpp) + ControllerInterface/XInput/XInput.cpp + ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(SRCS ${SRCS} ControllerInterface/OSX/OSX.mm diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index a8d1ba53c8..89500b2b2f 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -14,30 +14,6 @@ namespace ciface namespace DInput { -// template instantiation -template class Joystick::Force; -template class Joystick::Force; -template class Joystick::Force; - -static const struct -{ - GUID guid; - const char* name; -} force_type_names[] = -{ - {GUID_ConstantForce, "Constant"}, // DICONSTANTFORCE - {GUID_RampForce, "Ramp"}, // DIRAMPFORCE - {GUID_Square, "Square"}, // DIPERIODIC ... - {GUID_Sine, "Sine"}, - {GUID_Triangle, "Triangle"}, - {GUID_SawtoothUp, "Sawtooth Up"}, - {GUID_SawtoothDown, "Sawtooth Down"}, - //{GUID_Spring, "Spring"}, // DICUSTOMFORCE ... < I think - //{GUID_Damper, "Damper"}, - //{GUID_Inertia, "Inertia"}, - //{GUID_Friction, "Friction"}, -}; - #define DATA_BUFFER_SIZE 32 //----------------------------------------------------------------------------- @@ -267,87 +243,11 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI } } - // TODO: check for DIDC_FORCEFEEDBACK in devcaps? - - // get supported ff effects + // force feedback std::list objects; - m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS); - // got some ff axes or something - if ( objects.size() ) + if (SUCCEEDED(m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS))) { - // temporary - DWORD rgdwAxes[2] = {DIJOFS_X, DIJOFS_Y}; - LONG rglDirection[2] = {-200, 0}; - - DIEFFECT eff; - ZeroMemory(&eff, sizeof(eff)); - eff.dwSize = sizeof(DIEFFECT); - eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; - eff.dwDuration = INFINITE; // (4 * DI_SECONDS) - eff.dwSamplePeriod = 0; - eff.dwGain = DI_FFNOMINALMAX; - eff.dwTriggerButton = DIEB_NOTRIGGER; - eff.dwTriggerRepeatInterval = 0; - eff.cAxes = std::min((DWORD)1, (DWORD)objects.size()); - eff.rgdwAxes = rgdwAxes; - eff.rglDirection = rglDirection; - - // DIPERIODIC is the largest, so we'll use that - DIPERIODIC f; - eff.lpvTypeSpecificParams = &f; - ZeroMemory(&f, sizeof(f)); - - // doesn't seem needed - //DIENVELOPE env; - //eff.lpEnvelope = &env; - //ZeroMemory(&env, sizeof(env)); - //env.dwSize = sizeof(env); - - for (unsigned int f = 0; f < sizeof(force_type_names)/sizeof(*force_type_names); ++f) - { - // ugly if ladder - if (0 == f) - { - DICONSTANTFORCE diCF = {-10000}; - diCF.lMagnitude = DI_FFNOMINALMAX; - eff.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); - eff.lpvTypeSpecificParams = &diCF; - } - else if (1 == f) - { - eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE); - } - else - { - eff.cbTypeSpecificParams = sizeof(DIPERIODIC); - } - - LPDIRECTINPUTEFFECT pEffect; - if (SUCCEEDED(m_device->CreateEffect(force_type_names[f].guid, &eff, &pEffect, NULL))) - { - m_state_out.push_back(EffectState(pEffect)); - - // ugly if ladder again :/ - if (0 == f) - AddOutput(new ForceConstant(f, m_state_out.back())); - else if (1 == f) - AddOutput(new ForceRamp(f, m_state_out.back())); - else - AddOutput(new ForcePeriodic(f, m_state_out.back())); - } - } - } - - // disable autocentering - if (Outputs().size()) - { - DIPROPDWORD dipdw; - dipdw.diph.dwSize = sizeof( DIPROPDWORD ); - dipdw.diph.dwHeaderSize = sizeof( DIPROPHEADER ); - dipdw.diph.dwObj = 0; - dipdw.diph.dwHow = DIPH_DEVICE; - dipdw.dwData = DIPROPAUTOCENTER_OFF; - m_device->SetProperty( DIPROP_AUTOCENTER, &dipdw.diph ); + InitForceFeedback(m_device, objects.size()); } ClearInputState(); @@ -355,14 +255,6 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI Joystick::~Joystick() { - // release the ff effect iface's - for (EffectState& state : m_state_out) - { - state.iface->Stop(); - state.iface->Unload(); - state.iface->Release(); - } - m_device->Unacquire(); m_device->Release(); } @@ -434,42 +326,6 @@ bool Joystick::UpdateInput() return SUCCEEDED(hr); } -bool Joystick::UpdateOutput() -{ - size_t ok_count = 0; - - DIEFFECT eff; - ZeroMemory(&eff, sizeof(eff)); - eff.dwSize = sizeof(DIEFFECT); - eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; - - for (EffectState& state : m_state_out) - { - if (state.params) - { - if (state.size) - { - eff.cbTypeSpecificParams = state.size; - eff.lpvTypeSpecificParams = state.params; - // set params and start effect - ok_count += SUCCEEDED(state.iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START)); - } - else - { - ok_count += SUCCEEDED(state.iface->Stop()); - } - - state.params = NULL; - } - else - { - ++ok_count; - } - } - - return (m_state_out.size() == ok_count); -} - // get name std::string Joystick::Button::GetName() const @@ -507,12 +363,6 @@ std::string Joystick::Hat::GetName() const return tmpstr; } -template -std::string Joystick::Force

::GetName() const -{ - return force_type_names[m_index].name; -} - // get / set state ControlState Joystick::Axis::GetState() const @@ -535,58 +385,5 @@ ControlState Joystick::Hat::GetState() const return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2); } -void Joystick::ForceConstant::SetState(const ControlState state) -{ - const LONG new_val = LONG(10000 * state); - - LONG &val = params.lMagnitude; - if (val != new_val) - { - val = new_val; - m_state.params = ¶ms; // tells UpdateOutput the state has changed - - // tells UpdateOutput to either start or stop the force - m_state.size = new_val ? sizeof(params) : 0; - } -} - -void Joystick::ForceRamp::SetState(const ControlState state) -{ - const LONG new_val = LONG(10000 * state); - - if (params.lStart != new_val) - { - params.lStart = params.lEnd = new_val; - m_state.params = ¶ms; // tells UpdateOutput the state has changed - - // tells UpdateOutput to either start or stop the force - m_state.size = new_val ? sizeof(params) : 0; - } -} - -void Joystick::ForcePeriodic::SetState(const ControlState state) -{ - const LONG new_val = LONG(10000 * state); - - DWORD &val = params.dwMagnitude; - if (val != new_val) - { - val = new_val; - //params.dwPeriod = 0;//DWORD(0.05 * DI_SECONDS); // zero is working fine for me - - m_state.params = ¶ms; // tells UpdateOutput the state has changed - - // tells UpdateOutput to either start or stop the force - m_state.size = new_val ? sizeof(params) : 0; - } -} - -template -Joystick::Force

::Force(u8 index, EffectState& state) - : m_index(index), m_state(state) -{ - ZeroMemory(¶ms, sizeof(params)); -} - } } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 6b6be58193..25fc745c8e 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -2,14 +2,7 @@ #define _CIFACE_DINPUT_JOYSTICK_H_ #include "../Device.h" - -#define DIRECTINPUT_VERSION 0x0800 -#define WIN32_LEAN_AND_MEAN -#define NOMINMAX -#include -#include - -#include +#include "../ForceFeedback/ForceFeedbackDevice.h" namespace ciface { @@ -18,18 +11,9 @@ namespace DInput void InitJoystick(IDirectInput8* const idi8, std::vector& devices, HWND hwnd); -class Joystick : public Core::Device +class Joystick : public ForceFeedback::ForceFeedbackDevice { private: - struct EffectState - { - EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {} - - LPDIRECTINPUTEFFECT iface; - void* params; // null when force hasn't changed - u8 size; // zero when force should stop - }; - class Button : public Input { public: @@ -64,25 +48,8 @@ private: const u8 m_index, m_direction; }; - template - class Force : public Output - { - public: - std::string GetName() const; - Force(u8 index, EffectState& state); - void SetState(ControlState state); - private: - EffectState& m_state; - P params; - const u8 m_index; - }; - typedef Force ForceConstant; - typedef Force ForceRamp; - typedef Force ForcePeriodic; - public: bool UpdateInput(); - bool UpdateOutput(); void ClearInputState(); @@ -98,7 +65,6 @@ private: const unsigned int m_index; DIJOYSTATE m_state_in; - std::list m_state_out; bool m_buffered; }; diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp new file mode 100644 index 0000000000..34b44acf99 --- /dev/null +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp @@ -0,0 +1,227 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "ForceFeedbackDevice.h" + +namespace ciface +{ +namespace ForceFeedback +{ + +// template instantiation +template class ForceFeedbackDevice::Force; +template class ForceFeedbackDevice::Force; +template class ForceFeedbackDevice::Force; + +static const struct +{ + GUID guid; + const char* name; +} force_type_names[] = +{ + {GUID_ConstantForce, "Constant"}, // DICONSTANTFORCE + {GUID_RampForce, "Ramp"}, // DIRAMPFORCE + {GUID_Square, "Square"}, // DIPERIODIC ... + {GUID_Sine, "Sine"}, + {GUID_Triangle, "Triangle"}, + {GUID_SawtoothUp, "Sawtooth Up"}, + {GUID_SawtoothDown, "Sawtooth Down"}, + //{GUID_Spring, "Spring"}, // DICUSTOMFORCE ... < I think + //{GUID_Damper, "Damper"}, + //{GUID_Inertia, "Inertia"}, + //{GUID_Friction, "Friction"}, +}; + +ForceFeedbackDevice::~ForceFeedbackDevice() +{ + // release the ff effect iface's + for (EffectState& state : m_state_out) + { + state.iface->Stop(); + state.iface->Unload(); + state.iface->Release(); + } +} + +bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, int cAxes) +{ + if (cAxes == 0) + return false; + + // TODO: check for DIDC_FORCEFEEDBACK in devcaps? + + // temporary + DWORD rgdwAxes[2] = {DIJOFS_X, DIJOFS_Y}; + LONG rglDirection[2] = {-200, 0}; + + DIEFFECT eff; + ZeroMemory(&eff, sizeof(eff)); + eff.dwSize = sizeof(DIEFFECT); + eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; + eff.dwDuration = INFINITE; // (4 * DI_SECONDS) + eff.dwSamplePeriod = 0; + eff.dwGain = DI_FFNOMINALMAX; + eff.dwTriggerButton = DIEB_NOTRIGGER; + eff.dwTriggerRepeatInterval = 0; + eff.cAxes = std::min((DWORD)1, (DWORD)cAxes); + eff.rgdwAxes = rgdwAxes; + eff.rglDirection = rglDirection; + + // DIPERIODIC is the largest, so we'll use that + DIPERIODIC ff; + eff.lpvTypeSpecificParams = &ff; + ZeroMemory(&ff, sizeof(ff)); + + // doesn't seem needed + //DIENVELOPE env; + //eff.lpEnvelope = &env; + //ZeroMemory(&env, sizeof(env)); + //env.dwSize = sizeof(env); + + for (unsigned int f = 0; f < sizeof(force_type_names)/sizeof(*force_type_names); ++f) + { + // ugly if ladder + if (0 == f) + { + DICONSTANTFORCE diCF = {-10000}; + diCF.lMagnitude = DI_FFNOMINALMAX; + eff.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + eff.lpvTypeSpecificParams = &diCF; + } + else if (1 == f) + { + eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE); + } + else + { + eff.cbTypeSpecificParams = sizeof(DIPERIODIC); + } + + LPDIRECTINPUTEFFECT pEffect; + if (SUCCEEDED(device->CreateEffect(force_type_names[f].guid, &eff, &pEffect, NULL))) + { + m_state_out.push_back(EffectState(pEffect)); + + // ugly if ladder again :/ + if (0 == f) + AddOutput(new ForceConstant(f, m_state_out.back())); + else if (1 == f) + AddOutput(new ForceRamp(f, m_state_out.back())); + else + AddOutput(new ForcePeriodic(f, m_state_out.back())); + } + } + + // disable autocentering + if (Outputs().size()) + { + DIPROPDWORD dipdw; + dipdw.diph.dwSize = sizeof( DIPROPDWORD ); + dipdw.diph.dwHeaderSize = sizeof( DIPROPHEADER ); + dipdw.diph.dwObj = 0; + dipdw.diph.dwHow = DIPH_DEVICE; + dipdw.dwData = DIPROPAUTOCENTER_OFF; + device->SetProperty( DIPROP_AUTOCENTER, &dipdw.diph ); + } + + return true; +} + +bool ForceFeedbackDevice::UpdateOutput() +{ + size_t ok_count = 0; + + DIEFFECT eff; + ZeroMemory(&eff, sizeof(eff)); + eff.dwSize = sizeof(DIEFFECT); + eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; + + for (EffectState& state : m_state_out) + { + if (state.params) + { + if (state.size) + { + eff.cbTypeSpecificParams = state.size; + eff.lpvTypeSpecificParams = state.params; + // set params and start effect + ok_count += SUCCEEDED(state.iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START)); + } + else + { + ok_count += SUCCEEDED(state.iface->Stop()); + } + + state.params = NULL; + } + else + { + ++ok_count; + } + } + + return (m_state_out.size() == ok_count); +} + +void ForceFeedbackDevice::ForceConstant::SetState(const ControlState state) +{ + const LONG new_val = LONG(10000 * state); + + LONG &val = params.lMagnitude; + if (val != new_val) + { + val = new_val; + m_state.params = ¶ms; // tells UpdateOutput the state has changed + + // tells UpdateOutput to either start or stop the force + m_state.size = new_val ? sizeof(params) : 0; + } +} + +void ForceFeedbackDevice::ForceRamp::SetState(const ControlState state) +{ + const LONG new_val = LONG(10000 * state); + + if (params.lStart != new_val) + { + params.lStart = params.lEnd = new_val; + m_state.params = ¶ms; // tells UpdateOutput the state has changed + + // tells UpdateOutput to either start or stop the force + m_state.size = new_val ? sizeof(params) : 0; + } +} + +void ForceFeedbackDevice::ForcePeriodic::SetState(const ControlState state) +{ + const DWORD new_val = DWORD(10000 * state); + + DWORD &val = params.dwMagnitude; + if (val != new_val) + { + val = new_val; + //params.dwPeriod = 0;//DWORD(0.05 * DI_SECONDS); // zero is working fine for me + + m_state.params = ¶ms; // tells UpdateOutput the state has changed + + // tells UpdateOutput to either start or stop the force + m_state.size = new_val ? sizeof(params) : 0; + } +} + +template +ForceFeedbackDevice::Force

::Force(u8 index, EffectState& state) +: m_index(index), m_state(state) +{ + ZeroMemory(¶ms, sizeof(params)); +} + +template +std::string ForceFeedbackDevice::Force

::GetName() const +{ + return force_type_names[m_index].name; +} + +} +} diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h new file mode 100644 index 0000000000..a9128dbd1a --- /dev/null +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h @@ -0,0 +1,65 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#ifndef _FORCEFEEDBACKDEVICE_H_ +#define _FORCEFEEDBACKDEVICE_H_ + +#include "../Device.h" + +#define DIRECTINPUT_VERSION 0x0800 +#define WIN32_LEAN_AND_MEAN +#define NOMINMAX +#include +#include + +#include + +namespace ciface +{ +namespace ForceFeedback +{ + + +class ForceFeedbackDevice : public Core::Device +{ +private: + struct EffectState + { + EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {} + + LPDIRECTINPUTEFFECT iface; + void* params; // null when force hasn't changed + u8 size; // zero when force should stop + }; + + template + class Force : public Output + { + public: + std::string GetName() const; + Force(u8 index, EffectState& state); + void SetState(ControlState state); + private: + const u8 m_index; + EffectState& m_state; + P params; + }; + typedef Force ForceConstant; + typedef Force ForceRamp; + typedef Force ForcePeriodic; + +public: + bool InitForceFeedback(const LPDIRECTINPUTDEVICE8, int cAxes); + bool UpdateOutput(); + + virtual ~ForceFeedbackDevice(); +private: + std::list m_state_out; +}; + + +} +} + +#endif diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 43eede3076..968bd235d7 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -1,4 +1,4 @@ - + @@ -50,6 +50,7 @@ + @@ -67,6 +68,7 @@ + @@ -86,4 +88,4 @@ - + \ No newline at end of file diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters index 7e344e6976..3e06237cdc 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -13,6 +13,9 @@ {07bad1aa-7e03-4f5c-ade2-a44857c5cbc3} + + {e10ce316-283c-4be0-848d-578dec2b6404} + @@ -44,6 +47,9 @@ ControllerInterface + + ControllerInterface\ForceFeedback + @@ -76,8 +82,11 @@ ControllerInterface + + ControllerInterface\ForceFeedback + - + \ No newline at end of file