mirror of
https://github.com/g-truc/glm.git
synced 2024-11-26 18:24:35 +00:00
Merge 0.9.7 branch
This commit is contained in:
commit
79643cf4fa
@ -208,7 +208,7 @@ namespace detail
|
||||
{
|
||||
uint64 const Value64(static_cast<uint64>(x) + static_cast<uint64>(y));
|
||||
uint64 const Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
|
||||
Carry = Value64 > Max32 ? 1 : 0;
|
||||
Carry = Value64 > Max32 ? 1u : 0u;
|
||||
return static_cast<uint32>(Value64 % (Max32 + static_cast<uint64>(1)));
|
||||
}
|
||||
|
||||
|
@ -76,6 +76,10 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
|
||||
##### Deprecation:
|
||||
- Removed GLM_FORCE_SIZE_FUNC define
|
||||
|
||||
#### [GLM 0.9.7.5](https://github.com/g-truc/glm/tree/0.9.7) - 2016-0X-XX
|
||||
##### Fixes:
|
||||
- Fixed uaddCarry warning #497
|
||||
|
||||
#### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19
|
||||
##### Fixes:
|
||||
- Fixed asinh and atanh warning with C++98 STL #484
|
||||
|
Loading…
Reference in New Issue
Block a user