mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/g-truc/glm

Browse Source
This commit is contained in:
Christophe R 2015-08-23 14:49:37 +02:00
commit ebdd48fa6f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glm/gtc/random.inl
View File

@ -51,7 +51,7 @@ namespace detail
GLM_FUNC_QUALIFIER static tvec1<uint8, P> call() GLM_FUNC_QUALIFIER static tvec1<uint8, P> call()
{ {
return tvec1<uint8, P>( return tvec1<uint8, P>(
std::rand()) % std::numeric_limits<uint8>::max(); std::rand() % std::numeric_limits<uint8>::max());
} }
}; };
@ -61,8 +61,8 @@ namespace detail
GLM_FUNC_QUALIFIER static tvec2<uint8, P> call() GLM_FUNC_QUALIFIER static tvec2<uint8, P> call()
{ {
return tvec2<uint8, P>( return tvec2<uint8, P>(
std::rand(), std::rand() % std::numeric_limits<uint8>::max(),
std::rand()) % std::numeric_limits<uint8>::max(); std::rand() % std::numeric_limits<uint8>::max());
} }
}; };
@ -72,9 +72,9 @@ namespace detail
GLM_FUNC_QUALIFIER static tvec3<uint8, P> call() GLM_FUNC_QUALIFIER static tvec3<uint8, P> call()
{ {
return tvec3<uint8, P>( return tvec3<uint8, P>(
std::rand(), std::rand() % std::numeric_limits<uint8>::max(),
std::rand(), std::rand() % std::numeric_limits<uint8>::max(),
std::rand()) % std::numeric_limits<uint8>::max(); std::rand() % std::numeric_limits<uint8>::max());
} }
}; };
@ -84,10 +84,10 @@ namespace detail
GLM_FUNC_QUALIFIER static tvec4<uint8, P> call() GLM_FUNC_QUALIFIER static tvec4<uint8, P> call()
{ {
return tvec4<uint8, P>( return tvec4<uint8, P>(
std::rand(), std::rand() % std::numeric_limits<uint8>::max(),
std::rand(), std::rand() % std::numeric_limits<uint8>::max(),
std::rand(), std::rand() % std::numeric_limits<uint8>::max(),
std::rand()) % std::numeric_limits<uint8>::max(); std::rand() % std::numeric_limits<uint8>::max());
} }
}; };

8
glm/gtx/hash.hpp
View File

@ -41,10 +41,6 @@
#pragma once #pragma once
#if !GLM_HAS_CXX11_STL
# error "GLM_GTX_hash requires C++11 standard library support"
#endif
#include <functional> #include <functional>
#include "../vec2.hpp" #include "../vec2.hpp"
@ -67,6 +63,10 @@
#include "../mat4x3.hpp" #include "../mat4x3.hpp"
#include "../mat4x4.hpp" #include "../mat4x4.hpp"
#if !GLM_HAS_CXX11_STL
# error "GLM_GTX_hash requires C++11 standard library support"
#endif
namespace std namespace std
{ {
template <typename T, glm::precision P> template <typename T, glm::precision P>