projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c6ee48
)
[*] MSVS2013 do not like constexpr
author
Alexandr Arutjunov
<smal.root@gmail.com>
Thu, 6 Oct 2016 14:49:08 +0000
(17:49 +0300)
committer
Alexandr Arutjunov
<smal.root@gmail.com>
Thu, 6 Oct 2016 14:49:08 +0000
(17:49 +0300)
include/assimp/matrix4x4.inl
patch
|
blob
|
history
diff --git
a/include/assimp/matrix4x4.inl
b/include/assimp/matrix4x4.inl
index
04c5ca3
..
2f57990
100644
(file)
--- a/
include/assimp/matrix4x4.inl
+++ b/
include/assimp/matrix4x4.inl
@@
-365,7
+365,7
@@
inline void aiMatrix4x4t<TReal>::Decompose(aiVector3t<TReal>& pScaling, aiVector
*/
// Use a small epsilon to solve floating-point inaccuracies
- const
expr
TReal epsilon = 10e-3f;
+ const TReal epsilon = 10e-3f;
pRotation.y = asin(vCols[2].x);// D. Angle around oY.
@@
-412,7
+412,7
@@
aiQuaterniont<TReal> pRotation;
pRotationAngle = acos(angle_cos) * 2;
// Use a small epsilon to solve floating-point inaccuracies
- const
expr
TReal epsilon = 10e-3f;
+ const TReal epsilon = 10e-3f;
if(fabs(angle_sin) < epsilon) angle_sin = 1;