mewin/glm
1
0
Fork 0
Code Releases Activity

Clean up

Browse Source
This commit is contained in:
Christophe Riccio
2011-01-24 15:44:14 +00:00
parent 019c6ced18
commit c06484ff12
23 changed files with 30 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/_detail.hpp
View File

@@ -331,7 +331,7 @@ namespace detail
# if(GLM_COMPILER >= GLM_COMPILER_GCC33)
# define GLM_RESTRICT __restrict__
# define GLM_RESTRICT_VAR __restrict__
# elif
# else
# define GLM_RESTRICT
# define GLM_RESTRICT_VAR
# endif

1
glm/gtc/matrix_transform.hpp
View File

@@ -137,7 +137,6 @@ namespace glm
//! From GLM_GTC_matrix_transform extension.
template <typename T>
detail::tmat4x4<T> lookAt(
detail::tmat4x4<T> const & m,
detail::tvec3<T> const & eye,
detail::tvec3<T> const & center,
detail::tvec3<T> const & up);

3
glm/gtc/matrix_transform.inl
View File

@@ -326,7 +326,6 @@ namespace matrix_transform
template <typename T>
inline detail::tmat4x4<T> lookAt(
detail::tmat4x4<T> const & m,
const detail::tvec3<T>& eye,
const detail::tvec3<T>& center,
const detail::tvec3<T>& up)
@@ -351,7 +350,7 @@ namespace matrix_transform
Result[3][1] =-dot(y, eye);
Result[3][2] = dot(f, eye);
*/
return m * gtc::matrix_transform::translate(Result, -eye);
return gtc::matrix_transform::translate(Result, -eye);
}
}//namespace matrix_transform
}//namespace gtc

2
glm/gtc/swizzle.inl
View File

@@ -21,7 +21,7 @@ inline T swizzle
comp x
)
{
assert(int(x) < int(typename vecType<T>::_size));
assert(int(x) < int(vecType<T>::value_size));
return v[x];
}

8
glm/gtx/simd_vec4.hpp
View File

@@ -17,13 +17,13 @@
// Dependency:
#include "../glm.hpp"
#if(!(GLM_ARCH & GLM_ARCH_SSE2))
#if(GLM_ARCH & GLM_ARCH_SSE2)
# include "../core/intrinsic_common.hpp"
# include "../core/intrinsic_geometric.hpp"
#else
# error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
#endif
#include "../core/intrinsic_common.hpp"
#include "../core/intrinsic_geometric.hpp"
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
# pragma message("GLM: GLM_GTX_simd_vec4 extension included")
#endif

8
glm/gtx/transform2.hpp
View File

@@ -109,14 +109,6 @@ namespace glm
valType scale,
valType bias);
//! Build a look at view matrix.
//! From GLM_GTX_transform2 extension.
template <typename T>
detail::tmat4x4<T> lookAt(
detail::tvec3<T> const & eye,
detail::tvec3<T> const & center,
detail::tvec3<T> const & up);
}//namespace transform2
}//namespace gtx
}//namespace glm

29
glm/gtx/transform2.inl
View File

@@ -153,35 +153,6 @@ namespace transform2
return m * scaleBias(scale, bias);
}
template <typename T>
inline detail::tmat4x4<T> lookAt(
const detail::tvec3<T>& eye,
const detail::tvec3<T>& center,
const detail::tvec3<T>& up)
{
detail::tvec3<T> f = normalize(center - eye);
detail::tvec3<T> u = normalize(up);
detail::tvec3<T> s = normalize(cross(f, u));
u = cross(s, f);
detail::tmat4x4<T> Result(1);
Result[0][0] = s.x;
Result[1][0] = s.y;
Result[2][0] = s.z;
Result[0][1] = u.x;
Result[1][1] = u.y;
Result[2][1] = u.z;
Result[0][2] =-f.x;
Result[1][2] =-f.y;
Result[2][2] =-f.z;
/* Test this instead of translate3D
Result[3][0] =-dot(s, eye);
Result[3][1] =-dot(y, eye);
Result[3][2] = dot(f, eye);
*/
return gtc::matrix_transform::translate(Result, -eye);
}
}//namespace transform2
}//namespace gtx
}//namespace glm