From 65b6269cea5820727a50d73a583235dc88705d37 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 4 Mar 2017 00:21:50 +0000
Subject: [PATCH] Update vwr and use cloonel as the enclosing namespace for it.

---
 CMakeLists.txt                     |  3 +-
 lib/vectorwrapper                  |  2 +-
 src/cloonelgraphics/CMakeLists.txt |  5 +++
 src/cloonelgraphics/vectypes.hpp   | 67 ++----------------------------
 src/jumping/line.hpp               |  2 +
 5 files changed, 13 insertions(+), 66 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d02f5c..83317f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CLOONEL_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(CLOONEL_VECTORWRAPPER_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/lib/vectorwrapper/include)
 
 target_architecture(TARGET_ARCH)
 message (STATUS "Target architecture: ${TARGET_ARCH}")
@@ -71,13 +72,13 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 
 target_include_directories(${PROJECT_NAME}
 	INTERFACE "${PROJECT_BINARY_DIR}"
-	INTERFACE lib/vectorwrapper/include
 	INTERFACE lib/tree-3.1/src
 )
 
 target_compile_definitions(${PROJECT_NAME}
 	INTERFACE VWR_STATIC_CAST_RESULTS
 	INTERFACE VWR_SIZE_TYPE=uint32_t
+	INTERFACE VWR_OUTER_NAMESPACE=cloonel
 	INTERFACE ${PNG_DEFINITIONS}
 )
 
diff --git a/lib/vectorwrapper b/lib/vectorwrapper
index 2f4d319..db7b9be 160000
--- a/lib/vectorwrapper
+++ b/lib/vectorwrapper
@@ -1 +1 @@
-Subproject commit 2f4d31967541c9c4a87b2511fb0c6d3792c72c2d
+Subproject commit db7b9becd5758f572530e92182313a64e4e44f5b
diff --git a/src/cloonelgraphics/CMakeLists.txt b/src/cloonelgraphics/CMakeLists.txt
index d4a0c5e..c3448db 100644
--- a/src/cloonelgraphics/CMakeLists.txt
+++ b/src/cloonelgraphics/CMakeLists.txt
@@ -22,4 +22,9 @@ target_include_directories(${PROJECT_NAME}
 	PRIVATE ${PNG_INCLUDE_DIRS}
 	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE ${PHYSFS_INCLUDE_DIR}
+	PUBLIC ${CLOONEL_VECTORWRAPPER_INCLUDE}
+	PUBLIC ../../lib/tree-3.1/src
 )
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
diff --git a/src/cloonelgraphics/vectypes.hpp b/src/cloonelgraphics/vectypes.hpp
index 9ff09b3..2cf1981 100644
--- a/src/cloonelgraphics/vectypes.hpp
+++ b/src/cloonelgraphics/vectypes.hpp
@@ -41,6 +41,7 @@
         } \
     }
 
+namespace cloonel {
 namespace vwr {
 	SPECIALIZE_ARRAY_VECTOR(float, 2);
 	SPECIALIZE_ARRAY_VECTOR(uint16_t, 2);
@@ -60,75 +61,13 @@ namespace vwr {
 		return parStream;
 	}
 #endif
-
-	template <typename V>
-	Vec<V> operator+ (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) a_pure;
-	template <typename V>
-	Vec<V> operator- (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) a_pure;
-	template <typename V>
-	Vec<V> operator* (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) a_pure;
-	template <typename V>
-	Vec<V> operator/ (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) a_pure;
-	template <typename V>
-	Vec<V> operator+ (typename VectorWrapperInfo<V>::scalar_type parLeft, Vec<V> parRight) a_pure;
-	template <typename V>
-	Vec<V> operator* (typename VectorWrapperInfo<V>::scalar_type parLeft, Vec<V> parRight) a_pure;
-
-	template <typename V>
-	inline
-	Vec<V> operator+ (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) {
-		for (uint32_t z = 0; z < Vec<V>::dimensions; ++z) {
-			parLeft[z] += parRight;
-		}
-		return parLeft;
-	}
-	template <typename V>
-	inline
-	Vec<V> operator- (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) {
-		for (uint32_t z = 0; z < Vec<V>::dimensions; ++z) {
-			parLeft[z] -= parRight;
-		}
-		return parLeft;
-	}
-	template <typename V>
-	inline
-	Vec<V> operator* (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) {
-		for (uint32_t z = 0; z < Vec<V>::dimensions; ++z) {
-			parLeft[z] *= parRight;
-		}
-		return parLeft;
-	}
-	template <typename V>
-	inline
-	Vec<V> operator/ (Vec<V> parLeft, typename VectorWrapperInfo<V>::scalar_type parRight) {
-		for (uint32_t z = 0; z < Vec<V>::dimensions; ++z) {
-			parLeft[z] /= parRight;
-		}
-		return parLeft;
-	}
-
-	template <typename V>
-	inline
-	Vec<V> operator+ (typename VectorWrapperInfo<V>::scalar_type parLeft, Vec<V> parRight) {
-		for (uint32_t z = 0; z < Vec<V>::dimensions; ++z) {
-			parRight[z] += parLeft;
-		}
-		return parRight;
-	}
-	template <typename V>
-	inline
-	Vec<V> operator* (typename VectorWrapperInfo<V>::scalar_type parLeft, Vec<V> parRight) {
-		for (uint32_t z = 0; z < Vec<V>::dimensions; ++z) {
-			parRight[z] *= parLeft;
-		}
-		return parRight;
-	}
 } //namespace vwr
+} //namespace cloonel
 
 //make stuff from CloonelJump compile happily
 namespace cloonel {
 	template <typename T, uint32_t S>
-	using Vector = ::vwr::Vec<std::array<T, std::size_t(S)>, S>;
+	using Vector = vwr::Vec<std::array<T, std::size_t(S)>, S>;
 
 	using ushort2 = Vector<uint16_t, 2>;
 #if !defined(NDEBUG)
diff --git a/src/jumping/line.hpp b/src/jumping/line.hpp
index d1dfce3..5b4e522 100644
--- a/src/jumping/line.hpp
+++ b/src/jumping/line.hpp
@@ -26,6 +26,7 @@
 #include <ciso646>
 #include <cstdint>
 
+namespace cloonel {
 namespace vwr {
     template <typename T>
     struct VectorWrapperInfo<std::array<cloonel::Vector<T, 2>, 2>> {
@@ -37,6 +38,7 @@ namespace vwr {
         }
     };
 } //namespace vwr
+} //namespace cloonel
 
 namespace cloonel {
 	template <typename T, uint32_t S>