← Back to branch summary

~compiz-team/compiz-animation-plugin/oneiric

« back to all changes in this revision

Viewing changes to src/animation.cpp

  • Committer: Jay Catherwood
  • Date: 2010-08-11 17:29:34 UTC
  • mfrom: (360.1.3)
  • Revision ID: git-v1:e9cd23298aa13192825a758ba620871efd66d3fd
Merge branch 'master' of git://anongit.compiz.org/compiz/plugins/animation

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/animation.cpp
1182
1182
        extPlugin->prePreparePaintGeneral ();
1183
1183
 
1184
1184
    if (mAnimInProgress)
1185
 
    {
 
1185
    {   
1186
1186
        int msSinceLastPaintActual;
1187
1187
 
1188
1188
        struct timeval curTime;
1210
1210
            Animation *curAnim = aw->curAnimation ();
1211
1211
 
1212
1212
            if (curAnim)
1213
 
            {
 
1213
            {           
1214
1214
                if (!curAnim->initialized ())
1215
1215
                    curAnim->init ();
1216
1216
 
1275
1275
                    }
1276
1276
                }
1277
1277
 
1278
 
                if (curAnim->remainingTime () <= 0) // Animation is done
 
1278
                bool finished = (curAnim->remainingTime () <= 0);
 
1279
                if (finished) // Animation is done
1279
1280
                {
1280
1281
                    aw->postAnimationCleanUp ();
1281
1282
                }
1506
1507
    mCurAnimation->updateTransform (wTransform);
1507
1508
    mCurAnimation->prePaintWindow ();
1508
1509
 
1509
 
    status = gWindow->glPaint (wAttrib, wTransform, region, mask);
 
1510
    if (mCurAnimation->paintWindowUsed ())
 
1511
        status = mCurAnimation->paintWindow (gWindow, wAttrib, wTransform, region, mask);
 
1512
    else
 
1513
        status = gWindow->glPaint (wAttrib, wTransform, region, mask);
1510
1514
 
1511
1515
    if (mCurAnimation->postPaintWindowUsed ())
1512
1516
    {
2331
2335
AnimEffect AnimEffectWave;
2332
2336
AnimEffect AnimEffectZoom;
2333
2337
 
2334
 
 
2335
2338
PrivateAnimScreen::PrivateAnimScreen (CompScreen *s, AnimScreen *as) :
2336
2339
    cScreen (CompositeScreen::get (s)),
2337
2340
    gScreen (GLScreen::get (s)),