diff --git a/source/maths/mtx_persp.c b/source/maths/mtx_persp.c index 0a5e76d..1bbef20 100644 --- a/source/maths/mtx_persp.c +++ b/source/maths/mtx_persp.c @@ -7,20 +7,11 @@ void Mtx_Persp(C3D_Mtx* mtx, float fovy, float aspect, float near, float far, bo Mtx_Zeros(mtx); // Standard perspective projection matrix, with a fixed depth range of [-1,0] (required by PICA) - // http://www.wolframalpha.com/input/?i={{1,0,0,0},{0,1,0,0},{0,0,0.5,-0.5},{0,0,0,1}}{{1/(a*tan(v)),0,0,0},{0,1/tan(v),0,0},{0,0,(2%2Bn%2Bf)/(n-f),(fn)/(n-f)},{0,0,-1,0}} + // http://www.wolframalpha.com/input/?i=%7B%7B1,0,0,0%7D,%7B0,1,0,0%7D,%7B0,0,0.5,-0.5%7D,%7B0,0,0,1%7D%7D%7B%7B1%2F(a*tan(v)),0,0,0%7D,%7B0,1%2Ftan(v),0,0%7D,%7B0,0,(n%2Bf)%2F(n-f),(2fn)%2F(n-f)%7D,%7B0,0,-1,0%7D%7D mtx->r[0].x = 1.0f / (aspect * fovy_tan); mtx->r[1].y = 1.0f / fovy_tan; mtx->r[2].w = far*near / (near - far); - - if (isLeftHanded) - { - mtx->r[2].z = 0.5f*(far + near) / (far - near) - 0.5f; - mtx->r[3].z = 1.0f; - } - else - { - mtx->r[2].z = 0.5f*(far + near) / (near - far) + 0.5f; - mtx->r[3].z = -1.0f; - } + mtx->r[3].z = isLeftHanded ? 1.0f : -1.0f; + mtx->r[2].z = -mtx->r[3].z * near / (near - far); } diff --git a/source/maths/mtx_perspstereo.c b/source/maths/mtx_perspstereo.c index 74e6f77..f82cb1e 100644 --- a/source/maths/mtx_perspstereo.c +++ b/source/maths/mtx_perspstereo.c @@ -12,17 +12,7 @@ void Mtx_PerspStereo(C3D_Mtx* mtx, float fovy, float aspect, float near, float f mtx->r[0].w = -iod / 2.0f; mtx->r[1].y = 1.0f / fovy_tan; mtx->r[2].w = near * far / (near - far); - - if (isLeftHanded) - { - mtx->r[0].z = shift / fovy_tan_aspect; - mtx->r[2].z = 0.5f*(near + far) / (far - near) - 0.5f; - mtx->r[3].z = 1.0f; - } - else - { - mtx->r[0].z = -shift / fovy_tan_aspect; - mtx->r[2].z = 0.5f*(near + far) / (near - far) + 0.5f; - mtx->r[3].z = -1.0f; - } + mtx->r[3].z = isLeftHanded ? 1.0f : -1.0f; + mtx->r[0].z = mtx->r[3].z * shift / fovy_tan_aspect; + mtx->r[2].z = -mtx->r[3].z * near / (near - far); } diff --git a/source/maths/mtx_perspstereotilt.c b/source/maths/mtx_perspstereotilt.c index b74da90..d6e35a4 100644 --- a/source/maths/mtx_perspstereotilt.c +++ b/source/maths/mtx_perspstereotilt.c @@ -17,17 +17,7 @@ void Mtx_PerspStereoTilt(C3D_Mtx* mtx, float fovx, float invaspect, float near, mtx->r[1].x = -1.0f / fovx_tan_invaspect; mtx->r[1].w = iod / 2.0f; mtx->r[2].w = near * far / (near - far); - - if (isLeftHanded) - { - mtx->r[1].z = -shift / fovx_tan_invaspect; - mtx->r[2].z = 0.5f*(near + far) / (far - near) - 0.5f; - mtx->r[3].z = 1.0f; - } - else - { - mtx->r[1].z = shift / fovx_tan_invaspect; - mtx->r[2].z = 0.5f*(near + far) / (near - far) + 0.5f; - mtx->r[3].z = -1.0f; - } + mtx->r[3].z = isLeftHanded ? 1.0f : -1.0f; + mtx->r[1].z = -mtx->r[3].z * shift / fovx_tan_invaspect; + mtx->r[2].z = -mtx->r[3].z * near / (near - far); } diff --git a/source/maths/mtx_persptilt.c b/source/maths/mtx_persptilt.c index b3ea9e9..af603cc 100644 --- a/source/maths/mtx_persptilt.c +++ b/source/maths/mtx_persptilt.c @@ -32,15 +32,6 @@ void Mtx_PerspTilt(C3D_Mtx* mtx, float fovx, float invaspect, float near, float mtx->r[0].y = 1.0f / fovx_tan; mtx->r[1].x = -1.0f / (fovx_tan*invaspect); mtx->r[2].w = far*near / (near - far); - - if (isLeftHanded) - { - mtx->r[2].z = 0.5f*(far + near) / (far - near) - 0.5f; - mtx->r[3].z = 1.0f; - } - else - { - mtx->r[2].z = 0.5f*(far + near) / (near - far) + 0.5f; - mtx->r[3].z = -1.0f; - } + mtx->r[3].z = isLeftHanded ? 1.0f : -1.0f; + mtx->r[2].z = -mtx->r[3].z * near / (near - far); }