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

Update for latest nazarautils update

Browse Source
This commit is contained in:
SirLynix
2023-07-17 19:05:15 +02:00
parent af3d1cfa26
commit f2bc1bff7a
30 changed files with 129 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Math/Vector2.inl
View File

@@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - Math module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/Algorithm.hpp>
#include <NazaraUtils/Hash.hpp>
#include <cstring>
#include <limits>
#include <sstream>
@@ -774,15 +774,9 @@ namespace std
*/
std::size_t operator()(const Nz::Vector2<T>& v) const
{
std::size_t seed {};
Nz::HashCombine(seed, v.x);
Nz::HashCombine(seed, v.y);
return seed;
return Nz::HashCombine(v.x, v.y);
}
};
}
#include <Nazara/Core/DebugOff.hpp>
#include "Vector2.hpp"

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

@@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - Math module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/Algorithm.hpp>
#include <NazaraUtils/Hash.hpp>
#include <cstring>
#include <limits>
#include <stdexcept>
@@ -990,13 +990,7 @@ namespace std
std::size_t operator()(const Nz::Vector3<T>& v) const
{
std::size_t seed {};
Nz::HashCombine(seed, v.x);
Nz::HashCombine(seed, v.y);
Nz::HashCombine(seed, v.z);
return seed;
return Nz::HashCombine(v.x, v.y, v.z);
}
};
}

12
include/Nazara/Math/Vector4.inl
View File

@@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - Math module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/Algorithm.hpp>
#include <NazaraUtils/Algorithm.hpp>
#include <cstring>
#include <sstream>
#include <stdexcept>
@@ -808,17 +808,9 @@ namespace std
*/
std::size_t operator()(const Nz::Vector4<T>& v) const
{
std::size_t seed {};
Nz::HashCombine(seed, v.x);
Nz::HashCombine(seed, v.y);
Nz::HashCombine(seed, v.z);
Nz::HashCombine(seed, v.w);
return seed;
return Nz::HashCombine(v.x, v.y, v.z, v.w);
}
};
}
#include <Nazara/Core/DebugOff.hpp>
#include "Vector4.hpp"