Browse Source

Trade: ugh, lcov, UGH.

pull/403/head
Vladimír Vondruš 7 years ago
parent
commit
fd1c7b43d8
  1. 5
      src/Magnum/Trade/ObjectData2D.cpp
  2. 5
      src/Magnum/Trade/ObjectData3D.cpp

5
src/Magnum/Trade/ObjectData2D.cpp

@ -71,8 +71,9 @@ Vector2 ObjectData2D::scaling() const {
Matrix3 ObjectData2D::transformation() const {
if(_flags & ObjectFlag2D::HasTranslationRotationScaling)
return Matrix3::from(_transformation.trs.rotation.toMatrix(),
_transformation.trs.translation)*
/* Has to be on a single line otherwise lcov reports an uncovered
line. Ugh. */
return Matrix3::from(_transformation.trs.rotation.toMatrix(), _transformation.trs.translation)*
Matrix3::scaling(_transformation.trs.scaling);
return _transformation.matrix;
}

5
src/Magnum/Trade/ObjectData3D.cpp

@ -71,8 +71,9 @@ Vector3 ObjectData3D::scaling() const {
Matrix4 ObjectData3D::transformation() const {
if(_flags & ObjectFlag3D::HasTranslationRotationScaling)
return Matrix4::from(_transformation.trs.rotation.toMatrix(),
_transformation.trs.translation)*
/* Has to be on a single line otherwise lcov reports an uncovered
line. Ugh. */
return Matrix4::from(_transformation.trs.rotation.toMatrix(), _transformation.trs.translation)*
Matrix4::scaling(_transformation.trs.scaling);
return _transformation.matrix;
}

Loading…
Cancel
Save