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 #11152 from jordan-woyak/wm-emu-ir-point-size 

WiimoteEmu: Improve simulated IR point size accuracy.
This commit is contained in:
Admiral H. Curtiss 2022-10-13 02:18:58 +02:00 committed by GitHub
parent 304e1e5b9f 3939b32ed6
commit 06f74bd7d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Core/HW/WiimoteEmu/Camera.cpp
View File

@ -75,19 +75,24 @@ CameraLogic::GetCameraPoints(const Common::Matrix44& transform, Common::Vec2 fie
const auto point = camera_view * Vec4(v, 1.0); const auto point = camera_view * Vec4(v, 1.0);
// Check if LED is behind camera. // Check if LED is behind camera.
if (point.z > 0) if (point.z < 0)
{ return CameraPoint();
// FYI: Casting down vs. rounding seems to produce more symmetrical output.
const auto x = s32((1 - point.x / point.w) * CAMERA_RES_X / 2);
const auto y = s32((1 - point.y / point.w) * CAMERA_RES_Y / 2);
const auto point_size = std::lround(MAX_POINT_SIZE / point.w / 2); // FYI: truncating vs. rounding seems to produce more symmetrical cursor positioning.
const auto x = s32((1 - point.x / point.w) * CAMERA_RES_X / 2);
const auto y = s32((1 - point.y / point.w) * CAMERA_RES_Y / 2);
if (x >= 0 && y >= 0 && x < CAMERA_RES_X && y < CAMERA_RES_Y) // Check if LED is outside of view.
return CameraPoint({u16(x), u16(y)}, u8(point_size)); if (x < 0 || y < 0 || x >= CAMERA_RES_X || y >= CAMERA_RES_Y)
} return CameraPoint();
return CameraPoint(); // Curve fit from data using an official WM+ and sensor bar at middle "sensitivity".
// Point sizes at minimum and maximum sensitivity differ by around 0.5 (not implemented).
const auto point_size = 2.37f * std::pow(point.z, -0.778f);
const auto clamped_point_size = std::clamp<s32>(std::lround(point_size), 1, MAX_POINT_SIZE);
return CameraPoint({u16(x), u16(y)}, u8(clamped_point_size));
}); });
return camera_points; return camera_points;