Compiz CubeAddon Plugin

Merge lp:~alan-griffiths/compiz-cubeaddon-plugin/Bug-918554 into lp:compiz-cubeaddon-plugin

  1. Bug-918554
  2. Merge into 0.9.5
Proposed by Alan Griffiths
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 86
Merged at revision: 86
Proposed branch: lp:~alan-griffiths/compiz-cubeaddon-plugin/Bug-918554
Merge into: lp:compiz-cubeaddon-plugin
Diff against target: 32 lines (+5/-5)
1 file modified
src/cubeaddon.cpp (+5/-5)
To merge this branch: bzr merge lp:~alan-griffiths/compiz-cubeaddon-plugin/Bug-918554
Reviewer Review Type Date Requested Status
Thomas Voß Approve
Daniel van Vugt Approve
Review via email: mp+89209@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Perfect.

review: Approve
Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/cubeaddon.cpp'
2--- src/cubeaddon.cpp 2011-02-24 06:27:28 +0000
3+++ src/cubeaddon.cpp 2012-01-19 10:26:26 +0000
4@@ -1144,15 +1144,15 @@
5
6 pTransform.reset ();
7 pTransform.rotate (xRotate, 0.0f, 1.0f, 0.0f);
8- pTransform.rotate (vRotate, cosf (xRotate * DEG2RAD),
9- 0.0f, sinf (xRotate * DEG2RAD));
10+ pTransform.rotate (vRotate, cosf (xRotate * (M_PI / 180.0f)),
11+ 0.0f, sinf (xRotate * (M_PI / 180.0f)));
12
13 point = pTransform * point;
14
15 pTransform.reset ();
16 pTransform.rotate (xRotate2, 0.0f, 1.0f, 0.0f);
17- pTransform.rotate (vRotate, cosf (xRotate2 * DEG2RAD),
18- 0.0f, sinf (xRotate2 * DEG2RAD));
19+ pTransform.rotate (vRotate, cosf (xRotate2 * (M_PI / 180.0f)),
20+ 0.0f, sinf (xRotate2 * (M_PI / 180.0f)));
21
22 point2 = pTransform * point2;
23
24@@ -1182,7 +1182,7 @@
25 rYTrans = -mCapFill[1] - 0.5;
26 }
27 else if (optionGetDeformation () == DeformationSphere &&
28- vRotate > atan (cDist * 2) / DEG2RAD)
29+ vRotate > atan (cDist * 2) / (M_PI / 180.0f))
30 {
31 mYTrans = sqrt (0.5 + cDist2) - 0.5;
32 rYTrans = -sqrt (0.5 + cDist2) - 0.5;

Subscribers

People subscribed via source and target branches