From 6a609055dcc8727da37446b250cae74d2938fdfb Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sun, 9 Apr 2023 20:53:34 +0200 Subject: [PATCH] Replace ordered_map with unordered_map when ordering is not required --- src/Nazara/BulletPhysics3D/BulletCollider3D.cpp | 4 ++-- src/Nazara/JoltPhysics3D/JoltCollider3D.cpp | 4 ++-- xmake.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Nazara/BulletPhysics3D/BulletCollider3D.cpp b/src/Nazara/BulletPhysics3D/BulletCollider3D.cpp index 220b3beab..1deb14f82 100644 --- a/src/Nazara/BulletPhysics3D/BulletCollider3D.cpp +++ b/src/Nazara/BulletPhysics3D/BulletCollider3D.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -21,6 +20,7 @@ #include #include #include +#include #include namespace Nz @@ -299,7 +299,7 @@ namespace Nz void BulletConvexCollider3D::BuildDebugMesh(std::vector& vertices, std::vector& indices, const Matrix4f& offsetMatrix) const { - tsl::ordered_map vertexCache; + std::unordered_map vertexCache; auto InsertVertex = [&](const Vector3f& position) -> UInt16 { auto it = vertexCache.find(position); diff --git a/src/Nazara/JoltPhysics3D/JoltCollider3D.cpp b/src/Nazara/JoltPhysics3D/JoltCollider3D.cpp index da0a6952f..77885fc60 100644 --- a/src/Nazara/JoltPhysics3D/JoltCollider3D.cpp +++ b/src/Nazara/JoltPhysics3D/JoltCollider3D.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -19,6 +18,7 @@ #include #include #include +#include #include namespace Nz @@ -302,7 +302,7 @@ namespace Nz void JoltConvexHullCollider3D::BuildDebugMesh(std::vector& vertices, std::vector& indices, const Matrix4f& offsetMatrix) const { - tsl::ordered_map vertexCache; + std::unordered_map vertexCache; auto InsertVertex = [&](const Vector3f& position) -> UInt16 { auto it = vertexCache.find(position); diff --git a/xmake.lua b/xmake.lua index 8253067cb..7f23c4261 100644 --- a/xmake.lua +++ b/xmake.lua @@ -68,7 +68,7 @@ local modules = { }, BulletPhysics3D = { Deps = {"NazaraUtility"}, - Packages = { "bullet3", "entt", "ordered_map" } + Packages = { "bullet3", "entt" } }, Core = { Custom = function ()