Merge lp://qastaging/~mc-return/compiz/compiz.merge-firepaint-improvements into lp://qastaging/compiz/0.9.10

Proposed by MC Return
Status: Merged
Approved by: MC Return
Approved revision: 3762
Merged at revision: 3769
Proposed branch: lp://qastaging/~mc-return/compiz/compiz.merge-firepaint-improvements
Merge into: lp://qastaging/compiz/0.9.10
Diff against target: 820 lines (+200/-192)
3 files modified
plugins/firepaint/firepaint.xml.in (+31/-24)
plugins/firepaint/src/firepaint.cpp (+112/-112)
plugins/firepaint/src/firepaint.h (+57/-56)
To merge this branch: bzr merge lp://qastaging/~mc-return/compiz/compiz.merge-firepaint-improvements
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sam Spilsbury Approve
MC Return Needs Resubmitting
Review via email: mp+173036@code.qastaging.launchpad.net

Commit message

Firepaint, code cleanup:

Declare variables outside of loops.
Declaration and assignment of local variables in one line.
Use pre- instead of postfix increment.
Removed redundant newlines.
Removed redundant casts. (from (float) optionGetFireColor)
Removed redundant brackets.
Added missing break (style issue only).
Added comment and TODO.
Fixed indentation.

Firepaint, speedup:

We just enable GL_BLEND if it is disabled and
we just disable GL_BLEND if it was disabled before.

Introduced the GLfloats xMinusW, xPlusW, yMinusH and
yPlusH to store calculated coordinates instead of
recalculating them multiple times.

Introduced
float fireLife = optionGetFireLife ();,
float fireWidth = optionGetFireSize ();,
float fireHeight = fireWidth * 1.5f; and
bool mystFire = optionGetFireMystical ();
and used those variables inside the loop.

Firepaint, .xml.in cleanup:

Firepaint now has 2 tabs, 'General' and 'Particle Settings'.
The name of this plugin is Firepaint, <short> should not contain
the description.
Better description of the plugin.
Uppercase option titles.
Punctuation for tooltips.
Improved tooltips.

Firepaint, fixes:

Initialize all class member variables in the ParticleSystem::
ParticleSystem () ctor (LP: #1101512, LP: #1101580).

Description of the change

Note/TODO:
Seems that changing the background brightness setting is not really possible (bug #1173789).
Also activating the cube, while firepainting makes the hack to darken the background visible (it is an overlay of two triangles in this case)... -> bug #1198567.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
MC Return (mc-return) :
review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

The Jenkins failures seem to be unrelated - Re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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

to all changes: