sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a shitloads of warnings on VS

Browse Source 
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
This commit is contained in:
Lynix
2015-11-25 18:19:26 +01:00
parent c6d16c0128
commit bbe8a776e8
42 changed files with 406 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Algorithm.hpp
View File

@@ -36,7 +36,7 @@ namespace Nz
template<typename T> constexpr T FromDegrees(T degrees);
template<typename T> constexpr T FromRadians(T radians);
template<typename T> constexpr T DegreeToRadian(T degrees);
unsigned int GetNearestPowerOfTwo(unsigned int number);
template<typename T> T GetNearestPowerOfTwo(T number);
unsigned int GetNumberLength(signed char number);
unsigned int GetNumberLength(unsigned char number);
unsigned int GetNumberLength(int number);

5
include/Nazara/Math/Algorithm.inl
View File

@@ -156,10 +156,11 @@ namespace Nz
#endif
}
inline unsigned int GetNearestPowerOfTwo(unsigned int number)
template<typename T>
T GetNearestPowerOfTwo(T number)
{
///TODO: Marquer comme constexpr en C++14
unsigned int x = 1;
T x = 1;
// Tant que x est plus petit que n, on décale ses bits vers la gauche, ce qui revient à multiplier par deux
while (x < number)
x <<= 1;

4
include/Nazara/Math/Vector3.inl
View File

@@ -109,13 +109,13 @@ namespace Nz
template<typename T>
T Vector3<T>::GetLength() const
{
return std::sqrt(GetSquaredLength());
return static_cast<T>(std::sqrt(GetSquaredLength()));
}
template<typename T>
float Vector3<T>::GetLengthf() const
{
return std::sqrt(static_cast<float>(GetSquaredLength()));
return std::sqrt<float>(static_cast<float>(GetSquaredLength()));
}
template<typename T>