v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[*] MSVS2013 do not like constexpr

pull/1021/head
Alexandr Arutjunov 2016-10-06 17:49:08 +03:00
parent 8c6ee48af5
commit 728c11ebb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/assimp/matrix4x4.inl
View File

@ -365,7 +365,7 @@ inline void aiMatrix4x4t<TReal>::Decompose(aiVector3t<TReal>& pScaling, aiVector
*/ */
// Use a small epsilon to solve floating-point inaccuracies // Use a small epsilon to solve floating-point inaccuracies
constexpr TReal epsilon = 10e-3f; const TReal epsilon = 10e-3f;
pRotation.y = asin(vCols[2].x);// D. Angle around oY. pRotation.y = asin(vCols[2].x);// D. Angle around oY.
@ -412,7 +412,7 @@ aiQuaterniont<TReal> pRotation;
pRotationAngle = acos(angle_cos) * 2; pRotationAngle = acos(angle_cos) * 2;
// Use a small epsilon to solve floating-point inaccuracies // Use a small epsilon to solve floating-point inaccuracies
constexpr TReal epsilon = 10e-3f; const TReal epsilon = 10e-3f;
if(fabs(angle_sin) < epsilon) angle_sin = 1; if(fabs(angle_sin) < epsilon) angle_sin = 1;