mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.3' into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio
2012-09-05 23:45:12 +02:00
parent 35995e40f0 72a01d3432
commit 2f3dd90aca
9 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/matrix_transform.inl
View File

@@ -250,7 +250,7 @@ namespace glm
Result[3][2] = - (valType(2) * zFar * zNear) / (zFar - zNear);
return Result;
}
template <typename valType>
GLM_FUNC_QUALIFIER detail::tmat4x4<valType> perspectiveFov
(
@@ -267,7 +267,7 @@ namespace glm
valType rad = glm::radians(fov);
#endif
valType h = glm::cos(valType(0.5) * rad) / glm::sin(valType(0.5) * rad);
valType w = h * height / width;
valType w = h * height / width; ///todo max(width , Height) / min(width , Height)?
detail::tmat4x4<valType> Result(valType(0));
Result[0][0] = w;

4
glm/gtx/string_cast.inl
View File

@@ -23,8 +23,8 @@ namespace detail
return std::string();
va_start(list, msg);
// Ticket #123
#if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER_VC >= GLM_COMPILER_VC2005))
#if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005))
vsprintf_s(text, STRING_BUFFER, msg, list);
#else//
vsprintf(text, msg, list);