Optimized header inclusion of swizzle operator code. Not included when not enabled

ago%!(EXTRA string=12 years) · cd0519d24b
parent 8eea3c7645
commit cd0519d24b
5 changed files with 28 additions and 6 deletions
--- a/glm/core/_swizzle.hpp
+++ b/glm/core/_swizzle.hpp
@ -29,8 +29,6 @@
 #ifndef glm_core_swizzle
 #define glm_core_swizzle

-#include "_swizzle_func.hpp"
-
 namespace glm
 {
 	enum comp
--- a/glm/core/type_vec1.hpp
+++ b/glm/core/type_vec1.hpp
@ -31,7 +31,13 @@

 #include "../fwd.hpp"
 #include "type_vec.hpp"
-#include "_swizzle.hpp"
+#ifdef GLM_SWIZZLE
+#	if GLM_HAS_ANONYMOUS_UNION
+#		include "_swizzle.hpp"
+#	else
+#		include "_swizzle_func.hpp"
+#	endif
+#endif //GLM_SWIZZLE

 namespace glm{
 namespace detail
--- a/glm/core/type_vec2.hpp
+++ b/glm/core/type_vec2.hpp
@ -31,7 +31,13 @@

 #include "../fwd.hpp"
 #include "type_vec.hpp"
-#include "_swizzle.hpp"
+#ifdef GLM_SWIZZLE
+#	if GLM_HAS_ANONYMOUS_UNION
+#		include "_swizzle.hpp"
+#	else
+#		include "_swizzle_func.hpp"
+#	endif
+#endif //GLM_SWIZZLE

 namespace glm{
 namespace detail
--- a/glm/core/type_vec3.hpp
+++ b/glm/core/type_vec3.hpp
@ -31,7 +31,13 @@

 #include "../fwd.hpp"
 #include "type_vec.hpp"
-#include "_swizzle.hpp"
+#ifdef GLM_SWIZZLE
+#	if GLM_HAS_ANONYMOUS_UNION
+#		include "_swizzle.hpp"
+#	else
+#		include "_swizzle_func.hpp"
+#	endif
+#endif //GLM_SWIZZLE

 namespace glm{
 namespace detail
--- a/glm/core/type_vec4.hpp
+++ b/glm/core/type_vec4.hpp
@ -31,7 +31,13 @@

 #include "../fwd.hpp"
 #include "type_vec.hpp"
-#include "_swizzle.hpp"
+#ifdef GLM_SWIZZLE
+#	if GLM_HAS_ANONYMOUS_UNION
+#		include "_swizzle.hpp"
+#	else
+#		include "_swizzle_func.hpp"
+#	endif
+#endif //GLM_SWIZZLE

 namespace glm{
 namespace detail