Merge lp:~hikiko/compiz/compiz.matrix-additions into lp:compiz/0.9.12

[Eleni Maria Stea]

Added a function that calculates the transpose matrix and a function that prints the matrix elements to GLMatrix class.

Added a function that calculates the transpose matrix and a function that prints the matrix elements to GLMatrix class.

[Andrea Azzarone (azzar1)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Please update the COMPIZ_OPENGL_ABI and implement the operator<< instead of using printf, so we can use this with std::cout.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3978
http://jenkins.qa.ubuntu.com/job/compiz-ci/89/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/34/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/89/rebuild

review: Needs Fixing (continuous-integration)

[lp:~hikiko/compiz/compiz.matrix-additions]

3979. By Eleni Maria Stea on 2015-10-02

changed OpenGL plugin ABI version

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3979
http://jenkins.qa.ubuntu.com/job/compiz-ci/90/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/90/rebuild

review: Needs Fixing (continuous-integration)

[lp:~hikiko/compiz/compiz.matrix-additions]

3980. By Eleni Maria Stea on 2015-10-02

added operator <<

[Eleni Maria Stea (hikiko)]

Well, I added the print function for quick debugging and since it doesn't have any extra dependencies and I can call it without including iostream everytime I need to check a matrix values I wouldn't like to delete it.

But I added the operator << as well in case someone needs to print a matrix in the release at some point (TBH I think that GLMatrix doesn't need to include iostream just for 1 rare case like that... what do you think?)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3980
http://jenkins.qa.ubuntu.com/job/compiz-ci/91/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/91/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Ok, fair enough if you want to keep the print() there, although adding an include when debugging shouldn't be a problem.

However, at least now implement print using std::cout ;-)

[Stephen M. Webb (bregma)]

Missing <iosfwd> header in opengl/matrix.h.

[lp:~hikiko/compiz/compiz.matrix-additions]

3981. By Eleni Maria Stea on 2015-10-05

print uses operator <<

[Eleni Maria Stea (hikiko)]

lol, yep, I did it +good idea the <iosfwd>

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3981
http://jenkins.qa.ubuntu.com/job/compiz-ci/92/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/37/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/92/rebuild

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

I found more problems in matrix.h/cpp: work in progress

[lp:~hikiko/compiz/compiz.matrix-additions]

3982. By Eleni Maria Stea on 2015-10-06

fixed operator *, used the correct operator in plugins

3983. By Eleni Maria Stea on 2015-10-06

implemented second operator *, fixed transform

Unmerged revisions

3983. By Eleni Maria Stea on 2015-10-06

implemented second operator *, fixed transform

3982. By Eleni Maria Stea on 2015-10-06

fixed operator *, used the correct operator in plugins

3981. By Eleni Maria Stea on 2015-10-05

print uses operator <<

3980. By Eleni Maria Stea on 2015-10-02

added operator <<

3979. By Eleni Maria Stea on 2015-10-02

changed OpenGL plugin ABI version

3978. By Eleni Maria Stea on 2015-10-01

added transpose and print functions to GLMatrix class that calculate the
transpose and print the matrix elements respectively

=== modified file 'plugins/animation/src/animation.cpp'
--- plugins/animation/src/animation.cpp	2015-03-16 18:45:33 +0000
+++ plugins/animation/src/animation.cpp	2015-10-06 07:15:45 +0000
@@ -835,7 +835,7 @@
 AnimWindow::expandBBWithPoint2DTransform (GLVector &coords,
 					  GLMatrix &transformMat)
 {
-    GLVector coordsTransformed = transformMat * coords;
+    GLVector coordsTransformed = coords.transform(transformMat);
     expandBBWithPoint (coordsTransformed[GLVector::x],
 		       coordsTransformed[GLVector::y]);
 }

=== modified file 'plugins/cube/src/cube.cpp'
--- plugins/cube/src/cube.cpp	2015-08-05 11:26:09 +0000
+++ plugins/cube/src/cube.cpp	2015-10-06 07:15:45 +0000
@@ -849,21 +849,21 @@
 
     GLMatrix mvp  = pm * sTransform;
 
-    GLVector pntA = mvp * points[0];
+    GLVector pntA = points[0].transform(mvp);
 
     if (pntA[3] < 0.0f)
 	rv = !rv;
 
     pntA.homogenize ();
 
-    GLVector pntB = mvp * points[1];
+    GLVector pntB = points[1].transform(mvp);
 
     if (pntB[3] < 0.0f)
 	rv = !rv;
 
     pntB.homogenize ();
 
-    GLVector pntC = mvp * points[2];
+    GLVector pntC = points[2].transform(mvp);
     pntC.homogenize ();
 
     GLVector vecA = pntC - pntA;

=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
--- plugins/cubeaddon/src/cubeaddon.cpp	2015-09-22 13:33:09 +0000
+++ plugins/cubeaddon/src/cubeaddon.cpp	2015-10-06 07:15:45 +0000
@@ -1265,14 +1265,14 @@
 	    pTransform.rotate (vRotate, cosf (xRotate * (M_PI / 180.0f)),
 			       0.0f, sinf (xRotate * (M_PI / 180.0f)));
 
-	    point = pTransform * point;
+	    point = point.transform(pTransform);
 
 	    pTransform.reset ();
 	    pTransform.rotate (xRotate2, 0.0f, 1.0f, 0.0f);
 	    pTransform.rotate (vRotate, cosf (xRotate2 * (M_PI / 180.0f)),
 			       0.0f, sinf (xRotate2 * (M_PI / 180.0f)));
 
-	    point2 = pTransform * point2;
+	    point2 = point2.transform(pTransform);
 
 	    switch (optionGetMode ()) {
 		case ModeJumpyReflection:
@@ -1348,7 +1348,7 @@
 		
 		gScreen->glApplyTransform (sAttrib, output, &pTransform);
 		point = GLVector (0.0, 0.0, -cDist + deform, 1.0);
-		point = pTransform * point;
+		point = point.transform(pTransform);
 		
 		rTransform.translate (0.0, 0.0, point[2]);
 		rTransform.rotate (mVRot, 1.0, 0.0, 0.0);

=== modified file 'plugins/freewins/src/util.cpp'
--- plugins/freewins/src/util.cpp	2013-02-20 14:24:30 +0000
+++ plugins/freewins/src/util.cpp	2015-10-06 07:15:45 +0000
@@ -60,7 +60,7 @@
 			       GLdouble *resultY,
 			       GLdouble *resultZ)
 {
-    vector = transform * vector;
+    vector = vector.transform(transform);
 
     GLint viewport[4];		// Viewport
     GLdouble modelview[16];	// Modelview Matrix

=== modified file 'plugins/opengl/include/opengl/matrix.h'
--- plugins/opengl/include/opengl/matrix.h	2012-08-02 11:57:41 +0000
+++ plugins/opengl/include/opengl/matrix.h	2015-10-06 07:15:45 +0000
@@ -27,6 +27,8 @@
 #define _GLMATRIX_H
 
 #include <opengl/vector.h>
+#include <iosfwd>
+#include <iostream>
 
 class CompOutput;
 
@@ -45,6 +47,7 @@
 	void toScreenSpace (const CompOutput *output, float z);
 
 	bool invert ();
+	void transpose ();
 
 	void rotate (const float angle, const float x,
 		     const float y, const float z);
@@ -56,11 +59,16 @@
 	void translate (const float x, const float y, const float z);
 	void translate (const GLVector& vector);
 
+	void print ();
+
+	friend std::ostream& operator<< (std::ostream& os, const GLMatrix& matrix);
     private:
 	friend GLMatrix operator* (const GLMatrix& lhs,
 				   const GLMatrix& rhs);
 	friend GLVector operator* (const GLMatrix& lhs,
 				   const GLVector& rhs);
+	friend GLVector operator* (const GLVector& rhs,
+				   const GLMatrix& lhs);
 
 	float m[16];
 };

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2014-12-10 13:21:23 +0000
+++ plugins/opengl/include/opengl/opengl.h	2015-10-06 07:15:45 +0000
@@ -59,7 +59,7 @@
 #include <opengl/programcache.h>
 #include <opengl/shadercache.h>
 
-#define COMPIZ_OPENGL_ABI 7
+#define COMPIZ_OPENGL_ABI 8
 
 /*
  * Some plugins check for #ifdef USE_MODERN_COMPIZ_GL. Support it for now, but

=== modified file 'plugins/opengl/include/opengl/vector.h'
--- plugins/opengl/include/opengl/vector.h	2015-03-02 08:32:21 +0000
+++ plugins/opengl/include/opengl/vector.h	2015-10-06 07:15:45 +0000
@@ -26,6 +26,8 @@
 #ifndef _GLVECTOR_H
 #define _GLVECTOR_H
 
+class GLMatrix;
+
 /**
  * Class which describes a point or vector
  * in 3D space
@@ -98,12 +100,17 @@
 	 * Returns the normalized version of the vector
 	 */
 	GLVector& normalize ();
-	
+
 	/**
 	 * Returns the homogenized version of the vector
 	 */
 	GLVector& homogenize ();
 
+	/**
+	 * Returns the vector transformed by a matrix
+	 */
+	GLVector transform(const GLMatrix &matrix);
+
     private:
 	friend GLVector operator+ (const GLVector& lhs,
 				   const GLVector& rhs);

=== modified file 'plugins/opengl/src/matrix.cpp'
--- plugins/opengl/src/matrix.cpp	2012-12-04 15:28:56 +0000
+++ plugins/opengl/src/matrix.cpp	2015-10-06 07:15:45 +0000
@@ -47,7 +47,6 @@
  */
 
 #include <core/output.h>
-
 #include <opengl/matrix.h>
 
 #include <string.h>
@@ -156,6 +155,21 @@
     return result;
 }
 
+GLVector
+operator* (const GLVector& rhs,
+           const GLMatrix& lhs)
+{
+    GLVector result;
+    const float *a = lhs.m;
+
+    for (int i=0; i<4; i++) {
+	result[i] = rhs[0] * A(0, i) + rhs[1] * A(1, i) +
+		    rhs[2] * A(2, i) + rhs[3] * A(3, i);
+    }
+
+    return result;
+}
+
 #undef A
 #undef B
 #undef P
@@ -214,6 +228,33 @@
 }
 
 /**
+ * Calculates the 4x4 transpose matrix.
+**/
+void GLMatrix::transpose ()
+{
+    for (int i=0; i<4; i++) {
+	for(int j=i+1; j<4; j++)
+	{
+	    int idx1 = i * 4 + j;
+	    int idx2 = j * 4 + i;
+
+	    float tmp = m[idx1];
+	    m[idx1] = m[idx2];
+	    m[idx2] = tmp;
+	}
+    }
+}
+
+/**
+ * Prints the 4x4 matrix elements (for debug).
+ **/
+
+void GLMatrix::print()
+{
+    std::cout << *this;
+}
+
+/**
  * Generate a 4x4 transformation matrix from glRotate parameters, and
  * post-multiply the input matrix by it.
  *
@@ -492,3 +533,19 @@
     assert (pos <= 15);
     return m[pos];
 }
+
+/**
+ * Prints the 4x4 matrix elements.
+ **/
+
+std::ostream& operator<< (std::ostream& os, const GLMatrix& matrix)
+{
+    for (int i=0; i<16; i++)
+    {
+	os << matrix.m[i] << "\t";
+	if (i % 4 == 3)
+	    os << std::endl;
+    }
+
+    return os;
+}

=== modified file 'plugins/opengl/src/vector.cpp'
--- plugins/opengl/src/vector.cpp	2015-03-02 08:32:21 +0000
+++ plugins/opengl/src/vector.cpp	2015-10-06 07:15:45 +0000
@@ -49,6 +49,7 @@
 #include <string.h>
 #include <math.h>
 #include <opengl/vector.h>
+#include <opengl/matrix.h>
 
 GLVector::GLVector ()
 {
@@ -259,3 +260,10 @@
 
     return *this;
 }
+
+GLVector
+GLVector::transform(const GLMatrix &matrix)
+{
+    GLVector tv = matrix * (*this);
+    return tv;
+}

=== modified file 'plugins/td/src/3d.cpp'
--- plugins/td/src/3d.cpp	2015-08-05 05:57:15 +0000
+++ plugins/td/src/3d.cpp	2015-10-06 07:15:45 +0000
@@ -107,34 +107,34 @@
 
 #define ADDQUAD(x1,y1,x2,y2)                                      \
 	point[GLVector::x] = x1; point[GLVector::y] = y1;                               \
-	tPoint = transform * point;       \
+	tPoint = point.transform(transform);       \
 	SET_V \
 	glVertex4fv (v);                                  \
 	point[GLVector::x] = x2; point[GLVector::y] = y2;                               \
-	tPoint = transform * point;        \
+	tPoint = point.transform(transform);        \
 	SET_V \
 	glVertex4fv (v);                                   \
-	tPoint = tds->mBTransform * point; \
+	tPoint = point.transform(tds->mBTransform); \
 	SET_V \
 	glVertex4fv (v);                                \
 	point[GLVector::x] = x1; point[GLVector::y] = y1;                               \
-	tPoint = tds->mBTransform * point; \
+	tPoint = point.transform(tds->mBTransform); \
 	SET_V \
 	glVertex4fv (v);                                   \
 
 #define ADDBEVELQUAD(x1,y1,x2,y2,m1,m2)             \
 	point[GLVector::x] = x1; point[GLVector::y] = y1;                 \
-	tPoint = m1 * point; \
+	tPoint = point.transform(m1); \
 	SET_V \
 	glVertex4fv (v);                     \
-	tPoint = m2 * point; \
+	tPoint = point.transform(m2); \
 	SET_V \
 	glVertex4fv (v);                     \
 	point[GLVector::x] = x2; point[GLVector::y] = y2;                 \
-	tPoint = m2 * point; \
+	tPoint = point.transform(m2); \
 	SET_V \
 	glVertex4fv (v);                     \
-	tPoint = m1 * point; \
+	tPoint = point.transform(m1); \
 	SET_V \
 	glVertex4fv (v);                     \