Skip to content

tweak(extra-natives/five): Improve Unproject function to avoid shaking #3690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −8
Open

tweak(extra-natives/five): Improve Unproject function to avoid shaking #3690

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions code/components/extra-natives-five/include/GamePrimitives.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,41 @@ inline rage::Vec3V Unproject(const rage::grcViewport& viewport, const rage::Vec3
{
using namespace DirectX;

auto invVP = XMMatrixInverse(NULL, XMLoadFloat4x4((const XMFLOAT4X4*)viewport.m_worldViewProj));
auto inVec = XMVectorSet((viewPos.x * 2.0f) - 1.0f, ((1.0 - viewPos.y) * 2.0f) - 1.0f, viewPos.z, 1.0f);
auto outCoord = XMVector3TransformCoord(inVec, invVP);

return {
XMVectorGetX(outCoord),
XMVectorGetY(outCoord),
XMVectorGetZ(outCoord)
// Load view and projection matrices
XMMATRIX worldView = XMLoadFloat4x4((const XMFLOAT4X4*)&viewport.m_worldView);
XMMATRIX projection = XMLoadFloat4x4((const XMFLOAT4X4*)&viewport.m_projection);

// Re-orthonormalize the view matrix to reduce accumulated drift
worldView.r[0] = XMVector3Normalize(worldView.r[0]);
worldView.r[1] = XMVector3Normalize(worldView.r[1]);
worldView.r[2] = XMVector3Normalize(worldView.r[2]);

// Invert the projection and view matrices separately
// (doing this is numerically more stable than inverting the combined matrix)
XMMATRIX invProj = XMMatrixInverse(nullptr, projection);
XMMATRIX invView = XMMatrixInverse(nullptr, worldView);

// Convert from screen space (0..1) to NDC (-1..1)
float ndcX = (viewPos.x * 2.0f) - 1.0f;
float ndcY = ((1.0f - viewPos.y) * 2.0f) - 1.0f;
float ndcZ = viewPos.z;

XMVECTOR inVec = XMVectorSet(ndcX, ndcY, ndcZ, 1.0f);

// Transform from NDC to view space
XMVECTOR viewSpace = XMVector4Transform(inVec, invProj);
viewSpace = XMVectorScale(viewSpace, 1.0f / XMVectorGetW(viewSpace));

// Transform from view space to world space
XMVECTOR worldSpace = XMVector4Transform(viewSpace, invView);
worldSpace = XMVectorScale(worldSpace, 1.0f / XMVectorGetW(worldSpace));

// Store the final world coordinates
rage::Vec3V result = {
XMVectorGetX(worldSpace),
XMVectorGetY(worldSpace),
XMVectorGetZ(worldSpace)
};

return result;
}
Loading