~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/expo/src/wall_offset/src/wall-offset.cpp

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
                             float           &worldScaleFactorY,
33
33
                             float           animationProgress)
34
34
        {
35
 
            const float sx = screenSize.width () / static_cast <float> (output.width ());
36
 
            const float sy = screenSize.height () / static_cast <float> (output.height ());
37
 
            offsetInWorldX = 0.0;
38
 
            offsetInWorldY = 0.0;
 
35
            const float sx    = screenSize.width ()  / static_cast <float> (output.width ());
 
36
            const float sy    = screenSize.height () / static_cast <float> (output.height ());
 
37
            offsetInWorldX    = 0.0;
 
38
            offsetInWorldY    = 0.0;
39
39
            worldScaleFactorX = 1.0f;
40
40
            worldScaleFactorY = 1.0f;
41
41