Update GLM to latest version (0.9.9.3). This includes GLM's change of matrices no longer default initializing to the identity matrix. This commit thus also includes the update of all of LearnOpenGL's code to reflect this: all matrices are now constructor-initialized to the identity matrix where relevant.

includes/glm/gtx/range.hpp

@@ -1,102 +1,98 @@
-///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
-///
-/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
-/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-/// copies of the Software, and to permit persons to whom the Software is
-/// furnished to do so, subject to the following conditions:
-///
-/// The above copyright notice and this permission notice shall be included in
-/// all copies or substantial portions of the Software.
-///
-/// Restrictions:
-///		By making use of the Software for military purposes, you choose to make
-///		a Bunny unhappy.
-/// 
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
-///
 /// @ref gtx_range
 /// @file glm/gtx/range.hpp
-/// @date 2014-09-19 / 2014-09-19
 /// @author Joshua Moerman
 ///
 /// @defgroup gtx_range GLM_GTX_range
 /// @ingroup gtx
 ///
-/// @brief Defines begin and end for vectors and matrices. Useful for range-based for loop.
-/// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements).
+/// Include <glm/gtx/range.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/range.hpp> need to be included to use these functionalities.
-///////////////////////////////////////////////////////////////////////////////////
+/// Defines begin and end for vectors and matrices. Useful for range-based for loop.
+/// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements).
 
 #pragma once
 
 // Dependencies
 #include "../detail/setup.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if !GLM_HAS_RANGE_FOR
 #	error "GLM_GTX_range requires C++11 suppport or 'range for'"
 #endif
 
 #include "../gtc/type_ptr.hpp"
+#include "../gtc/vec1.hpp"
 
-namespace glm{
-namespace detail
+namespace glm
 {
-	/* The glm types provide a .length() member, but for matrices
-	 this only defines the number of columns, so we need to work around this */
-	template <typename T, precision P>
-	detail::component_count_t number_of_elements_(tvec2<T, P> const & v){
-		return detail::component_count(v);
-	}
-
-	template <typename T, precision P>
-	detail::component_count_t number_of_elements_(tvec3<T, P> const & v){
-		return detail::component_count(v);
-	}
-
-	template <typename T, precision P>
-	detail::component_count_t number_of_elements_(tvec4<T, P> const & v){
-		return detail::component_count(v);
-	}
-
-	template <typename genType>
-	detail::component_count_t number_of_elements_(genType const & m){
-		return detail::component_count(m) * detail::component_count(m[0]);
-	}
-}//namespace
-
 	/// @addtogroup gtx_range
 	/// @{
 
-	template <typename genType>
-	const typename genType::value_type * begin(genType const & v){
+#	if GLM_COMPILER & GLM_COMPILER_VC
+#		pragma warning(push)
+#		pragma warning(disable : 4100) // unreferenced formal parameter
+#	endif
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<1, T, Q> const& v)
+	{
+		return v.length();
+	}
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<2, T, Q> const& v)
+	{
+		return v.length();
+	}
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<3, T, Q> const& v)
+	{
+		return v.length();
+	}
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<4, T, Q> const& v)
+	{
+		return v.length();
+	}
+
+	template<typename genType>
+	inline length_t components(genType const& m)
+	{
+		return m.length() * m[0].length();
+	}
+
+	template<typename genType>
+	inline typename genType::value_type const * begin(genType const& v)
+	{
 		return value_ptr(v);
 	}
 
-	template <typename genType>
-	const typename genType::value_type * end(genType const & v){
-		return begin(v) + detail::number_of_elements_(v);
+	template<typename genType>
+	inline typename genType::value_type const * end(genType const& v)
+	{
+		return begin(v) + components(v);
 	}
 
-	template <typename genType>
-	typename genType::value_type * begin(genType& v){
+	template<typename genType>
+	inline typename genType::value_type * begin(genType& v)
+	{
 		return value_ptr(v);
 	}
 
-	template <typename genType>
-	typename genType::value_type * end(genType& v){
-		return begin(v) + detail::number_of_elements_(v);
+	template<typename genType>
+	inline typename genType::value_type * end(genType& v)
+	{
+		return begin(v) + components(v);
 	}
 
+#	if GLM_COMPILER & GLM_COMPILER_VC
+#		pragma warning(pop)
+#	endif
+
 	/// @}
 }//namespace glm