mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-27 02:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Incremental work on improving swizzles.

Browse Source
This commit is contained in:
athile 2011-09-21 16:49:42 -04:00
parent 73d5e729c1
commit 2851081b66
2 changed files with 115 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
glm/core/_swizzle.hpp
View File

@ -56,21 +56,24 @@ namespace detail
/*! /*!
Template parameters: Template parameters:
Type = type of scalar values (e.g. float, double) ValueType = type of scalar values (e.g. float, double)
Class = class the swizzle is applies to (e.g. vector3f) VecType = class the swizzle is applies to (e.g. vector3f)
N = number of components in the vector (e.g. 3) N = number of components in the vector (e.g. 3)
E0...3 = what index the n-th element of this swizzle refers to E0...3 = what index the n-th element of this swizzle refers to
*/ */
template <typename Derived, typename Type, typename Class, int N, int E0, int E1, int E2, int E3, int DUPLICATE_ELEMENTS> template <typename DerivedType, typename ValueType, typename VecType, int N, int E0, int E1, int E2, int E3, int DUPLICATE_ELEMENTS>
struct swizzle_base struct swizzle_base
{ {
typedef Derived derived_type; typedef DerivedType derived_type;
typedef VecType vec_type;
typedef ValueType value_type;
swizzle_base& operator= (const Class& that) swizzle_base& operator= (const VecType& that)
{ {
static const int offset_dst[4] = { E0, E1, E2, E3 }; static const int offset_dst[4] = { E0, E1, E2, E3 };
Type t[N]; // Make a copy of the data in this == &that
ValueType t[N];
for (int i = 0; i < N; ++i) for (int i = 0; i < N; ++i)
t[i] = that[i]; t[i] = that[i];
for (int i = 0; i < N; ++i) for (int i = 0; i < N; ++i)
@ -79,7 +82,7 @@ namespace detail
return *this; return *this;
} }
swizzle_base& operator= (const Type& t) swizzle_base& operator= (const ValueType& t)
{ {
static const int offset_dst[4] = { E0, E1, E2, E3 }; static const int offset_dst[4] = { E0, E1, E2, E3 };
@ -89,34 +92,80 @@ namespace detail
return *this; return *this;
} }
void operator -= (const VecType& that)
{
static const int offset_dst[4] = { E0, E1, E2, E3 };
ValueType t[N];
for (int i = 0; i < N; ++i)
t[i] = that[i];
for (int i = 0; i < N; ++i)
elem(offset_dst[i]) -= t[i];
}
void operator += (const VecType& that)
{
static const int offset_dst[4] = { E0, E1, E2, E3 };
ValueType t[N];
for (int i = 0; i < N; ++i)
t[i] = that[i];
for (int i = 0; i < N; ++i)
elem(offset_dst[i]) += t[i];
}
void operator *= (const VecType& that)
{
static const int offset_dst[4] = { E0, E1, E2, E3 };
ValueType t[N];
for (int i = 0; i < N; ++i)
t[i] = that[i];
for (int i = 0; i < N; ++i)
elem(offset_dst[i]) *= t[i];
}
void operator /= (const VecType& that)
{
static const int offset_dst[4] = { E0, E1, E2, E3 };
ValueType t[N];
for (int i = 0; i < N; ++i)
t[i] = that[i];
for (int i = 0; i < N; ++i)
elem(offset_dst[i]) /= t[i];
}
protected: protected:
Type& elem (size_t i) { return (reinterpret_cast<Type*>(_buffer))[i]; } value_type& elem (size_t i) { return (reinterpret_cast<value_type*>(_buffer))[i]; }
const Type& elem (size_t i) const { return (reinterpret_cast<const Type*>(_buffer))[i]; } const value_type& elem (size_t i) const { return (reinterpret_cast<const value_type*>(_buffer))[i]; }
// Use an opaque buffer to *ensure* the compiler doesn't call a constructor. // Use an opaque buffer to *ensure* the compiler doesn't call a constructor.
// Otherwise, a vec4 containing all swizzles might end up with 1000s of // Otherwise, a vec4 containing all swizzles might end up with 1000s of
// constructor calls // constructor calls
char _buffer[sizeof(Type) * N]; char _buffer[sizeof(value_type) * N];
}; };
template <typename Derived, typename Type, typename Class, int N, int E0, int E1, int E2, int E3> template <typename DerivedType, typename ValueType, typename VecType, int N, int E0, int E1, int E2, int E3>
struct swizzle_base<Derived, Type,Class,N,E0,E1,E2,E3,1> struct swizzle_base<DerivedType,ValueType,VecType,N,E0,E1,E2,E3,1>
{ {
typedef Derived derived_type; typedef DerivedType derived_type;
typedef VecType vec_type;
typedef ValueType value_type;
struct Stub {}; struct Stub {};
swizzle_base& operator= (const Stub& that) {} swizzle_base& operator= (const Stub& that) {}
protected: protected:
Type& elem (size_t i) { return (reinterpret_cast<Type*>(_buffer))[i]; } value_type& elem (size_t i) { return (reinterpret_cast<value_type*>(_buffer))[i]; }
const Type& elem (size_t i) const { return (reinterpret_cast<const Type*>(_buffer))[i]; } const value_type& elem (size_t i) const { return (reinterpret_cast<const value_type*>(_buffer))[i]; }
char _buffer[sizeof(Type) * N]; char _buffer[sizeof(value_type) * N];
}; };
//! Internal class for implementing swizzle operators //! Internal class for implementing swizzle operators
template <typename T, typename P, int E0, int E1> template <typename T, typename P, int E0, int E1>
struct swizzle2 : public swizzle_base<swizzle2<T,P,E0,E1>, T,P,2,E0,E1,0,0,(E0 == E1)> struct swizzle2 : public swizzle_base<swizzle2<T,P,E0,E1>,T,P,2,E0,E1,0,0,(E0 == E1)>
{ {
using swizzle_base<swizzle2<T,P,E0,E1>,T,P,2,E0,E1,0,0,(E0 == E1)>::operator=; using swizzle_base<swizzle2<T,P,E0,E1>,T,P,2,E0,E1,0,0,(E0 == E1)>::operator=;
P cast() const { return P(this->elem(E0), this->elem(E1)); } P cast() const { return P(this->elem(E0), this->elem(E1)); }
@ -221,15 +270,49 @@ namespace detail
return a OPERAND static_cast<const S0&>(b).cast(); \ return a OPERAND static_cast<const S0&>(b).cast(); \
} }
#define _GLM_SWIZZLE_SCALAR_BINARY_OPERATOR_IMPLEMENTATION(OPERAND)\
template <typename T, typename P, int N, typename S0, int E0, int E1, int E2, int E3, int D0> \
typename P operator OPERAND ( \
const glm::detail::swizzle_base<S0,T,P,N,E0,E1,E2,E3,D0>& a, \
const typename T& b) \
{ \
return static_cast<const S0&>(a).cast() OPERAND b; \
} \
\
template <typename T, typename P, int N, typename S0, int E0, int E1, int E2, int E3, int D0> \
typename P operator OPERAND ( \
const typename T& a, \
const glm::detail::swizzle_base<S0,T,P,N,E0,E1,E2,E3,D0>& b) \
{ \
return a OPERAND static_cast<const S0&>(b).cast(); \
}
//
// To prevent the C++ syntax from getting *completely* overwhelming, define some alias macros
//
#define _GLM_SWIZZLE_TEMPLATE1 template <typename T, typename P, int N, typename S0, int E0, int E1, int E2, int E3, int D0>
#define _GLM_SWIZZLE_TEMPLATE2 template <typename T, typename P, int N, typename S0, int E0, int E1, int E2, int E3, int D0, typename S1,int F0, int F1, int F2, int F3, int D1>
#define _GLM_SWIZZLE_TYPE1 glm::detail::swizzle_base<S0,T,P,N,E0,E1,E2,E3,D0>
#define _GLM_SWIZZLE_TYPE2 glm::detail::swizzle_base<S1,T,P,N,F0,F1,F2,F3,D1>
_GLM_SWIZZLE_TEMPLATE1 typename S0::vec_type operator- (typename S0::value_type a, const _GLM_SWIZZLE_TYPE1& b) { return a - b; }
_GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(+) _GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(+)
_GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(-) _GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(-)
_GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(*) _GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(*)
_GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(/) _GLM_SWIZZLE_BINARY_OPERATOR_IMPLEMENTATION(/)
_GLM_SWIZZLE_SCALAR_BINARY_OPERATOR_IMPLEMENTATION(*)
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm
namespace glm
{
/*_GLM_SWIZZLE_TEMPLATE2 typename S0::value_type dot (const _GLM_SWIZZLE_TYPE1& a, const _GLM_SWIZZLE_TYPE2& b) { return dot(a.cast(), b.cast()); }
_GLM_SWIZZLE_TEMPLATE1 typename S0::value_type dot (const _GLM_SWIZZLE_TYPE1& a, const typename S0::vec_type& b) { return dot(a.cast(), b); }
_GLM_SWIZZLE_TEMPLATE1 typename S0::value_type dot (const typename S0::vec_type& a, const _GLM_SWIZZLE_TYPE1& b) { return dot(a, b.cast()); }*/
}
#define _GLM_SWIZZLE2_2_MEMBERS(T,P,E0,E1) \ #define _GLM_SWIZZLE2_2_MEMBERS(T,P,E0,E1) \

22
test/core/core_type_vec3.cpp
View File

@ -239,14 +239,20 @@ vec4 grad4(float j, vec4 ip)
const vec4 ones = vec4(1.0, 1.0, 1.0, -1.0); const vec4 ones = vec4(1.0, 1.0, 1.0, -1.0);
vec4 p,s; vec4 p,s;
p.xyz = floor( fract (vec3(j) * ip.xyz) * 7.0) * ip.z - 1.0; auto t1 = abs(p.xyz);
p.w = 1.5 - dot(abs(p.xyz), ones.xyz); auto t2 = ones.xyz;
auto t3 = dot(t1, t2);
auto t0 = dot(abs(p.xyz), ones.xyz);
p.xyz = floor( fract (vec3(j) * ip.xyz) * 7.0f) * ip.z - 1.0f;
p.w = 1.5f - dot(abs(p.xyz), ones.xyz);
s = vec4(lessThan(p, vec4(0.0))); s = vec4(lessThan(p, vec4(0.0)));
p.xyz = p.xyz + (s.xyz*2.0 - 1.0) * s.www; p.xyz = p.xyz + (s.xyz*2.0f - 1.0f) * s.www;
return p; return p;
} }
float snoise(vec4 v) float snoise(vec4 v)
{ {
const vec4 C = vec4( 0.138196601125011, // (5 - sqrt(5))/20 G4 const vec4 C = vec4( 0.138196601125011, // (5 - sqrt(5))/20 G4
@ -269,12 +275,12 @@ float snoise(vec4 v)
vec3 isYZ = step( x0.zww, x0.yyz ); vec3 isYZ = step( x0.zww, x0.yyz );
// i0.x = dot( isX, vec3( 1.0 ) ); // i0.x = dot( isX, vec3( 1.0 ) );
i0.x = isX.x + isX.y + isX.z; i0.x = isX.x + isX.y + isX.z;
i0.yzw = 1.0 - isX; i0.yzw = 1.0f - isX;
// i0.y += dot( isYZ.xy, vec2( 1.0 ) ); // i0.y += dot( isYZ.xy, vec2( 1.0 ) );
i0.y += isYZ.x + isYZ.y; i0.y += isYZ.x + isYZ.y;
i0.zw += 1.0 - isYZ.xy; i0.zw += 1.0f - isYZ.xy;
i0.z += isYZ.z; i0.z += isYZ.z;
i0.w += 1.0 - isYZ.z; i0.w += 1.0f - isYZ.z;
// i0 now contains the unique values 0,1,2,3 in each channel // i0 now contains the unique values 0,1,2,3 in each channel
vec4 i3 = clamp( i0, 0.0, 1.0 ); vec4 i3 = clamp( i0, 0.0, 1.0 );
@ -319,8 +325,8 @@ float snoise(vec4 v)
p4 *= taylorInvSqrt(dot(p4,p4)); p4 *= taylorInvSqrt(dot(p4,p4));
// Mix contributions from the five corners // Mix contributions from the five corners
vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.0); vec3 m0 = max(0.6f - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.0);
vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.0); vec2 m1 = max(0.6f - vec2(dot(x3,x3), dot(x4,x4) ), 0.0);
m0 = m0 * m0; m0 = m0 * m0;
m1 = m1 * m1; m1 = m1 * m1;
return 49.0 * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) return 49.0 * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 )))