lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-07 09:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated GLM version w/ now standard radians as angles.

Browse Source
This commit is contained in:
J. de Vries
2016-05-11 20:04:52 +02:00
parent 336df22af5
commit a4c2bb2498
321 changed files with 42426 additions and 35972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
includes/glm/gtx/transform2.inl
View File

@@ -1,76 +1,99 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2005-02-28
// Updated : 2005-04-23
// Licence : This source is under MIT License
// File : glm/gtx/transform2.inl
///////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
/// Restrictions:
/// By making use of the Software for military purposes, you choose to make
/// a Bunny unhappy.
///
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
/// THE SOFTWARE.
///
/// @ref gtx_transform2
/// @file glm/gtx/transform2.inl
/// @date 2005-12-21 / 2011-06-07
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
namespace glm
{
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat3x3<T> shearX2D(
const detail::tmat3x3<T>& m,
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX2D(
const tmat3x3<T, P>& m,
T s)
{
detail::tmat3x3<T> r(1);
tmat3x3<T, P> r(1);
r[0][1] = s;
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat3x3<T> shearY2D(
const detail::tmat3x3<T>& m,
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY2D(
const tmat3x3<T, P>& m,
T s)
{
detail::tmat3x3<T> r(1);
tmat3x3<T, P> r(1);
r[1][0] = s;
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearX3D(
const detail::tmat4x4<T>& m,
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearX3D(
const tmat4x4<T, P>& m,
T s,
T t)
{
detail::tmat4x4<T> r(1);
tmat4x4<T, P> r(1);
r[1][0] = s;
r[2][0] = t;
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearY3D(
const detail::tmat4x4<T>& m,
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearY3D(
const tmat4x4<T, P>& m,
T s,
T t)
{
detail::tmat4x4<T> r(1);
tmat4x4<T, P> r(1);
r[0][1] = s;
r[2][1] = t;
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearZ3D(
const detail::tmat4x4<T>& m,
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearZ3D(
const tmat4x4<T, P>& m,
T s,
T t)
{
detail::tmat4x4<T> r(1);
tmat4x4<T, P> r(1);
r[0][2] = s;
r[1][2] = t;
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat3x3<T> reflect2D(
const detail::tmat3x3<T>& m,
const detail::tvec3<T>& normal)
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat3x3<T, P> reflect2D(
const tmat3x3<T, P>& m,
const tvec3<T, P>& normal)
{
detail::tmat3x3<T> r(1);
tmat3x3<T, P> r(1);
r[0][0] = 1 - 2 * normal.x * normal.x;
r[0][1] = -2 * normal.x * normal.y;
r[1][0] = -2 * normal.x * normal.y;
@@ -78,12 +101,12 @@ namespace glm
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> reflect3D(
const detail::tmat4x4<T>& m,
const detail::tvec3<T>& normal)
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> reflect3D(
const tmat4x4<T, P>& m,
const tvec3<T, P>& normal)
{
detail::tmat4x4<T> r(1);
tmat4x4<T, P> r(1);
r[0][0] = 1 - 2 * normal.x * normal.x;
r[0][1] = -2 * normal.x * normal.y;
r[0][2] = -2 * normal.x * normal.z;
@@ -98,12 +121,12 @@ namespace glm
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat3x3<T> proj2D(
const detail::tmat3x3<T>& m,
const detail::tvec3<T>& normal)
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat3x3<T, P> proj2D(
const tmat3x3<T, P>& m,
const tvec3<T, P>& normal)
{
detail::tmat3x3<T> r(1);
tmat3x3<T, P> r(1);
r[0][0] = 1 - normal.x * normal.x;
r[0][1] = - normal.x * normal.y;
r[1][0] = - normal.x * normal.y;
@@ -111,12 +134,12 @@ namespace glm
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> proj3D(
const detail::tmat4x4<T>& m,
const detail::tvec3<T>& normal)
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> proj3D(
const tmat4x4<T, P>& m,
const tvec3<T, P>& normal)
{
detail::tmat4x4<T> r(1);
tmat4x4<T, P> r(1);
r[0][0] = 1 - normal.x * normal.x;
r[0][1] = - normal.x * normal.y;
r[0][2] = - normal.x * normal.z;
@@ -129,22 +152,22 @@ namespace glm
return m * r;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scaleBias(
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(
T scale,
T bias)
{
detail::tmat4x4<T> result;
result[3] = detail::tvec4<T>(detail::tvec3<T>(bias), T(1));
tmat4x4<T, P> result;
result[3] = tvec4<T, P>(tvec3<T, P>(bias), T(1));
result[0][0] = scale;
result[1][1] = scale;
result[2][2] = scale;
return result;
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tmat4x4<T> scaleBias(
const detail::tmat4x4<T>& m,
template <typename T, precision P>
GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(
const tmat4x4<T, P>& m,
T scale,
T bias)
{