From 90986df81c9e0b9cd037bd51ad3f9b1e2d1d83b3 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Tue, 30 Oct 2018 22:15:32 +0000
Subject: [PATCH 1/4] Allow OSG objects to be sent to the debug log.

---
 components/debug/debuglog.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index f5cdffeda..0676f7689 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -4,6 +4,8 @@
 #include <mutex>
 #include <iostream>
 
+#include <osg/io_utils>
+
 namespace Debug
 {
     enum Level

From 4489f23005b6eff9727a41c3fad84a084b3d9d22 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 31 Oct 2018 15:15:01 +0000
Subject: [PATCH 2/4] Remove recastnavigation conflicts

---
 components/detournavigator/debug.hpp |  3 ++-
 components/osghelpers/operators.hpp  | 35 ----------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 components/osghelpers/operators.hpp

diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index 460e22435..05d212e2f 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -3,9 +3,10 @@
 
 #include "tilebounds.hpp"
 
+#include <osg/io_utils>
+
 #include <components/bullethelpers/operators.hpp>
 #include <components/misc/guarded.hpp>
-#include <components/osghelpers/operators.hpp>
 
 #include <chrono>
 #include <fstream>
diff --git a/components/osghelpers/operators.hpp b/components/osghelpers/operators.hpp
deleted file mode 100644
index fdb0227ea..000000000
--- a/components/osghelpers/operators.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef OPENMW_COMPONENTS_OSGHELPERS_OPERATORS_H
-#define OPENMW_COMPONENTS_OSGHELPERS_OPERATORS_H
-
-#include <iomanip>
-#include <limits>
-#include <ostream>
-
-#include <osg/Vec2i>
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-
-namespace osg
-{
-    inline std::ostream& operator <<(std::ostream& stream, const Vec2i& value)
-    {
-        return stream << "osg::Vec2i(" << value.x() << ", " << value.y() << ")";
-    }
-
-    inline std::ostream& operator <<(std::ostream& stream, const Vec2f& value)
-    {
-        return stream << "osg::Vec2f(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
-                      << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
-                      << ')';
-    }
-
-    inline std::ostream& operator <<(std::ostream& stream, const Vec3f& value)
-    {
-        return stream << "osg::Vec3f(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
-                      << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
-                      << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
-                      << ')';
-    }
-}
-
-#endif

From 93843d024c01633dbec773fad3ed15fda6c3e9d0 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 31 Oct 2018 16:26:53 +0000
Subject: [PATCH 3/4] Remove another duplicate operator<<

---
 .../nifloader/testbulletnifloader.cpp               | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 5866b7646..29f60b1f5 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -115,17 +115,6 @@ static std::ostream& operator <<(std::ostream& stream, const btCollisionShape* v
     return value ? stream << "&" << *value : stream << "nullptr";
 }
 
-namespace osg
-{
-    static std::ostream& operator <<(std::ostream& stream, const Vec3f& value)
-    {
-        return stream << "osg::Vec3f {"
-            << value.x() << ", "
-            << value.y() << ", "
-            << value.z() << "}";
-    }
-}
-
 namespace std
 {
     static std::ostream& operator <<(std::ostream& stream, const map<int, int>& value)
@@ -153,7 +142,7 @@ namespace Resource
         return stream << "Resource::BulletShape {"
             << value.mCollisionShape << ", "
             << value.mAvoidCollisionShape << ", "
-            << value.mCollisionBoxHalfExtents << ", "
+            << "osg::Vec3f {" << value.mCollisionBoxHalfExtents << "}" << ", "
             << value.mAnimatedShapes
             << "}";
     }

From 6bbc1cb3080b784c5f2e00763e365509e0eb1795 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <AnyOldName3@users.noreply.github.com>
Date: Wed, 31 Oct 2018 19:32:52 +0000
Subject: [PATCH 4/4] Remove outdated include

---
 apps/openmw_test_suite/detournavigator/operators.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp
index 8e6b97af6..16d8f38f5 100644
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
@@ -3,7 +3,6 @@
 
 #include <components/bullethelpers/operators.hpp>
 #include <components/detournavigator/debug.hpp>
-#include <components/osghelpers/operators.hpp>
 
 #include <deque>
 #include <iomanip>