diff options
author | Danny Baumann <dannybaumann@web.de> | 2008-04-02 07:25:21 +0200 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2008-04-02 07:25:21 +0200 |
commit | 45a0e306e741db3e2b20be7025c33311b573b745 (patch) | |
tree | 3c7eda3a59253850ce27f4c9d282d553563f94c4 | |
parent | ba0f884366e53a987226a71da3ee811b8bd3a2be (diff) | |
download | screensaver-45a0e306e741db3e2b20be7025c33311b573b745.tar.gz screensaver-45a0e306e741db3e2b20be7025c33311b573b745.tar.bz2 |
Track cube plugin changes.
-rw-r--r-- | rotatingcube.cpp | 4 | ||||
-rw-r--r-- | rotatingcube.h | 2 | ||||
-rw-r--r-- | screensaver.cpp | 4 | ||||
-rw-r--r-- | screensaver_internal.h | 2 | ||||
-rw-r--r-- | wrapper.cpp | 4 | ||||
-rw-r--r-- | wrapper.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/rotatingcube.cpp b/rotatingcube.cpp index dffdf87..224fc27 100644 --- a/rotatingcube.cpp +++ b/rotatingcube.cpp @@ -48,9 +48,9 @@ void ScreenRotatingCube::clean() UNWRAP (ss, cs, getRotation); } -void ScreenRotatingCube::getRotation( float* x, float* v ) +void ScreenRotatingCube::getRotation( float* x, float* v, float *progress ) { - ScreenEffect::getRotation( x, v ); + ScreenEffect::getRotation( x, v, progress ); *x += ss->cubeRotX; *v += ss->cubeRotV; diff --git a/rotatingcube.h b/rotatingcube.h index 5283c22..82c34c4 100644 --- a/rotatingcube.h +++ b/rotatingcube.h @@ -11,7 +11,7 @@ public: virtual bool enable(); virtual void disable(); - virtual void getRotation( float* x, float* v ); + virtual void getRotation( float* x, float* v, float *progress ); virtual void preparePaintScreen( int msSinceLastPaint ); virtual void donePaintScreen(); virtual Bool paintOutput( const ScreenPaintAttrib *sAttrib, \ diff --git a/screensaver.cpp b/screensaver.cpp index d741550..5f5739f 100644 --- a/screensaver.cpp +++ b/screensaver.cpp @@ -123,10 +123,10 @@ screenSaverInitiate (CompDisplay *d, return TRUE; } -void screenSaverGetRotation( CompScreen *s, float *x, float *v ) +void screenSaverGetRotation( CompScreen *s, float *x, float *v, float *progress ) { SCREENSAVER_SCREEN (s); - ss->effect->getRotation( x, v ); + ss->effect->getRotation( x, v, progress ); } Bool screenSaverPaintWindow (CompWindow *w, diff --git a/screensaver_internal.h b/screensaver_internal.h index f90dc64..bc54ce2 100644 --- a/screensaver_internal.h +++ b/screensaver_internal.h @@ -101,7 +101,7 @@ typedef struct _ScreenSaverWindow { } ScreenSaverWindow; void screenSaverHandleEvent( CompDisplay *d, XEvent *event ); -void screenSaverGetRotation( CompScreen *s, float *x, float *v ); +void screenSaverGetRotation( CompScreen *s, float *x, float *v, float *progress ); void screenSaverPreparePaintScreen( CompScreen* s, int msSinceLastPaint ); void screenSaverDonePaintScreen( CompScreen* s ); void screenSaverPaintTransformedOutput( CompScreen* s, const ScreenPaintAttrib* sAttrib, \ diff --git a/wrapper.cpp b/wrapper.cpp index b9b74c2..a4dc44f 100644 --- a/wrapper.cpp +++ b/wrapper.cpp @@ -21,11 +21,11 @@ ScreenWrapper::ScreenWrapper( CompScreen* s ) this->ss = ss; } -void ScreenWrapper::getRotation( float* x, float* v ) +void ScreenWrapper::getRotation( float* x, float* v, float *progress ) { CUBE_SCREEN(s); UNWRAP( ss, cs, getRotation ); - cs->getRotation( s, x, v ); + cs->getRotation( s, x, v, progress ); WRAP( ss, cs, getRotation, screenSaverGetRotation ); } @@ -22,7 +22,7 @@ public: ScreenWrapper( CompScreen* s ); virtual ~ScreenWrapper() {} - virtual void getRotation( float* x, float* v ); + virtual void getRotation( float* x, float* v, float *progress ); virtual void preparePaintScreen( int msSinceLastPaint ); virtual void donePaintScreen(); virtual void paintTransformedOutput( const ScreenPaintAttrib* sAttrib, \ |