|
@@ -684,32 +684,37 @@ namespace bx
|
|
|
mtxProj_impl<HandnessT>(_result, _fov[0], _fov[1], _fov[2], _fov[3], _near, _far, _oglNdc);
|
|
mtxProj_impl<HandnessT>(_result, _fov[0], _fov[1], _fov[2], _fov[3], _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- inline void mtxProj(float* _result, const float _fov[4], float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
|
|
+ template <Handness::Enum HandnessT>
|
|
|
|
|
+ inline void mtxProj_impl(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
- mtxProj_impl<Handness::Left>(_result, _fov, _near, _far, _oglNdc);
|
|
|
|
|
|
|
+ const float height = 1.0f/tanf(toRad(_fovy)*0.5f);
|
|
|
|
|
+ const float width = height * 1.0f/_aspect;
|
|
|
|
|
+ mtxProjXYWH<HandnessT>(_result, 0.0f, 0.0f, width, height, _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- inline void mtxProjLh(float* _result, const float _fov[4], float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
|
|
+ inline void mtxProj(float* _result, float _ut, float _dt, float _lt, float _rt, float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
+ {
|
|
|
|
|
+ mtxProj_impl<Handness::Left>(_result, _ut, _dt, _lt, _rt, _near, _far, _oglNdc);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ inline void mtxProj(float* _result, const float _fov[4], float _near, float _far, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
mtxProj_impl<Handness::Left>(_result, _fov, _near, _far, _oglNdc);
|
|
mtxProj_impl<Handness::Left>(_result, _fov, _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- inline void mtxProjRh(float* _result, const float _fov[4], float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
|
|
+ inline void mtxProj(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
- mtxProj_impl<Handness::Right>(_result, _fov, _near, _far, _oglNdc);
|
|
|
|
|
|
|
+ mtxProj_impl<Handness::Left>(_result, _fovy, _aspect, _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template <Handness::Enum HandnessT>
|
|
|
|
|
- inline void mtxProj_impl(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
|
|
+ inline void mtxProjLh(float* _result, float _ut, float _dt, float _lt, float _rt, float _near, float _far, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
- const float height = 1.0f/tanf(toRad(_fovy)*0.5f);
|
|
|
|
|
- const float width = height * 1.0f/_aspect;
|
|
|
|
|
- mtxProjXYWH<HandnessT>(_result, 0.0f, 0.0f, width, height, _near, _far, _oglNdc);
|
|
|
|
|
|
|
+ mtxProj_impl<Handness::Left>(_result, _ut, _dt, _lt, _rt, _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- inline void mtxProj(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
|
|
+ inline void mtxProjLh(float* _result, const float _fov[4], float _near, float _far, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
- mtxProj_impl<Handness::Left>(_result, _fovy, _aspect, _near, _far, _oglNdc);
|
|
|
|
|
|
|
+ mtxProj_impl<Handness::Left>(_result, _fov, _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
inline void mtxProjLh(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
inline void mtxProjLh(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
@@ -717,6 +722,16 @@ namespace bx
|
|
|
mtxProj_impl<Handness::Left>(_result, _fovy, _aspect, _near, _far, _oglNdc);
|
|
mtxProj_impl<Handness::Left>(_result, _fovy, _aspect, _near, _far, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ inline void mtxProjRh(float* _result, float _ut, float _dt, float _lt, float _rt, float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
+ {
|
|
|
|
|
+ mtxProj_impl<Handness::Right>(_result, _ut, _dt, _lt, _rt, _near, _far, _oglNdc);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ inline void mtxProjRh(float* _result, const float _fov[4], float _near, float _far, bool _oglNdc = false)
|
|
|
|
|
+ {
|
|
|
|
|
+ mtxProj_impl<Handness::Right>(_result, _fov, _near, _far, _oglNdc);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
inline void mtxProjRh(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
inline void mtxProjRh(float* _result, float _fovy, float _aspect, float _near, float _far, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
mtxProj_impl<Handness::Right>(_result, _fovy, _aspect, _near, _far, _oglNdc);
|
|
mtxProj_impl<Handness::Right>(_result, _fovy, _aspect, _near, _far, _oglNdc);
|
|
@@ -841,7 +856,7 @@ namespace bx
|
|
|
|
|
|
|
|
inline void mtxProjRevInfRh(float* _result, const float _fov[4], float _near, bool _oglNdc = false)
|
|
inline void mtxProjRevInfRh(float* _result, const float _fov[4], float _near, bool _oglNdc = false)
|
|
|
{
|
|
{
|
|
|
- mtxProjInf_impl<NearFar::Reverse,Handness::Right>(_result, _fov[0], _fov[1], _fov[2], _fov[3], _near, _oglNdc);
|
|
|
|
|
|
|
+ mtxProjInf_impl<NearFar::Reverse,Handness::Right>(_result, _fov, _near, _oglNdc);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
inline void mtxProjRevInfRh(float* _result, float _fovy, float _aspect, float _near, bool _oglNdc = false)
|
|
inline void mtxProjRevInfRh(float* _result, float _fovy, float _aspect, float _near, bool _oglNdc = false)
|