diff options
| author | David Tardon <dtardon@redhat.com> | 2016-10-31 19:51:56 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-11-13 11:01:22 +0200 |
| commit | 1e3d273fb0eb5f003dd6216ca48c71e004235898 (patch) | |
| tree | d1e4cf5990f0970b6a7d472a949331054ffc46fa | |
| parent | a5efbf42d8aa1f3f75608caf792622a93370d850 (diff) | |
convert angle from degrees to radians for glm
This makes simple (i.e., not implemented as a shader) OpenGL transitions
work correctly again.
(cherry picked from commit 7445399af829c48e8c71eed66f132d96fa195c37)
Change-Id: I773f686089bce3611940743b1a7f5046093886e8
Reviewed-on: https://gerrit.libreoffice.org/30449
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx index c61209fea3e0..97d8902f429e 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx @@ -31,6 +31,8 @@ #include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/type_ptr.hpp> +#include <basegfx/numeric/ftools.hxx> + #include "OGLTrans_Operation.hxx" SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin, @@ -38,7 +40,7 @@ SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin, Operation(bInter, T0, T1), axis(Axis), origin(Origin), - angle(Angle) + angle(basegfx::deg2rad(Angle)) { } @@ -55,7 +57,7 @@ RotateAndScaleDepthByWidth::RotateAndScaleDepthByWidth(const glm::vec3& Axis, Operation(bInter, T0, T1), axis(Axis), origin(Origin), - angle(Angle), + angle(basegfx::deg2rad(Angle)), scale(bScale) { } @@ -65,7 +67,7 @@ RotateAndScaleDepthByHeight::RotateAndScaleDepthByHeight(const glm::vec3& Axis, Operation(bInter, T0, T1), axis(Axis), origin(Origin), - angle(Angle), + angle(basegfx::deg2rad(Angle)), scale(bScale) { } |