|
 |
4e0f2f1 |
From ce2ad7ebd6c0fa15316c642105a84b1f7a687757 Mon Sep 17 00:00:00 2001
|
|
|
4e0f2f1 |
From: David Tardon <dtardon@redhat.com>
|
|
|
4e0f2f1 |
Date: Mon, 31 Oct 2016 19:51:56 +0100
|
|
|
4e0f2f1 |
Subject: [PATCH] convert angle from degrees to radians for glm
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
This makes simple (i.e., not implemented as a shader) OpenGL transitions
|
|
|
4e0f2f1 |
work correctly again.
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
(cherry picked from commit 7445399af829c48e8c71eed66f132d96fa195c37)
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
Change-Id: I773f686089bce3611940743b1a7f5046093886e8
|
|
|
4e0f2f1 |
---
|
|
|
4e0f2f1 |
slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx | 8 +++++---
|
|
|
4e0f2f1 |
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
|
|
|
4e0f2f1 |
index c61209f..97d8902 100644
|
|
|
4e0f2f1 |
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
|
|
|
4e0f2f1 |
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
|
|
|
4e0f2f1 |
@@ -31,6 +31,8 @@
|
|
|
4e0f2f1 |
#include <glm/gtc/matrix_transform.hpp>
|
|
|
4e0f2f1 |
#include <glm/gtc/type_ptr.hpp>
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
+#include <basegfx/numeric/ftools.hxx>
|
|
|
4e0f2f1 |
+
|
|
|
4e0f2f1 |
#include "OGLTrans_Operation.hxx"
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
|
|
|
4e0f2f1 |
@@ -38,7 +40,7 @@ SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
|
|
|
4e0f2f1 |
Operation(bInter, T0, T1),
|
|
|
4e0f2f1 |
axis(Axis),
|
|
|
4e0f2f1 |
origin(Origin),
|
|
|
4e0f2f1 |
- angle(Angle)
|
|
|
4e0f2f1 |
+ angle(basegfx::deg2rad(Angle))
|
|
|
4e0f2f1 |
{
|
|
|
4e0f2f1 |
}
|
|
|
4e0f2f1 |
|
|
|
4e0f2f1 |
@@ -55,7 +57,7 @@ RotateAndScaleDepthByWidth::RotateAndScaleDepthByWidth(const glm::vec3& Axis,
|
|
|
4e0f2f1 |
Operation(bInter, T0, T1),
|
|
|
4e0f2f1 |
axis(Axis),
|
|
|
4e0f2f1 |
origin(Origin),
|
|
|
4e0f2f1 |
- angle(Angle),
|
|
|
4e0f2f1 |
+ angle(basegfx::deg2rad(Angle)),
|
|
|
4e0f2f1 |
scale(bScale)
|
|
|
4e0f2f1 |
{
|
|
|
4e0f2f1 |
}
|
|
|
4e0f2f1 |
@@ -65,7 +67,7 @@ RotateAndScaleDepthByHeight::RotateAndScaleDepthByHeight(const glm::vec3& Axis,
|
|
|
4e0f2f1 |
Operation(bInter, T0, T1),
|
|
|
4e0f2f1 |
axis(Axis),
|
|
|
4e0f2f1 |
origin(Origin),
|
|
|
4e0f2f1 |
- angle(Angle),
|
|
|
4e0f2f1 |
+ angle(basegfx::deg2rad(Angle)),
|
|
|
4e0f2f1 |
scale(bScale)
|
|
|
4e0f2f1 |
{
|
|
|
4e0f2f1 |
}
|
|
|
4e0f2f1 |
--
|
|
|
4e0f2f1 |
2.9.3
|
|
|
4e0f2f1 |
|