diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp index 39e57234a3..36e0287461 100644 --- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp +++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp @@ -48,35 +48,6 @@ namespace DetourNavigator }; return tie(lhs) == tie(rhs); } - - static inline std::ostream& operator<<(std::ostream& s, const Water& v) - { - return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}"; - } - - static inline std::ostream& operator<<(std::ostream& s, const CellWater& v) - { - return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}"; - } - - static inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v) - { - return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}"; - } - - static inline std::ostream& operator<<(std::ostream& s, const Heightfield& v) - { - s << "Heightfield {.mCellPosition=" << v.mCellPosition - << ", .mCellSize=" << v.mCellSize - << ", .mLength=" << static_cast(v.mLength) - << ", .mMinHeight=" << v.mMinHeight - << ", .mMaxHeight=" << v.mMaxHeight - << ", .mHeights={"; - for (float h : v.mHeights) - s << h << ", "; - s << "}"; - return s << ", .mOriginalSize=" << v.mOriginalSize << "}"; - } } namespace diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp index a868ac2a2e..7c86603348 100644 --- a/components/detournavigator/debug.hpp +++ b/components/detournavigator/debug.hpp @@ -3,6 +3,7 @@ #include "tilebounds.hpp" #include "status.hpp" +#include "recastmesh.hpp" #include @@ -39,6 +40,35 @@ namespace DetourNavigator return stream << "DetourNavigator::Error::" << static_cast(value); } + inline std::ostream& operator<<(std::ostream& s, const Water& v) + { + return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}"; + } + + inline std::ostream& operator<<(std::ostream& s, const CellWater& v) + { + return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}"; + } + + inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v) + { + return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}"; + } + + inline std::ostream& operator<<(std::ostream& s, const Heightfield& v) + { + s << "Heightfield {.mCellPosition=" << v.mCellPosition + << ", .mCellSize=" << v.mCellSize + << ", .mLength=" << static_cast(v.mLength) + << ", .mMinHeight=" << v.mMinHeight + << ", .mMaxHeight=" << v.mMaxHeight + << ", .mHeights={"; + for (float h : v.mHeights) + s << h << ", "; + s << "}"; + return s << ", .mOriginalSize=" << v.mOriginalSize << "}"; + } + class RecastMesh; struct Settings;