Browse Source

Removed type_vec files, deleting unnecessary dependences

Christophe Riccio 7 years ago
parent
commit
8a79414fb8

+ 0 - 1
glm/detail/type_mat2x2.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec2.hpp"
 #include "type_vec2.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"
 #include <limits>
 #include <limits>

+ 0 - 1
glm/detail/type_mat2x3.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec2.hpp"
 #include "type_vec2.hpp"
 #include "type_vec3.hpp"
 #include "type_vec3.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"

+ 0 - 1
glm/detail/type_mat2x4.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec2.hpp"
 #include "type_vec2.hpp"
 #include "type_vec4.hpp"
 #include "type_vec4.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"

+ 0 - 1
glm/detail/type_mat3x2.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec2.hpp"
 #include "type_vec2.hpp"
 #include "type_vec3.hpp"
 #include "type_vec3.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"

+ 0 - 1
glm/detail/type_mat3x3.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec3.hpp"
 #include "type_vec3.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"
 #include <limits>
 #include <limits>

+ 0 - 1
glm/detail/type_mat3x4.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec3.hpp"
 #include "type_vec3.hpp"
 #include "type_vec4.hpp"
 #include "type_vec4.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"

+ 0 - 1
glm/detail/type_mat4x2.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec2.hpp"
 #include "type_vec2.hpp"
 #include "type_vec4.hpp"
 #include "type_vec4.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"

+ 0 - 1
glm/detail/type_mat4x3.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec3.hpp"
 #include "type_vec3.hpp"
 #include "type_vec4.hpp"
 #include "type_vec4.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"

+ 0 - 1
glm/detail/type_mat4x4.hpp

@@ -3,7 +3,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "../fwd.hpp"
 #include "type_vec4.hpp"
 #include "type_vec4.hpp"
 #include "type_mat.hpp"
 #include "type_mat.hpp"
 #include <limits>
 #include <limits>

+ 0 - 7
glm/detail/type_vec.hpp

@@ -1,7 +0,0 @@
-/// @ref core
-/// @file glm/detail/type_vec.hpp
-
-#pragma once
-
-#include "qualifier.hpp"
-#include "compute_vector_relational.hpp"

+ 0 - 2
glm/detail/type_vec.inl

@@ -1,2 +0,0 @@
-/// @ref core
-/// @file glm/detail/type_vec.inl

+ 1 - 1
glm/detail/type_vec1.hpp

@@ -3,7 +3,7 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "type_vec.hpp"
+#include "qualifier.hpp"
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION

+ 1 - 1
glm/detail/type_vec2.hpp

@@ -3,7 +3,7 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "type_vec.hpp"
+#include "qualifier.hpp"
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION

+ 1 - 1
glm/detail/type_vec3.hpp

@@ -3,7 +3,7 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "type_vec.hpp"
+#include "qualifier.hpp"
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION

+ 2 - 0
glm/detail/type_vec3.inl

@@ -1,5 +1,7 @@
 /// @ref core
 /// @ref core
 
 
+#include "compute_vector_relational.hpp"
+
 namespace glm
 namespace glm
 {
 {
 	// -- Implicit basic constructors --
 	// -- Implicit basic constructors --

+ 1 - 1
glm/detail/type_vec4.hpp

@@ -3,7 +3,7 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "type_vec.hpp"
+#include "qualifier.hpp"
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
 #	include "_swizzle.hpp"
 #	include "_swizzle.hpp"
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION
 #elif GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_FUNCTION

+ 2 - 0
glm/detail/type_vec4.inl

@@ -1,5 +1,7 @@
 /// @ref core
 /// @ref core
 
 
+#include "compute_vector_relational.hpp"
+
 namespace glm{
 namespace glm{
 namespace detail
 namespace detail
 {
 {

+ 0 - 1
glm/ext/matrix_relational.inl

@@ -4,7 +4,6 @@
 // Dependency:
 // Dependency:
 #include "../vector_relational.hpp"
 #include "../vector_relational.hpp"
 #include "../common.hpp"
 #include "../common.hpp"
-#include "../detail/type_vec.hpp"
 
 
 namespace glm
 namespace glm
 {
 {

+ 1 - 1
glm/ext/vector_relational.inl

@@ -4,7 +4,7 @@
 // Dependency:
 // Dependency:
 #include "../vector_relational.hpp"
 #include "../vector_relational.hpp"
 #include "../common.hpp"
 #include "../common.hpp"
-#include "../detail/type_vec.hpp"
+#include "../detail/qualifier.hpp"
 
 
 namespace glm
 namespace glm
 {
 {

+ 0 - 1
glm/fwd.hpp

@@ -7,7 +7,6 @@
 
 
 #include "detail/type_int.hpp"
 #include "detail/type_int.hpp"
 #include "detail/type_float.hpp"
 #include "detail/type_float.hpp"
-#include "detail/type_vec.hpp"
 #include "detail/type_mat.hpp"
 #include "detail/type_mat.hpp"
 
 
 //////////////////////
 //////////////////////

+ 0 - 1
glm/gtc/epsilon.inl

@@ -5,7 +5,6 @@
 #include "quaternion.hpp"
 #include "quaternion.hpp"
 #include "../vector_relational.hpp"
 #include "../vector_relational.hpp"
 #include "../common.hpp"
 #include "../common.hpp"
-#include "../detail/type_vec.hpp"
 
 
 namespace glm
 namespace glm
 {
 {

+ 46 - 0
glm/gtc/quaternion.hpp

@@ -436,6 +436,52 @@ namespace glm
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	GLM_FUNC_DECL vec<4, bool, Q> isinf(tquat<T, Q> const& x);
 	GLM_FUNC_DECL vec<4, bool, Q> isinf(tquat<T, Q> const& x);
 
 
+	/// Quaternion of low single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef tquat<float, lowp>		lowp_quat;
+
+	/// Quaternion of medium single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef tquat<float, mediump>	mediump_quat;
+
+	/// Quaternion of high single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef tquat<float, highp>		highp_quat;
+
+#if(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
+	typedef highp_quat			quat;
+#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
+	typedef mediump_quat		quat;
+#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT))
+	typedef lowp_quat			quat;
+#elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
+	/// Quaternion of default single-qualifier floating-point numbers.
+	typedef highp_quat			quat;
+#endif
+
+	/// Quaternion of low single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef lowp_quat			lowp_fquat;
+
+	/// Quaternion of medium single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef mediump_quat		mediump_fquat;
+
+	/// Quaternion of high single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef highp_quat			highp_fquat;
+
+	/// Quaternion of default single-qualifier floating-point numbers.
+	///
+	/// @see gtc_quaternion
+	typedef quat				fquat;
+
 	/// @}
 	/// @}
 } //namespace glm
 } //namespace glm
 
 

+ 1 - 0
test/gtc/gtc_epsilon.cpp

@@ -1,5 +1,6 @@
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/constants.hpp>
+#include <glm/gtc/quaternion.hpp>
 #include <glm/vector_relational.hpp>
 #include <glm/vector_relational.hpp>
 
 
 int test_defined()
 int test_defined()