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

ControllerInterface/Wiimote: Add "IR Distance" input providing a calculated distance from sensor bar in meters.

This commit is contained in:
Jordan Woyak 2020-09-22 17:49:15 -05:00
parent 761f7798c9
commit f9280d0f66
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp
View File

@ -196,6 +196,8 @@ Device::Device(std::unique_ptr<WiimoteReal::Wiimote> wiimote) : m_wiimote(std::m
AddInput(new UndetectableAnalogInput<bool>(&m_ir_state.is_hidden, "IR Hidden", 1)); AddInput(new UndetectableAnalogInput<bool>(&m_ir_state.is_hidden, "IR Hidden", 1));
AddInput(new UndetectableAnalogInput<float>(&m_ir_state.distance, "IR Distance", 1));
// Raw gyroscope. // Raw gyroscope.
static constexpr std::array<std::array<const char*, 2>, 3> gyro_names = {{ static constexpr std::array<std::array<const char*, 2>, 3> gyro_names = {{
{"Gyro Pitch Down", "Gyro Pitch Up"}, {"Gyro Pitch Down", "Gyro Pitch Up"},
@ -1198,9 +1200,9 @@ void Device::UpdateOrientation()
// FYI: We could do some roll correction from multiple IR objects. // FYI: We could do some roll correction from multiple IR objects.
const auto ir_rotation = const auto ir_rotation =
Common::Vec3(m_ir_state.center_position.y * WiimoteEmu::CameraLogic::CAMERA_FOV_Y_DEG, 0, Common::Vec3(m_ir_state.center_position.y * WiimoteEmu::CameraLogic::CAMERA_FOV_Y, 0,
m_ir_state.center_position.x * WiimoteEmu::CameraLogic::CAMERA_FOV_X_DEG) / m_ir_state.center_position.x * WiimoteEmu::CameraLogic::CAMERA_FOV_X) /
2 * float(MathUtil::TAU) / 360; 2;
const auto ir_normal = Common::Vec3(0, 1, 0); const auto ir_normal = Common::Vec3(0, 1, 0);
const auto ir_vector = WiimoteEmu::GetMatrixFromGyroscope(-ir_rotation) * ir_normal; const auto ir_vector = WiimoteEmu::GetMatrixFromGyroscope(-ir_rotation) * ir_normal;
@ -1226,8 +1228,7 @@ void Device::IRState::ProcessData(const std::array<WiimoteEmu::IRBasic, 2>& data
using IRObject = WiimoteEmu::IRBasic::IRObject; using IRObject = WiimoteEmu::IRBasic::IRObject;
Common::Vec2 point_total; MathUtil::RunningVariance<Common::Vec2> points;
int point_count = 0;
const auto camera_max = IRObject(WiimoteEmu::CameraLogic::CAMERA_RES_X - 1, const auto camera_max = IRObject(WiimoteEmu::CameraLogic::CAMERA_RES_X - 1,
WiimoteEmu::CameraLogic::CAMERA_RES_Y - 1); WiimoteEmu::CameraLogic::CAMERA_RES_Y - 1);
@ -1237,8 +1238,7 @@ void Device::IRState::ProcessData(const std::array<WiimoteEmu::IRBasic, 2>& data
if (point.y > camera_max.y) if (point.y > camera_max.y)
return; return;
point_total += Common::Vec2(point); points.Push(Common::Vec2(point));
++point_count;
}; };
for (auto& block : data) for (auto& block : data)
@ -1247,12 +1247,25 @@ void Device::IRState::ProcessData(const std::array<WiimoteEmu::IRBasic, 2>& data
add_point(block.GetObject2()); add_point(block.GetObject2());
} }
is_hidden = !point_count; is_hidden = !points.Count();
if (point_count) if (points.Count() >= 2)
{ {
center_position = const auto variance = points.PopulationVariance();
point_total / float(point_count) / Common::Vec2(camera_max) * 2.f - Common::Vec2(1, 1); // Adjusts Y coorinate to match horizontal FOV.
const auto separation =
Common::Vec2(std::sqrt(variance.x), std::sqrt(variance.y)) /
Common::Vec2(WiimoteEmu::CameraLogic::CAMERA_RES_X,
WiimoteEmu::CameraLogic::CAMERA_RES_Y * WiimoteEmu::CameraLogic::CAMERA_AR) *
2;
distance = WiimoteEmu::CameraLogic::SENSOR_BAR_LED_SEPARATION / separation.Length() / 2 /
std::tan(WiimoteEmu::CameraLogic::CAMERA_FOV_X / 2);
}
if (points.Count())
{
center_position = points.Mean() / Common::Vec2(camera_max) * 2.f - Common::Vec2(1, 1);
} }
else else
{ {

2
Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h
View File

@ -135,6 +135,8 @@ private:
// Average of visible IR "objects". // Average of visible IR "objects".
Common::Vec2 center_position = {}; Common::Vec2 center_position = {};
float distance = 0;
bool is_hidden = true; bool is_hidden = true;
}; };