summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-10-31 19:51:56 +0100
committerDavid Tardon <dtardon@redhat.com>2016-10-31 20:16:04 +0100
commit7445399af829c48e8c71eed66f132d96fa195c37 (patch)
tree43bea19b45146e7eef71da60b96c7c2dc0234e2f
parentd7984d88e6e611e84fef41e7bb092c127b5db26b (diff)
convert angle from degrees to radians for glm
This makes simple (i.e., not implemented as a shader) OpenGL transitions work correctly again. Change-Id: I773f686089bce3611940743b1a7f5046093886e8
-rw-r--r--slideshow/source/engine/opengl/Operation.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/slideshow/source/engine/opengl/Operation.cxx b/slideshow/source/engine/opengl/Operation.cxx
index 0888d6ae39bb..a8f5bc892851 100644
--- a/slideshow/source/engine/opengl/Operation.cxx
+++ b/slideshow/source/engine/opengl/Operation.cxx
@@ -31,6 +31,8 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
+#include <basegfx/numeric/ftools.hxx>
+
#include "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)
{
}