Fixed perspective with zNear == 0 (#71)

This commit is contained in:
Christophe Riccio 2013-05-12 15:36:29 +02:00
parent 1c68cee29b
commit 01a98e97c1
4 changed files with 9 additions and 14 deletions

View File

@ -31,7 +31,7 @@
#define GLM_MESSAGES
#include "../glm.hpp"
/*
#if(GLM_ARCH & GLM_ARCH_SSE2)
struct float4
{
@ -54,16 +54,17 @@ int test_simd()
}
#endif//GLM_ARCH
*/
int main()
{
glm::mat4 A(1.0f);
glm::vec4 B(1.0f);
glm::vec4 C = A * B;
/*
# if(GLM_ARCH & GLM_ARCH_SSE2)
test_simd();
# endif
*/
return 0;
}

View File

@ -243,15 +243,11 @@ namespace glm
#else
valType const rad = glm::radians(fovy);
#endif
valType range = tan(rad / valType(2)) * zNear;
valType left = -range * aspect;
valType right = range * aspect;
valType bottom = -range;
valType top = range;
valType tanHalfFovy = tan(rad / valType(2));
detail::tmat4x4<valType, defaultp> Result(valType(0));
Result[0][0] = (valType(2) * zNear) / (right - left);
Result[1][1] = (valType(2) * zNear) / (top - bottom);
Result[0][0] = valType(1) / (aspect * tanHalfFovy);
Result[1][1] = valType(1) / (tanHalfFovy);
Result[2][2] = - (zFar + zNear) / (zFar - zNear);
Result[2][3] = - valType(1);
Result[3][2] = - (valType(2) * zFar * zNear) / (zFar - zNear);

View File

@ -50,10 +50,7 @@ GLM 0.9.5.0: 2013-XX-XX
- Fixed GTX_multiple for negative value
- Removed GTX_ocl_type extension
- Fixed post increment and decrement operators
================================================================================
GLM 0.9.4.4: 2013-0X-XX
--------------------------------------------------------------------------------
- Fixed perspective with zNear == 0 (#71)
- Fixed slerp when costheta is close to 1
- Fixed mat4x2 value_type constructor

View File

@ -14,6 +14,7 @@ int main()
{
int Error = 0;
glm::mat4 Projection = glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.0f);
glm::mat4 Pick = glm::pickMatrix(glm::vec2(1, 2), glm::vec2(3, 4), glm::ivec4(0, 0, 320, 240));
return Error;