piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

NumericSetting: Stop values from binding to numbered input names.

Browse Source
This commit is contained in:
Jordan Woyak
2024-03-20 22:40:01 -05:00
parent 5039072ae9
commit e9fe0d3d5b
3 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/InputCommon/ControlReference/ControlReference.h
View File

@ -9,6 +9,12 @@
#include "InputCommon/ControlReference/ExpressionParser.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
template <typename T>
T ControlStateCast(ControlState value);
}
// ControlReference
//
// These are what you create to actually use the inputs, InputReference or OutputReference.
@ -31,7 +37,10 @@ public:
virtual bool IsInput() const = 0;
template <typename T>
T GetState();
T GetState()
{
return ControllerEmu::ControlStateCast<T>(State());
}
int BoundCount() const;
ciface::ExpressionParser::ParseStatus GetParseStatus() const;
@ -51,24 +60,27 @@ protected:
ciface::ExpressionParser::ParseStatus::EmptyExpression;
};
namespace ControllerEmu
{
template <>
inline bool ControlReference::GetState<bool>()
inline bool ControlStateCast<bool>(ControlState value)
{
// Round to nearest of 0 or 1.
return std::lround(State()) > 0;
return std::lround(value) > 0;
}
template <>
inline int ControlReference::GetState<int>()
inline int ControlStateCast<int>(ControlState value)
{
return std::lround(State());
return std::lround(value);
}
template <>
inline ControlState ControlReference::GetState<ControlState>()
inline ControlState ControlStateCast<ControlState>(ControlState value)
{
return State();
return value;
}
} // namespace ControllerEmu
//
// InputReference