Compiz

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

  1. compiz.matrix-additions
  2. Merge into 0.9.12
Proposed by Eleni Maria Stea
Status: Work in progress
Proposed branch: lp://qastaging/~hikiko/compiz/compiz.matrix-additions
Merge into: lp://qastaging/compiz/0.9.12
Diff against target: 324 lines (+99/-19)
10 files modified
plugins/animation/src/animation.cpp (+1/-1)
plugins/cube/src/cube.cpp (+3/-3)
plugins/cubeaddon/src/cubeaddon.cpp (+3/-3)
plugins/freewins/src/util.cpp (+1/-1)
plugins/opengl/include/opengl/matrix.h (+8/-0)
plugins/opengl/include/opengl/opengl.h (+1/-1)
plugins/opengl/include/opengl/vector.h (+8/-1)
plugins/opengl/src/matrix.cpp (+58/-1)
plugins/opengl/src/vector.cpp (+8/-0)
plugins/td/src/3d.cpp (+8/-8)
To merge this branch: bzr merge lp://qastaging/~hikiko/compiz/compiz.matrix-additions
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Azzarone Approve
Marco Trevisan (Treviño) Pending
Unity Team Pending
Review via email: mp+273072@code.qastaging.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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

Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Reply
lp://qastaging/~hikiko/compiz/compiz.matrix-additions updated
3979. By Eleni Maria Stea

changed OpenGL plugin ABI version

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Reply
lp://qastaging/~hikiko/compiz/compiz.matrix-additions updated
3980. By Eleni Maria Stea

added operator <<

Revision history for this message
Eleni Maria Stea (hikiko) wrote :

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?)

Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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 ;-)

Reply
Revision history for this message
Stephen M. Webb (bregma) wrote :

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

Reply
lp://qastaging/~hikiko/compiz/compiz.matrix-additions updated
3981. By Eleni Maria Stea

print uses operator <<

Revision history for this message
Eleni Maria Stea (hikiko) wrote :

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

Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Reply
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

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

Reply
lp://qastaging/~hikiko/compiz/compiz.matrix-additions updated
3982. By Eleni Maria Stea

fixed operator *, used the correct operator in plugins

3983. By Eleni Maria Stea

implemented second operator *, fixed transform

Unmerged revisions

3983. By Eleni Maria Stea

implemented second operator *, fixed transform

3982. By Eleni Maria Stea

fixed operator *, used the correct operator in plugins

3981. By Eleni Maria Stea

print uses operator <<

3980. By Eleni Maria Stea

added operator <<

3979. By Eleni Maria Stea

changed OpenGL plugin ABI version

3978. By Eleni Maria Stea

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches