ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1730 from comex/suaero 

Remove the one commit (as far as I can tell) by soreau that added nontrivial material still in the tree
This commit is contained in:
comex 2014-12-20 03:06:00 -05:00
parent 31bc51072b fba3abe4cf
commit 793862ae34
2 changed files with 0 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -126,21 +126,6 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
// ramp effect
if (supported_effects & SDL_HAPTIC_RAMP)
AddOutput(new RampEffect(m_haptic));
// sine effect
if (supported_effects & SDL_HAPTIC_SINE)
AddOutput(new SineEffect(m_haptic));
#ifdef SDL_HAPTIC_SQUARE
// square effect
if (supported_effects & SDL_HAPTIC_SQUARE)
AddOutput(new SquareEffect(m_haptic));
#endif // defined(SDL_HAPTIC_SQUARE)
// triangle effect
if (supported_effects & SDL_HAPTIC_TRIANGLE)
AddOutput(new TriangleEffect(m_haptic));
}
#endif
@ -193,23 +178,6 @@ std::string Joystick::RampEffect::GetName() const
return "Ramp";
}
std::string Joystick::SineEffect::GetName() const
{
return "Sine";
}
#ifdef SDL_HAPTIC_SQUARE
std::string Joystick::SquareEffect::GetName() const
{
return "Square";
}
#endif // defined(SDL_HAPTIC_SQUARE)
std::string Joystick::TriangleEffect::GetName() const
{
return "Triangle";
}
void Joystick::ConstantEffect::SetState(ControlState state)
{
if (state)
@ -241,65 +209,6 @@ void Joystick::RampEffect::SetState(ControlState state)
m_effect.ramp.start = (Sint16)(state * 0x7FFF);
Update();
}
void Joystick::SineEffect::SetState(ControlState state)
{
if (state)
{
m_effect.type = SDL_HAPTIC_SINE;
m_effect.periodic.length = 250;
}
else
{
m_effect.type = 0;
}
m_effect.periodic.period = 5;
m_effect.periodic.magnitude = (Sint16)(state * 0x5000);
m_effect.periodic.attack_length = 0;
m_effect.periodic.fade_length = 500;
Update();
}
#ifdef SDL_HAPTIC_SQUARE
void Joystick::SquareEffect::SetState(ControlState state)
{
if (state)
{
m_effect.type = SDL_HAPTIC_SQUARE;
m_effect.periodic.length = 250;
}
else
{
m_effect.type = 0;
}
m_effect.periodic.period = 5;
m_effect.periodic.magnitude = state * 0x5000;
m_effect.periodic.attack_length = 0;
m_effect.periodic.fade_length = 100;
Update();
}
#endif // defined(SDL_HAPTIC_SQUARE)
void Joystick::TriangleEffect::SetState(ControlState state)
{
if (state)
{
m_effect.type = SDL_HAPTIC_TRIANGLE;
m_effect.periodic.length = 250;
}
else
{
m_effect.type = 0;
}
m_effect.periodic.period = 5;
m_effect.periodic.magnitude = (Sint16)(state * 0x5000);
m_effect.periodic.attack_length = 0;
m_effect.periodic.fade_length = 100;
Update();
}
#endif
void Joystick::UpdateInput()

26
Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
View File

@ -98,32 +98,6 @@ private:
std::string GetName() const override;
void SetState(ControlState state) override;
};
class SineEffect : public HapticEffect
{
public:
SineEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
std::string GetName() const override;
void SetState(ControlState state) override;
};
#ifdef SDL_HAPTIC_SQUARE
class SquareEffect : public HapticEffect
{
public:
SquareEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
std::string GetName() const;
void SetState(ControlState state);
};
#endif // defined(SDL_HAPTIC_SQUARE)
class TriangleEffect : public HapticEffect
{
public:
TriangleEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
std::string GetName() const override;
void SetState(ControlState state) override;
};
#endif
public: