Added std::hash for String, made use of unordered_map

Former-commit-id: 20f3d12bc3222873706949f0a7d0a131e237a247
This commit is contained in:
Lynix
2013-06-23 16:53:37 +02:00
parent 3e82794b70
commit 3609f31708
9 changed files with 51 additions and 15 deletions

View File

@@ -6,13 +6,13 @@
#include <Nazara/Core/Error.hpp>
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Skeleton.hpp>
#include <map>
#include <vector>
#include <unordered_map>
#include <Nazara/Utility/Debug.hpp>
struct NzAnimationImpl
{
std::map<NzString, unsigned int> sequenceMap;
std::unordered_map<NzString, unsigned int> sequenceMap;
std::vector<NzSequence> sequences;
std::vector<NzSequenceJoint> sequenceJoints; // Uniquement pour les animations squelettiques
nzAnimationType type;

View File

@@ -18,9 +18,9 @@
#include <Nazara/Utility/StaticMesh.hpp>
#include <Nazara/Utility/SubMesh.hpp>
#include <cstring>
#include <map>
#include <memory>
#include <limits>
#include <memory>
#include <unordered_map>
#include <Nazara/Utility/Debug.hpp>
NzMeshParams::NzMeshParams()
@@ -48,7 +48,7 @@ bool NzMeshParams::IsValid() const
struct NzMeshImpl
{
std::map<NzString, unsigned int> subMeshMap;
std::unordered_map<NzString, unsigned int> subMeshMap;
std::vector<NzString> materials;
std::vector<NzSubMesh*> subMeshes;
nzAnimationType animationType;

View File

@@ -3,12 +3,12 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Skeleton.hpp>
#include <map>
#include <unordered_map>
#include <Nazara/Utility/Debug.hpp>
struct NzSkeletonImpl
{
std::map<NzString, unsigned int> jointMap; ///FIXME: unordered_map
std::unordered_map<NzString, unsigned int> jointMap;
std::vector<NzJoint> joints;
NzBoxf aabb;
bool aabbUpdated = false;