mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-10 02:23:23 +08:00
Update GLM to latest version (0.9.9.3). This includes GLM's change of matrices no longer default initializing to the identity matrix. This commit thus also includes the update of all of LearnOpenGL's code to reflect this: all matrices are now constructor-initialized to the identity matrix where relevant.
This commit is contained in:
@@ -1,276 +1,251 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
/// 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 core
|
||||
/// @file glm/glm.cpp
|
||||
/// @date 2013-04-22 / 2013-04-22
|
||||
/// @author Christophe Riccio
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include <glm/gtx/dual_quaternion.hpp>
|
||||
#include <glm/gtc/vec1.hpp>
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
#include <glm/ext/scalar_int_sized.hpp>
|
||||
#include <glm/ext/scalar_uint_sized.hpp>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
namespace glm
|
||||
{
|
||||
// tvec1 type explicit instantiation
|
||||
template struct tvec1<uint8, lowp>;
|
||||
template struct tvec1<uint16, lowp>;
|
||||
template struct tvec1<uint32, lowp>;
|
||||
template struct tvec1<uint64, lowp>;
|
||||
template struct tvec1<int8, lowp>;
|
||||
template struct tvec1<int16, lowp>;
|
||||
template struct tvec1<int32, lowp>;
|
||||
template struct tvec1<int64, lowp>;
|
||||
template struct tvec1<float32, lowp>;
|
||||
template struct tvec1<float64, lowp>;
|
||||
template struct vec<1, uint8, lowp>;
|
||||
template struct vec<1, uint16, lowp>;
|
||||
template struct vec<1, uint32, lowp>;
|
||||
template struct vec<1, uint64, lowp>;
|
||||
template struct vec<1, int8, lowp>;
|
||||
template struct vec<1, int16, lowp>;
|
||||
template struct vec<1, int32, lowp>;
|
||||
template struct vec<1, int64, lowp>;
|
||||
template struct vec<1, float32, lowp>;
|
||||
template struct vec<1, float64, lowp>;
|
||||
|
||||
template struct tvec1<uint8, mediump>;
|
||||
template struct tvec1<uint16, mediump>;
|
||||
template struct tvec1<uint32, mediump>;
|
||||
template struct tvec1<uint64, mediump>;
|
||||
template struct tvec1<int8, mediump>;
|
||||
template struct tvec1<int16, mediump>;
|
||||
template struct tvec1<int32, mediump>;
|
||||
template struct tvec1<int64, mediump>;
|
||||
template struct tvec1<float32, mediump>;
|
||||
template struct tvec1<float64, mediump>;
|
||||
template struct vec<1, uint8, mediump>;
|
||||
template struct vec<1, uint16, mediump>;
|
||||
template struct vec<1, uint32, mediump>;
|
||||
template struct vec<1, uint64, mediump>;
|
||||
template struct vec<1, int8, mediump>;
|
||||
template struct vec<1, int16, mediump>;
|
||||
template struct vec<1, int32, mediump>;
|
||||
template struct vec<1, int64, mediump>;
|
||||
template struct vec<1, float32, mediump>;
|
||||
template struct vec<1, float64, mediump>;
|
||||
|
||||
template struct tvec1<uint8, highp>;
|
||||
template struct tvec1<uint16, highp>;
|
||||
template struct tvec1<uint32, highp>;
|
||||
template struct tvec1<uint64, highp>;
|
||||
template struct tvec1<int8, highp>;
|
||||
template struct tvec1<int16, highp>;
|
||||
template struct tvec1<int32, highp>;
|
||||
template struct tvec1<int64, highp>;
|
||||
template struct tvec1<float32, highp>;
|
||||
template struct tvec1<float64, highp>;
|
||||
template struct vec<1, uint8, highp>;
|
||||
template struct vec<1, uint16, highp>;
|
||||
template struct vec<1, uint32, highp>;
|
||||
template struct vec<1, uint64, highp>;
|
||||
template struct vec<1, int8, highp>;
|
||||
template struct vec<1, int16, highp>;
|
||||
template struct vec<1, int32, highp>;
|
||||
template struct vec<1, int64, highp>;
|
||||
template struct vec<1, float32, highp>;
|
||||
template struct vec<1, float64, highp>;
|
||||
|
||||
// tvec2 type explicit instantiation
|
||||
template struct tvec2<uint8, lowp>;
|
||||
template struct tvec2<uint16, lowp>;
|
||||
template struct tvec2<uint32, lowp>;
|
||||
template struct tvec2<uint64, lowp>;
|
||||
template struct tvec2<int8, lowp>;
|
||||
template struct tvec2<int16, lowp>;
|
||||
template struct tvec2<int32, lowp>;
|
||||
template struct tvec2<int64, lowp>;
|
||||
template struct tvec2<float32, lowp>;
|
||||
template struct tvec2<float64, lowp>;
|
||||
template struct vec<2, uint8, lowp>;
|
||||
template struct vec<2, uint16, lowp>;
|
||||
template struct vec<2, uint32, lowp>;
|
||||
template struct vec<2, uint64, lowp>;
|
||||
template struct vec<2, int8, lowp>;
|
||||
template struct vec<2, int16, lowp>;
|
||||
template struct vec<2, int32, lowp>;
|
||||
template struct vec<2, int64, lowp>;
|
||||
template struct vec<2, float32, lowp>;
|
||||
template struct vec<2, float64, lowp>;
|
||||
|
||||
template struct tvec2<uint8, mediump>;
|
||||
template struct tvec2<uint16, mediump>;
|
||||
template struct tvec2<uint32, mediump>;
|
||||
template struct tvec2<uint64, mediump>;
|
||||
template struct tvec2<int8, mediump>;
|
||||
template struct tvec2<int16, mediump>;
|
||||
template struct tvec2<int32, mediump>;
|
||||
template struct tvec2<int64, mediump>;
|
||||
template struct tvec2<float32, mediump>;
|
||||
template struct tvec2<float64, mediump>;
|
||||
template struct vec<2, uint8, mediump>;
|
||||
template struct vec<2, uint16, mediump>;
|
||||
template struct vec<2, uint32, mediump>;
|
||||
template struct vec<2, uint64, mediump>;
|
||||
template struct vec<2, int8, mediump>;
|
||||
template struct vec<2, int16, mediump>;
|
||||
template struct vec<2, int32, mediump>;
|
||||
template struct vec<2, int64, mediump>;
|
||||
template struct vec<2, float32, mediump>;
|
||||
template struct vec<2, float64, mediump>;
|
||||
|
||||
template struct tvec2<uint8, highp>;
|
||||
template struct tvec2<uint16, highp>;
|
||||
template struct tvec2<uint32, highp>;
|
||||
template struct tvec2<uint64, highp>;
|
||||
template struct tvec2<int8, highp>;
|
||||
template struct tvec2<int16, highp>;
|
||||
template struct tvec2<int32, highp>;
|
||||
template struct tvec2<int64, highp>;
|
||||
template struct tvec2<float32, highp>;
|
||||
template struct tvec2<float64, highp>;
|
||||
template struct vec<2, uint8, highp>;
|
||||
template struct vec<2, uint16, highp>;
|
||||
template struct vec<2, uint32, highp>;
|
||||
template struct vec<2, uint64, highp>;
|
||||
template struct vec<2, int8, highp>;
|
||||
template struct vec<2, int16, highp>;
|
||||
template struct vec<2, int32, highp>;
|
||||
template struct vec<2, int64, highp>;
|
||||
template struct vec<2, float32, highp>;
|
||||
template struct vec<2, float64, highp>;
|
||||
|
||||
// tvec3 type explicit instantiation
|
||||
template struct tvec3<uint8, lowp>;
|
||||
template struct tvec3<uint16, lowp>;
|
||||
template struct tvec3<uint32, lowp>;
|
||||
template struct tvec3<uint64, lowp>;
|
||||
template struct tvec3<int8, lowp>;
|
||||
template struct tvec3<int16, lowp>;
|
||||
template struct tvec3<int32, lowp>;
|
||||
template struct tvec3<int64, lowp>;
|
||||
template struct tvec3<float32, lowp>;
|
||||
template struct tvec3<float64, lowp>;
|
||||
template struct vec<3, uint8, lowp>;
|
||||
template struct vec<3, uint16, lowp>;
|
||||
template struct vec<3, uint32, lowp>;
|
||||
template struct vec<3, uint64, lowp>;
|
||||
template struct vec<3, int8, lowp>;
|
||||
template struct vec<3, int16, lowp>;
|
||||
template struct vec<3, int32, lowp>;
|
||||
template struct vec<3, int64, lowp>;
|
||||
template struct vec<3, float32, lowp>;
|
||||
template struct vec<3, float64, lowp>;
|
||||
|
||||
template struct tvec3<uint8, mediump>;
|
||||
template struct tvec3<uint16, mediump>;
|
||||
template struct tvec3<uint32, mediump>;
|
||||
template struct tvec3<uint64, mediump>;
|
||||
template struct tvec3<int8, mediump>;
|
||||
template struct tvec3<int16, mediump>;
|
||||
template struct tvec3<int32, mediump>;
|
||||
template struct tvec3<int64, mediump>;
|
||||
template struct tvec3<float32, mediump>;
|
||||
template struct tvec3<float64, mediump>;
|
||||
template struct vec<3, uint8, mediump>;
|
||||
template struct vec<3, uint16, mediump>;
|
||||
template struct vec<3, uint32, mediump>;
|
||||
template struct vec<3, uint64, mediump>;
|
||||
template struct vec<3, int8, mediump>;
|
||||
template struct vec<3, int16, mediump>;
|
||||
template struct vec<3, int32, mediump>;
|
||||
template struct vec<3, int64, mediump>;
|
||||
template struct vec<3, float32, mediump>;
|
||||
template struct vec<3, float64, mediump>;
|
||||
|
||||
template struct tvec3<uint8, highp>;
|
||||
template struct tvec3<uint16, highp>;
|
||||
template struct tvec3<uint32, highp>;
|
||||
template struct tvec3<uint64, highp>;
|
||||
template struct tvec3<int8, highp>;
|
||||
template struct tvec3<int16, highp>;
|
||||
template struct tvec3<int32, highp>;
|
||||
template struct tvec3<int64, highp>;
|
||||
template struct tvec3<float32, highp>;
|
||||
template struct tvec3<float64, highp>;
|
||||
template struct vec<3, uint8, highp>;
|
||||
template struct vec<3, uint16, highp>;
|
||||
template struct vec<3, uint32, highp>;
|
||||
template struct vec<3, uint64, highp>;
|
||||
template struct vec<3, int8, highp>;
|
||||
template struct vec<3, int16, highp>;
|
||||
template struct vec<3, int32, highp>;
|
||||
template struct vec<3, int64, highp>;
|
||||
template struct vec<3, float32, highp>;
|
||||
template struct vec<3, float64, highp>;
|
||||
|
||||
// tvec4 type explicit instantiation
|
||||
template struct tvec4<uint8, lowp>;
|
||||
template struct tvec4<uint16, lowp>;
|
||||
template struct tvec4<uint32, lowp>;
|
||||
template struct tvec4<uint64, lowp>;
|
||||
template struct tvec4<int8, lowp>;
|
||||
template struct tvec4<int16, lowp>;
|
||||
template struct tvec4<int32, lowp>;
|
||||
template struct tvec4<int64, lowp>;
|
||||
template struct tvec4<float32, lowp>;
|
||||
template struct tvec4<float64, lowp>;
|
||||
template struct vec<4, uint8, lowp>;
|
||||
template struct vec<4, uint16, lowp>;
|
||||
template struct vec<4, uint32, lowp>;
|
||||
template struct vec<4, uint64, lowp>;
|
||||
template struct vec<4, int8, lowp>;
|
||||
template struct vec<4, int16, lowp>;
|
||||
template struct vec<4, int32, lowp>;
|
||||
template struct vec<4, int64, lowp>;
|
||||
template struct vec<4, float32, lowp>;
|
||||
template struct vec<4, float64, lowp>;
|
||||
|
||||
template struct tvec4<uint8, mediump>;
|
||||
template struct tvec4<uint16, mediump>;
|
||||
template struct tvec4<uint32, mediump>;
|
||||
template struct tvec4<uint64, mediump>;
|
||||
template struct tvec4<int8, mediump>;
|
||||
template struct tvec4<int16, mediump>;
|
||||
template struct tvec4<int32, mediump>;
|
||||
template struct tvec4<int64, mediump>;
|
||||
template struct tvec4<float32, mediump>;
|
||||
template struct tvec4<float64, mediump>;
|
||||
template struct vec<4, uint8, mediump>;
|
||||
template struct vec<4, uint16, mediump>;
|
||||
template struct vec<4, uint32, mediump>;
|
||||
template struct vec<4, uint64, mediump>;
|
||||
template struct vec<4, int8, mediump>;
|
||||
template struct vec<4, int16, mediump>;
|
||||
template struct vec<4, int32, mediump>;
|
||||
template struct vec<4, int64, mediump>;
|
||||
template struct vec<4, float32, mediump>;
|
||||
template struct vec<4, float64, mediump>;
|
||||
|
||||
template struct tvec4<uint8, highp>;
|
||||
template struct tvec4<uint16, highp>;
|
||||
template struct tvec4<uint32, highp>;
|
||||
template struct tvec4<uint64, highp>;
|
||||
template struct tvec4<int8, highp>;
|
||||
template struct tvec4<int16, highp>;
|
||||
template struct tvec4<int32, highp>;
|
||||
template struct tvec4<int64, highp>;
|
||||
template struct tvec4<float32, highp>;
|
||||
template struct tvec4<float64, highp>;
|
||||
template struct vec<4, uint8, highp>;
|
||||
template struct vec<4, uint16, highp>;
|
||||
template struct vec<4, uint32, highp>;
|
||||
template struct vec<4, uint64, highp>;
|
||||
template struct vec<4, int8, highp>;
|
||||
template struct vec<4, int16, highp>;
|
||||
template struct vec<4, int32, highp>;
|
||||
template struct vec<4, int64, highp>;
|
||||
template struct vec<4, float32, highp>;
|
||||
template struct vec<4, float64, highp>;
|
||||
|
||||
// tmat2x2 type explicit instantiation
|
||||
template struct tmat2x2<float32, lowp>;
|
||||
template struct tmat2x2<float64, lowp>;
|
||||
template struct mat<2, 2, float32, lowp>;
|
||||
template struct mat<2, 2, float64, lowp>;
|
||||
|
||||
template struct tmat2x2<float32, mediump>;
|
||||
template struct tmat2x2<float64, mediump>;
|
||||
template struct mat<2, 2, float32, mediump>;
|
||||
template struct mat<2, 2, float64, mediump>;
|
||||
|
||||
template struct tmat2x2<float32, highp>;
|
||||
template struct tmat2x2<float64, highp>;
|
||||
template struct mat<2, 2, float32, highp>;
|
||||
template struct mat<2, 2, float64, highp>;
|
||||
|
||||
// tmat2x3 type explicit instantiation
|
||||
template struct tmat2x3<float32, lowp>;
|
||||
template struct tmat2x3<float64, lowp>;
|
||||
template struct mat<2, 3, float32, lowp>;
|
||||
template struct mat<2, 3, float64, lowp>;
|
||||
|
||||
template struct tmat2x3<float32, mediump>;
|
||||
template struct tmat2x3<float64, mediump>;
|
||||
template struct mat<2, 3, float32, mediump>;
|
||||
template struct mat<2, 3, float64, mediump>;
|
||||
|
||||
template struct tmat2x3<float32, highp>;
|
||||
template struct tmat2x3<float64, highp>;
|
||||
template struct mat<2, 3, float32, highp>;
|
||||
template struct mat<2, 3, float64, highp>;
|
||||
|
||||
// tmat2x4 type explicit instantiation
|
||||
template struct tmat2x4<float32, lowp>;
|
||||
template struct tmat2x4<float64, lowp>;
|
||||
template struct mat<2, 4, float32, lowp>;
|
||||
template struct mat<2, 4, float64, lowp>;
|
||||
|
||||
template struct tmat2x4<float32, mediump>;
|
||||
template struct tmat2x4<float64, mediump>;
|
||||
template struct mat<2, 4, float32, mediump>;
|
||||
template struct mat<2, 4, float64, mediump>;
|
||||
|
||||
template struct tmat2x4<float32, highp>;
|
||||
template struct tmat2x4<float64, highp>;
|
||||
template struct mat<2, 4, float32, highp>;
|
||||
template struct mat<2, 4, float64, highp>;
|
||||
|
||||
// tmat3x2 type explicit instantiation
|
||||
template struct tmat3x2<float32, lowp>;
|
||||
template struct tmat3x2<float64, lowp>;
|
||||
template struct mat<3, 2, float32, lowp>;
|
||||
template struct mat<3, 2, float64, lowp>;
|
||||
|
||||
template struct tmat3x2<float32, mediump>;
|
||||
template struct tmat3x2<float64, mediump>;
|
||||
template struct mat<3, 2, float32, mediump>;
|
||||
template struct mat<3, 2, float64, mediump>;
|
||||
|
||||
template struct tmat3x2<float32, highp>;
|
||||
template struct tmat3x2<float64, highp>;
|
||||
template struct mat<3, 2, float32, highp>;
|
||||
template struct mat<3, 2, float64, highp>;
|
||||
|
||||
// tmat3x3 type explicit instantiation
|
||||
template struct tmat3x3<float32, lowp>;
|
||||
template struct tmat3x3<float64, lowp>;
|
||||
template struct mat<3, 3, float32, lowp>;
|
||||
template struct mat<3, 3, float64, lowp>;
|
||||
|
||||
template struct tmat3x3<float32, mediump>;
|
||||
template struct tmat3x3<float64, mediump>;
|
||||
template struct mat<3, 3, float32, mediump>;
|
||||
template struct mat<3, 3, float64, mediump>;
|
||||
|
||||
template struct tmat3x3<float32, highp>;
|
||||
template struct tmat3x3<float64, highp>;
|
||||
template struct mat<3, 3, float32, highp>;
|
||||
template struct mat<3, 3, float64, highp>;
|
||||
|
||||
// tmat3x4 type explicit instantiation
|
||||
template struct tmat3x4<float32, lowp>;
|
||||
template struct tmat3x4<float64, lowp>;
|
||||
template struct mat<3, 4, float32, lowp>;
|
||||
template struct mat<3, 4, float64, lowp>;
|
||||
|
||||
template struct tmat3x4<float32, mediump>;
|
||||
template struct tmat3x4<float64, mediump>;
|
||||
template struct mat<3, 4, float32, mediump>;
|
||||
template struct mat<3, 4, float64, mediump>;
|
||||
|
||||
template struct tmat3x4<float32, highp>;
|
||||
template struct tmat3x4<float64, highp>;
|
||||
template struct mat<3, 4, float32, highp>;
|
||||
template struct mat<3, 4, float64, highp>;
|
||||
|
||||
// tmat4x2 type explicit instantiation
|
||||
template struct tmat4x2<float32, lowp>;
|
||||
template struct tmat4x2<float64, lowp>;
|
||||
template struct mat<4, 2, float32, lowp>;
|
||||
template struct mat<4, 2, float64, lowp>;
|
||||
|
||||
template struct tmat4x2<float32, mediump>;
|
||||
template struct tmat4x2<float64, mediump>;
|
||||
template struct mat<4, 2, float32, mediump>;
|
||||
template struct mat<4, 2, float64, mediump>;
|
||||
|
||||
template struct tmat4x2<float32, highp>;
|
||||
template struct tmat4x2<float64, highp>;
|
||||
template struct mat<4, 2, float32, highp>;
|
||||
template struct mat<4, 2, float64, highp>;
|
||||
|
||||
// tmat4x3 type explicit instantiation
|
||||
template struct tmat4x3<float32, lowp>;
|
||||
template struct tmat4x3<float64, lowp>;
|
||||
template struct mat<4, 3, float32, lowp>;
|
||||
template struct mat<4, 3, float64, lowp>;
|
||||
|
||||
template struct tmat4x3<float32, mediump>;
|
||||
template struct tmat4x3<float64, mediump>;
|
||||
template struct mat<4, 3, float32, mediump>;
|
||||
template struct mat<4, 3, float64, mediump>;
|
||||
|
||||
template struct tmat4x3<float32, highp>;
|
||||
template struct tmat4x3<float64, highp>;
|
||||
template struct mat<4, 3, float32, highp>;
|
||||
template struct mat<4, 3, float64, highp>;
|
||||
|
||||
// tmat4x4 type explicit instantiation
|
||||
template struct tmat4x4<float32, lowp>;
|
||||
template struct tmat4x4<float64, lowp>;
|
||||
template struct mat<4, 4, float32, lowp>;
|
||||
template struct mat<4, 4, float64, lowp>;
|
||||
|
||||
template struct tmat4x4<float32, mediump>;
|
||||
template struct tmat4x4<float64, mediump>;
|
||||
template struct mat<4, 4, float32, mediump>;
|
||||
template struct mat<4, 4, float64, mediump>;
|
||||
|
||||
template struct tmat4x4<float32, highp>;
|
||||
template struct tmat4x4<float64, highp>;
|
||||
template struct mat<4, 4, float32, highp>;
|
||||
template struct mat<4, 4, float64, highp>;
|
||||
|
||||
// tquat type explicit instantiation
|
||||
template struct tquat<float32, lowp>;
|
||||
template struct tquat<float64, lowp>;
|
||||
template struct qua<float32, lowp>;
|
||||
template struct qua<float64, lowp>;
|
||||
|
||||
template struct tquat<float32, mediump>;
|
||||
template struct tquat<float64, mediump>;
|
||||
template struct qua<float32, mediump>;
|
||||
template struct qua<float64, mediump>;
|
||||
|
||||
template struct tquat<float32, highp>;
|
||||
template struct tquat<float64, highp>;
|
||||
template struct qua<float32, highp>;
|
||||
template struct qua<float64, highp>;
|
||||
|
||||
//tdualquat type explicit instantiation
|
||||
template struct tdualquat<float32, lowp>;
|
||||
|
||||
Reference in New Issue
Block a user