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

Merge branch 'fix-typeconversions' into fix-tvec-copy-cpp11

Browse Source
This commit is contained in:
Patrik Huber 2016-08-21 20:25:08 +01:00
commit 65cd3df301
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtc/matrix_transform.inl
View File

@ -190,7 +190,7 @@ namespace glm
T bottom, T top T bottom, T top
) )
{ {
tmat4x4<T, defaultp> Result(1); tmat4x4<T, defaultp> Result(T(1));
Result[0][0] = static_cast<T>(2) / (right - left); Result[0][0] = static_cast<T>(2) / (right - left);
Result[1][1] = static_cast<T>(2) / (top - bottom); Result[1][1] = static_cast<T>(2) / (top - bottom);
Result[2][2] = - static_cast<T>(1); Result[2][2] = - static_cast<T>(1);

2
glm/gtx/transform.inl
View File

@ -8,7 +8,7 @@ namespace glm
tvec3<T, P> const & v) tvec3<T, P> const & v)
{ {
return translate( return translate(
tmat4x4<T, P>(1.0f), v); tmat4x4<T, P>(T(1)), v);
} }
template <typename T, precision P> template <typename T, precision P>