DevKit7/citro3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed branch conflicts.

Browse Source
This commit is contained in:
Thompson Lee 2016-08-04 06:19:03 -04:00
parent 766def30a3
commit d250a38052
3 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/c3d/maths.h
View File

@ -453,6 +453,26 @@ void Mtx_PerspTilt(C3D_Mtx* mtx, float fovy, float aspect, float near, float far
* @param[in] screen Focal length
*/
void Mtx_PerspStereoTilt(C3D_Mtx* mtx, float fovy, float aspect, float near, float far, float iod, float screen);
/**
* @brief Left-handed Look-At matrix, using DirectX implementation
* @note See https://msdn.microsoft.com/en-us/library/windows/desktop/bb205342
* @param[out] out Output matrix.
* @param[in] cameraPosition Position of the intended camera in 3D space.
* @param[in] cameraTarget Position of the intended target the camera is supposed to face in 3D space.
* @param[in] cameraUpVector The vector that points straight up depending on the camera's "Up" direction.
*/
void Mtx_LookAtLH(C3D_Mtx* out, C3D_FVec cameraPosition, C3D_FVec cameraTarget, C3D_FVec cameraUpVector);
/**
* @brief Right-handed Look-At matrix, using DirectX implementation
* @note See https://msdn.microsoft.com/en-us/library/windows/desktop/bb205343
* @param[out] out Output matrix.
* @param[in] cameraPosition Position of the intended camera in 3D space.
* @param[in] cameraTarget Position of the intended target the camera is supposed to face in 3D space.
* @param[in] cameraUpVector The vector that points straight up depending on the camera's "Up" direction.
*/
void Mtx_LookAtRH(C3D_Mtx* out, C3D_FVec cameraPosition, C3D_FVec cameraTarget, C3D_FVec cameraUpVector);
///@}
///@name Quaternion Math

35
source/maths/mtx_lookatlh.c Normal file
View File

@ -0,0 +1,35 @@
#include <c3d/maths.h>
void Mtx_LookAtLH(C3D_Mtx* out, C3D_FVec cameraPosition, C3D_FVec cameraTarget, C3D_FVec cameraUpVector)
{
//Left-handed Look-At matrix is a DirectX implementation.
//https://msdn.microsoft.com/en-us/library/windows/desktop/bb281710
C3D_FVec xaxis, yaxis, zaxis;
//Order of operations is crucial.
zaxis = FVec3_Normalize(FVec3_New(cameraPosition.x - cameraTarget.x, cameraPosition.y - cameraTarget.y, cameraPosition.z - cameraTarget.z));
xaxis = FVec3_Normalize(FVec3_Cross(cameraUpVector, zaxis));
yaxis = FVec3_Cross(zaxis, xaxis);
out->r[0].x = xaxis.x;
out->r[0].y = yaxis.x;
out->r[0].z = zaxis.x;
out->r[0].w = 0.0f;
//Notice in LH matrix, the Y is in Row 2 of 4. In RH matrix, the Z is in Row 2 of 4.
out->r[1].x = xaxis.y;
out->r[1].y = yaxis.y;
out->r[1].z = zaxis.y;
out->r[1].w = 0.0f;
//Notice in LH matrix, the Z is in Row 3 of 4. In RH matrix, the Y is in Row 3 of 4.
out->r[2].x = xaxis.z;
out->r[2].y = yaxis.z;
out->r[2].z = zaxis.z;
out->r[2].w = 0.0f;
out->r[3].x = -FVec3_Dot(xaxis, cameraPosition);
out->r[3].y = -FVec3_Dot(yaxis, cameraPosition);
out->r[3].z = -FVec3_Dot(zaxis, cameraPosition);
out->r[3].w = 1.0f;
}

35
source/maths/mtx_lookatrh.c Normal file
View File

@ -0,0 +1,35 @@
#include <c3d/maths.h>
void Mtx_LookAtRH(C3D_Mtx* out, C3D_FVec cameraPosition, C3D_FVec cameraTarget, C3D_FVec cameraUpVector)
{
//Right-handed Look-At matrix is a DirectX implementation.
//https://msdn.microsoft.com/en-us/library/windows/desktop/bb281711
C3D_FVec xaxis, yaxis, zaxis;
//Order of operations is crucial.
zaxis = FVec3_Normalize(FVec3_New(cameraPosition.x - cameraTarget.x, cameraPosition.y - cameraTarget.y, cameraPosition.z - cameraTarget.z));
xaxis = FVec3_Normalize(FVec3_Cross(cameraUpVector, zaxis));
yaxis = FVec3_Cross(zaxis, xaxis);
out->r[0].x = xaxis.x;
out->r[0].y = yaxis.x;
out->r[0].z = zaxis.x;
out->r[0].w = 0.0f;
//Notice in RH matrix, the Z is in Row 2 of 4. In LH matrix, the Y is in Row 2 of 4.
out->r[1].x = xaxis.z;
out->r[1].y = yaxis.z;
out->r[1].z = zaxis.z;
out->r[1].w = 0.0f;
//Notice in RH matrix, the Y is in Row 3 of 4. In LH matrix, the Z is in Row 3 of 4.
out->r[2].x = xaxis.y;
out->r[2].y = yaxis.y;
out->r[2].z = zaxis.y;
out->r[2].w = 0.0f;
out->r[3].x = -FVec3_Dot(xaxis, cameraPosition);
out->r[3].y = -FVec3_Dot(yaxis, cameraPosition);
out->r[3].z = -FVec3_Dot(zaxis, cameraPosition);
out->r[3].w = 1.0f;
}