From 4f3e2ad56772ab5a88e1bc32e1b8eaced9f392ff Mon Sep 17 00:00:00 2001 From: AllMeatball <181806857+AllMeatball@users.noreply.github.com> Date: Sun, 25 May 2025 17:47:49 -0500 Subject: [PATCH] Fix naming conflict --- miniwin/sdl3gpu/src/miniwin_d3drmviewport.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/miniwin/sdl3gpu/src/miniwin_d3drmviewport.cpp b/miniwin/sdl3gpu/src/miniwin_d3drmviewport.cpp index e6a631c0..651c89e6 100644 --- a/miniwin/sdl3gpu/src/miniwin_d3drmviewport.cpp +++ b/miniwin/sdl3gpu/src/miniwin_d3drmviewport.cpp @@ -43,7 +43,7 @@ static void D3DRMMatrixMultiply(D3DRMMATRIX4D out, const D3DRMMATRIX4D a, const } } -static void D3DRMMatrixInvert(D3DRMMATRIX4D out, const D3DRMMATRIX4D m) +static void D3DRMMatrixInvertOrthogonal(D3DRMMATRIX4D out, const D3DRMMATRIX4D m) { for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { @@ -82,7 +82,7 @@ static void HMM_Perspective_LH_NO(D3DRMMATRIX4D Result, float FOV, float AspectR Result[2][3] = -Result[2][3]; } -void ComputeFrameWorldMatrix(IDirect3DRMFrame* frame, D3DRMMATRIX4D out) +static void ComputeFrameWorldMatrix(IDirect3DRMFrame* frame, D3DRMMATRIX4D out) { D3DRMMATRIX4D acc = {{1.f, 0.f, 0.f, 0.f}, {0.f, 1.f, 0.f, 0.f}, {0.f, 0.f, 1.f, 0.f}, {0.f, 0.f, 0.f, 1.f}}; @@ -113,7 +113,7 @@ HRESULT Direct3DRMViewport_SDL3GPUImpl::CollectSceneData(IDirect3DRMFrame* group // Compute camera matrix D3DRMMATRIX4D cameraWorld, viewMatrix; ComputeFrameWorldMatrix(m_camera, cameraWorld); - D3DRMMatrixInvert(viewMatrix, cameraWorld); + D3DRMMatrixInvertOrthogonal(viewMatrix, cameraWorld); std::function recurseFrame;