diff options
| author | lhofhansl <lhofhansl@yahoo.com> | 2018-07-08 13:30:55 -0700 |
|---|---|---|
| committer | Paramat <paramat@users.noreply.github.com> | 2018-07-08 21:30:55 +0100 |
| commit | 94cd2bfeac073bf0ff0c384e4921c90f281747b0 (patch) | |
| tree | 8a07ce985e9486b2bd37c1cbb344286cea5fa446 /src/irr_v3d.h | |
| parent | 334d8c31ee96f2e6a8464c99eecf84793f598fb6 (diff) | |
| download | minetest-94cd2bfeac073bf0ff0c384e4921c90f281747b0.tar.gz minetest-94cd2bfeac073bf0ff0c384e4921c90f281747b0.tar.bz2 minetest-94cd2bfeac073bf0ff0c384e4921c90f281747b0.zip | |
Revert 6587 - Optimize entity-entity collision (#7539)
Diffstat (limited to 'src/irr_v3d.h')
| -rw-r--r-- | src/irr_v3d.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/irr_v3d.h b/src/irr_v3d.h index 49c2e60ce..3e95c7913 100644 --- a/src/irr_v3d.h +++ b/src/irr_v3d.h @@ -18,29 +18,13 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #pragma once + #include "irrlichttypes.h" + #include <vector3d.h> -#include <functional> typedef core::vector3df v3f; typedef core::vector3d<double> v3d; typedef core::vector3d<s16> v3s16; typedef core::vector3d<u16> v3u16; typedef core::vector3d<s32> v3s32; - -namespace std -{ -template <> struct hash<v3s16> -{ - typedef v3s16 argument_type; - typedef std::size_t result_type; - result_type operator()(const argument_type &s) const noexcept - { - // clang-format off - return static_cast<size_t>((static_cast<u64>(s.X) << 20) ^ - (static_cast<u64>(s.Y) << 10) ^ - (static_cast<u64>(s.Z))); - // clang-format on - } -}; -} |