mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-02 04:37:54 +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,53 +1,24 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
/// 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 gtc_random
|
||||
/// @file glm/gtc/random.hpp
|
||||
/// @date 2011-09-18 / 2011-09-18
|
||||
/// @author Christophe Riccio
|
||||
///
|
||||
/// @see core (dependence)
|
||||
/// @see gtc_half_float (dependence)
|
||||
/// @see gtx_random (extended)
|
||||
///
|
||||
/// @defgroup gtc_random GLM_GTC_random
|
||||
/// @ingroup gtc
|
||||
///
|
||||
/// @brief Generate random number from various distribution methods.
|
||||
///
|
||||
/// <glm/gtc/random.hpp> need to be included to use these functionalities.
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
///
|
||||
/// Include <glm/gtc/random.hpp> to use the features of this extension.
|
||||
///
|
||||
/// Generate random number from various distribution methods.
|
||||
|
||||
#pragma once
|
||||
|
||||
// Dependency:
|
||||
#include "../vec2.hpp"
|
||||
#include "../vec3.hpp"
|
||||
#include "../ext/scalar_int_sized.hpp"
|
||||
#include "../ext/scalar_uint_sized.hpp"
|
||||
#include "../detail/qualifier.hpp"
|
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
||||
#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
|
||||
# pragma message("GLM: GLM_GTC_random extension included")
|
||||
#endif
|
||||
|
||||
@@ -55,65 +26,56 @@ namespace glm
|
||||
{
|
||||
/// @addtogroup gtc_random
|
||||
/// @{
|
||||
|
||||
/// Generate random numbers in the interval [Min, Max], according a linear distribution
|
||||
///
|
||||
/// @param Min
|
||||
/// @param Max
|
||||
/// @tparam genType Value type. Currently supported: half (not recommanded), float or double scalars and vectors.
|
||||
/// @see gtc_random
|
||||
template <typename genTYpe>
|
||||
GLM_FUNC_DECL genTYpe linearRand(
|
||||
genTYpe Min,
|
||||
genTYpe Max);
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_DECL vecType<T, P> linearRand(
|
||||
vecType<T, P> const & Min,
|
||||
vecType<T, P> const & Max);
|
||||
|
||||
/// Generate random numbers in the interval [Min, Max], according a gaussian distribution
|
||||
///
|
||||
/// @param Mean
|
||||
/// @param Deviation
|
||||
/// Generate random numbers in the interval [Min, Max], according a linear distribution
|
||||
///
|
||||
/// @param Min Minimum value included in the sampling
|
||||
/// @param Max Maximum value included in the sampling
|
||||
/// @tparam genType Value type. Currently supported: float or double scalars.
|
||||
/// @see gtc_random
|
||||
template <typename genType>
|
||||
GLM_FUNC_DECL genType gaussRand(
|
||||
genType Mean,
|
||||
genType Deviation);
|
||||
|
||||
template<typename genType>
|
||||
GLM_FUNC_DECL genType linearRand(genType Min, genType Max);
|
||||
|
||||
/// Generate random numbers in the interval [Min, Max], according a linear distribution
|
||||
///
|
||||
/// @param Min Minimum value included in the sampling
|
||||
/// @param Max Maximum value included in the sampling
|
||||
/// @tparam T Value type. Currently supported: float or double.
|
||||
///
|
||||
/// @see gtc_random
|
||||
template<length_t L, typename T, qualifier Q>
|
||||
GLM_FUNC_DECL vec<L, T, Q> linearRand(vec<L, T, Q> const& Min, vec<L, T, Q> const& Max);
|
||||
|
||||
/// Generate random numbers in the interval [Min, Max], according a gaussian distribution
|
||||
///
|
||||
/// @see gtc_random
|
||||
template<typename genType>
|
||||
GLM_FUNC_DECL genType gaussRand(genType Mean, genType Deviation);
|
||||
|
||||
/// Generate a random 2D vector which coordinates are regulary distributed on a circle of a given radius
|
||||
///
|
||||
/// @param Radius
|
||||
///
|
||||
/// @see gtc_random
|
||||
template <typename T>
|
||||
GLM_FUNC_DECL tvec2<T, defaultp> circularRand(
|
||||
T Radius);
|
||||
|
||||
template<typename T>
|
||||
GLM_FUNC_DECL vec<2, T, defaultp> circularRand(T Radius);
|
||||
|
||||
/// Generate a random 3D vector which coordinates are regulary distributed on a sphere of a given radius
|
||||
///
|
||||
/// @param Radius
|
||||
///
|
||||
/// @see gtc_random
|
||||
template <typename T>
|
||||
GLM_FUNC_DECL tvec3<T, defaultp> sphericalRand(
|
||||
T Radius);
|
||||
|
||||
template<typename T>
|
||||
GLM_FUNC_DECL vec<3, T, defaultp> sphericalRand(T Radius);
|
||||
|
||||
/// Generate a random 2D vector which coordinates are regulary distributed within the area of a disk of a given radius
|
||||
///
|
||||
/// @param Radius
|
||||
///
|
||||
/// @see gtc_random
|
||||
template <typename T>
|
||||
GLM_FUNC_DECL tvec2<T, defaultp> diskRand(
|
||||
T Radius);
|
||||
|
||||
template<typename T>
|
||||
GLM_FUNC_DECL vec<2, T, defaultp> diskRand(T Radius);
|
||||
|
||||
/// Generate a random 3D vector which coordinates are regulary distributed within the volume of a ball of a given radius
|
||||
///
|
||||
/// @param Radius
|
||||
///
|
||||
/// @see gtc_random
|
||||
template <typename T>
|
||||
GLM_FUNC_DECL tvec3<T, defaultp> ballRand(
|
||||
T Radius);
|
||||
|
||||
template<typename T>
|
||||
GLM_FUNC_DECL vec<3, T, defaultp> ballRand(T Radius);
|
||||
|
||||
/// @}
|
||||
}//namespace glm
|
||||
|
||||
|
||||
Reference in New Issue
Block a user