mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated swizzle operator API

Browse Source
This commit is contained in:
Christophe Riccio 2011-01-28 14:26:37 +00:00
parent e8b35cc58c
commit 2b515fd191
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glm/core/_swizzle.hpp
View File

@ -29,7 +29,7 @@ namespace glm
};
}//namespace glm
#if(defined(GLM_FORCE_SWIZZLE_XYZW) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE))
#define xx swizzle(glm::X, glm::X)
#define yx swizzle(glm::Y, glm::X)
@ -50,7 +50,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_RGBA) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_SWIZZLE_RGBA) || defined(GLM_SWIZZLE))
#define rr swizzle(glm::X, glm::X)
#define gr swizzle(glm::Y, glm::X)
@ -71,7 +71,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_SWIZZLE))
#define ss swizzle(glm::X, glm::X)
#define ts swizzle(glm::Y, glm::X)
@ -92,7 +92,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_XYZW) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE))
#define xxx swizzle(glm::X, glm::X, glm::X)
#define yxx swizzle(glm::Y, glm::X, glm::X)
@ -161,7 +161,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_RGBA) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_SWIZZLE_RGBA) || defined(GLM_SWIZZLE))
#define rrr swizzle(glm::X, glm::X, glm::X)
#define grr swizzle(glm::Y, glm::X, glm::X)
@ -230,7 +230,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_SWIZZLE))
#define sss swizzle(glm::X, glm::X, glm::X)
#define tss swizzle(glm::Y, glm::X, glm::X)
@ -299,7 +299,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_XYZW) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE))
#define xxxx swizzle(glm::X, glm::X, glm::X, glm::X)
#define yxxx swizzle(glm::Y, glm::X, glm::X, glm::X)
@ -560,7 +560,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_RGBA) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_SWIZZLE_RGBA) || defined(GLM_SWIZZLE))
#define rrrr swizzle(glm::X, glm::X, glm::X, glm::X)
#define grrr swizzle(glm::Y, glm::X, glm::X, glm::X)
@ -821,7 +821,7 @@ namespace glm
#endif
#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_FORCE_SWIZZLE))
#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_SWIZZLE))
#define ssss swizzle(glm::X, glm::X, glm::X, glm::X)
#define tsss swizzle(glm::Y, glm::X, glm::X, glm::X)

12
glm/setup.hpp
View File

@ -373,16 +373,16 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// Swizzle operators
//#define GLM_FORCE_SWIZZLE_XYZW
//#define GLM_FORCE_SWIZZLE_RGBA
//#define GLM_FORCE_SWIZZLE_STQP
//#define GLM_FORCE_SWIZZLE
//#define GLM_SWIZZLE_XYZW
//#define GLM_SWIZZLE_RGBA
//#define GLM_SWIZZLE_STQP
//#define GLM_SWIZZLE
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED))
# define GLM_MESSAGE_SWIZZLE_DISPLAYED
# if(defined(GLM_FORCE_SWIZZLE))
# if(defined(GLM_SWIZZLE))
# pragma message("GLM: Full swizzling operator enabled")
# elif(!defined(GLM_FORCE_SWIZZLE_XYZW) && !defined(GLM_FORCE_SWIZZLE_RGBA) && !defined(GLM_FORCE_SWIZZLE_STQP) && !defined(GLM_FORCE_SWIZZLE))
# elif(!defined(GLM_SWIZZLE_XYZW) && !defined(GLM_SWIZZLE_RGBA) && !defined(GLM_SWIZZLE_STQP) && !defined(GLM_SWIZZLE))
# pragma message("GLM: No swizzling operator enabled")
# else
# pragma message("GLM: Partial swizzling operator enabled")