mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-30 20:13:22 +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:
Joey de Vries
@@ -1,67 +1,118 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
/// 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.
|
||||
///
|
||||
/// @file glm/glm.hpp
|
||||
/// @date 2009-05-01 / 2011-05-16
|
||||
/// @author Christophe Riccio
|
||||
/// @file glm/ext.hpp
|
||||
///
|
||||
/// @ref core (Dependence)
|
||||
///
|
||||
/// @defgroup gtc GTC Extensions (Stable)
|
||||
///
|
||||
/// @brief Functions and types that the GLSL specification doesn't define, but useful to have for a C++ program.
|
||||
///
|
||||
/// GTC extensions aim to be stable.
|
||||
///
|
||||
/// Even if it's highly unrecommended, it's possible to include all the extensions at once by
|
||||
/// including <glm/ext.hpp>. Otherwise, each extension needs to be included a specific file.
|
||||
///
|
||||
/// @defgroup gtx GTX Extensions (Experimental)
|
||||
///
|
||||
/// @brief Functions and types that the GLSL specification doesn't define, but
|
||||
/// useful to have for a C++ program.
|
||||
///
|
||||
/// Experimental extensions are useful functions and types, but the development of
|
||||
/// their API and functionality is not necessarily stable. They can change
|
||||
/// substantially between versions. Backwards compatibility is not much of an issue
|
||||
/// for them.
|
||||
///
|
||||
/// Even if it's highly unrecommended, it's possible to include all the extensions
|
||||
/// at once by including <glm/ext.hpp>. Otherwise, each extension needs to be
|
||||
/// included a specific file.
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "detail/setup.hpp"
|
||||
|
||||
#pragma once
|
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED))
|
||||
#include "glm.hpp"
|
||||
|
||||
#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED)
|
||||
# define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED
|
||||
# pragma message("GLM: All extensions included (not recommanded)")
|
||||
# pragma message("GLM: All extensions included (not recommended)")
|
||||
#endif//GLM_MESSAGES
|
||||
|
||||
#include "./ext/matrix_double2x2.hpp"
|
||||
#include "./ext/matrix_double2x2_precision.hpp"
|
||||
#include "./ext/matrix_double2x3.hpp"
|
||||
#include "./ext/matrix_double2x3_precision.hpp"
|
||||
#include "./ext/matrix_double2x4.hpp"
|
||||
#include "./ext/matrix_double2x4_precision.hpp"
|
||||
#include "./ext/matrix_double3x2.hpp"
|
||||
#include "./ext/matrix_double3x2_precision.hpp"
|
||||
#include "./ext/matrix_double3x3.hpp"
|
||||
#include "./ext/matrix_double3x3_precision.hpp"
|
||||
#include "./ext/matrix_double3x4.hpp"
|
||||
#include "./ext/matrix_double3x4_precision.hpp"
|
||||
#include "./ext/matrix_double4x2.hpp"
|
||||
#include "./ext/matrix_double4x2_precision.hpp"
|
||||
#include "./ext/matrix_double4x3.hpp"
|
||||
#include "./ext/matrix_double4x3_precision.hpp"
|
||||
#include "./ext/matrix_double4x4.hpp"
|
||||
#include "./ext/matrix_double4x4_precision.hpp"
|
||||
|
||||
#include "./ext/matrix_float2x2.hpp"
|
||||
#include "./ext/matrix_float2x2_precision.hpp"
|
||||
#include "./ext/matrix_float2x3.hpp"
|
||||
#include "./ext/matrix_float2x3_precision.hpp"
|
||||
#include "./ext/matrix_float2x4.hpp"
|
||||
#include "./ext/matrix_float2x4_precision.hpp"
|
||||
#include "./ext/matrix_float3x2.hpp"
|
||||
#include "./ext/matrix_float3x2_precision.hpp"
|
||||
#include "./ext/matrix_float3x3.hpp"
|
||||
#include "./ext/matrix_float3x3_precision.hpp"
|
||||
#include "./ext/matrix_float3x4.hpp"
|
||||
#include "./ext/matrix_float3x4_precision.hpp"
|
||||
#include "./ext/matrix_float4x2.hpp"
|
||||
#include "./ext/matrix_float4x2_precision.hpp"
|
||||
#include "./ext/matrix_float4x3.hpp"
|
||||
#include "./ext/matrix_float4x3_precision.hpp"
|
||||
#include "./ext/matrix_float4x4.hpp"
|
||||
#include "./ext/matrix_float4x4_precision.hpp"
|
||||
|
||||
#include "./ext/matrix_relational.hpp"
|
||||
|
||||
#include "./ext/quaternion_double.hpp"
|
||||
#include "./ext/quaternion_double_precision.hpp"
|
||||
#include "./ext/quaternion_float.hpp"
|
||||
#include "./ext/quaternion_float_precision.hpp"
|
||||
#include "./ext/quaternion_geometric.hpp"
|
||||
#include "./ext/quaternion_relational.hpp"
|
||||
|
||||
#include "./ext/scalar_constants.hpp"
|
||||
#include "./ext/scalar_int_sized.hpp"
|
||||
#include "./ext/scalar_relational.hpp"
|
||||
|
||||
#include "./ext/vector_bool1.hpp"
|
||||
#include "./ext/vector_bool1_precision.hpp"
|
||||
#include "./ext/vector_bool2.hpp"
|
||||
#include "./ext/vector_bool2_precision.hpp"
|
||||
#include "./ext/vector_bool3.hpp"
|
||||
#include "./ext/vector_bool3_precision.hpp"
|
||||
#include "./ext/vector_bool4.hpp"
|
||||
#include "./ext/vector_bool4_precision.hpp"
|
||||
|
||||
#include "./ext/vector_double1.hpp"
|
||||
#include "./ext/vector_double1_precision.hpp"
|
||||
#include "./ext/vector_double2.hpp"
|
||||
#include "./ext/vector_double2_precision.hpp"
|
||||
#include "./ext/vector_double3.hpp"
|
||||
#include "./ext/vector_double3_precision.hpp"
|
||||
#include "./ext/vector_double4.hpp"
|
||||
#include "./ext/vector_double4_precision.hpp"
|
||||
|
||||
#include "./ext/vector_float1.hpp"
|
||||
#include "./ext/vector_float1_precision.hpp"
|
||||
#include "./ext/vector_float2.hpp"
|
||||
#include "./ext/vector_float2_precision.hpp"
|
||||
#include "./ext/vector_float3.hpp"
|
||||
#include "./ext/vector_float3_precision.hpp"
|
||||
#include "./ext/vector_float4.hpp"
|
||||
#include "./ext/vector_float4_precision.hpp"
|
||||
|
||||
#include "./ext/vector_int1.hpp"
|
||||
#include "./ext/vector_int1_precision.hpp"
|
||||
#include "./ext/vector_int2.hpp"
|
||||
#include "./ext/vector_int2_precision.hpp"
|
||||
#include "./ext/vector_int3.hpp"
|
||||
#include "./ext/vector_int3_precision.hpp"
|
||||
#include "./ext/vector_int4.hpp"
|
||||
#include "./ext/vector_int4_precision.hpp"
|
||||
|
||||
#include "./ext/vector_relational.hpp"
|
||||
|
||||
#include "./ext/vector_uint1.hpp"
|
||||
#include "./ext/vector_uint1_precision.hpp"
|
||||
#include "./ext/vector_uint2.hpp"
|
||||
#include "./ext/vector_uint2_precision.hpp"
|
||||
#include "./ext/vector_uint3.hpp"
|
||||
#include "./ext/vector_uint3_precision.hpp"
|
||||
#include "./ext/vector_uint4.hpp"
|
||||
#include "./ext/vector_uint4_precision.hpp"
|
||||
|
||||
#include "./gtc/bitfield.hpp"
|
||||
#include "./gtc/color_space.hpp"
|
||||
#include "./gtc/constants.hpp"
|
||||
#include "./gtc/epsilon.hpp"
|
||||
#include "./gtc/integer.hpp"
|
||||
@@ -79,10 +130,15 @@
|
||||
#include "./gtc/type_ptr.hpp"
|
||||
#include "./gtc/ulp.hpp"
|
||||
#include "./gtc/vec1.hpp"
|
||||
#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
|
||||
# include "./gtc/type_aligned.hpp"
|
||||
#endif
|
||||
|
||||
#ifdef GLM_ENABLE_EXPERIMENTAL
|
||||
#include "./gtx/associated_min_max.hpp"
|
||||
#include "./gtx/bit.hpp"
|
||||
#include "./gtx/closest_point.hpp"
|
||||
#include "./gtx/color_encoding.hpp"
|
||||
#include "./gtx/color_space.hpp"
|
||||
#include "./gtx/color_space_YCoCg.hpp"
|
||||
#include "./gtx/compatibility.hpp"
|
||||
@@ -90,10 +146,11 @@
|
||||
#include "./gtx/dual_quaternion.hpp"
|
||||
#include "./gtx/euler_angles.hpp"
|
||||
#include "./gtx/extend.hpp"
|
||||
#include "./gtx/extented_min_max.hpp"
|
||||
#include "./gtx/extended_min_max.hpp"
|
||||
#include "./gtx/fast_exponential.hpp"
|
||||
#include "./gtx/fast_square_root.hpp"
|
||||
#include "./gtx/fast_trigonometry.hpp"
|
||||
#include "./gtx/functions.hpp"
|
||||
#include "./gtx/gradient_paint.hpp"
|
||||
#include "./gtx/handed_coordinate_space.hpp"
|
||||
#include "./gtx/integer.hpp"
|
||||
@@ -124,7 +181,7 @@
|
||||
#endif
|
||||
#include "./gtx/transform.hpp"
|
||||
#include "./gtx/transform2.hpp"
|
||||
#include "./gtx/type_aligned.hpp"
|
||||
#include "./gtx/vec_swizzle.hpp"
|
||||
#include "./gtx/vector_angle.hpp"
|
||||
#include "./gtx/vector_query.hpp"
|
||||
#include "./gtx/wrap.hpp"
|
||||
@@ -136,8 +193,4 @@
|
||||
#if GLM_HAS_RANGE_FOR
|
||||
# include "./gtx/range.hpp"
|
||||
#endif
|
||||
|
||||
#if GLM_ARCH & GLM_ARCH_SSE2
|
||||
# include "./gtx/simd_vec4.hpp"
|
||||
# include "./gtx/simd_mat4.hpp"
|
||||
#endif
|
||||
#endif//GLM_ENABLE_EXPERIMENTAL
|
||||
|
||||
Reference in New Issue
Block a user