From 1fd632e67c642a3da9098df0fdf59ba4370329d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 4 Jan 2011 19:26:44 +0000 Subject: [PATCH] * Fixed some more style violations. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40115 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../screen_savers/butterfly/Butterfly.cpp | 14 +++++++--- .../screen_savers/butterfly/Butterfly.h | 27 ++++++++++--------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/add-ons/screen_savers/butterfly/Butterfly.cpp b/src/add-ons/screen_savers/butterfly/Butterfly.cpp index 54a94161de..4090c4d266 100644 --- a/src/add-ons/screen_savers/butterfly/Butterfly.cpp +++ b/src/add-ons/screen_savers/butterfly/Butterfly.cpp @@ -6,6 +6,8 @@ * Geoffry Song, goffrie@gmail.com * Ryan Leavengood, leavengood@gmail.com */ + + #include "Butterfly.h" #include @@ -24,8 +26,12 @@ instantiate_screen_saver(BMessage* archive, image_id imageId) } +// #pragma mark - + + Butterfly::Butterfly(BMessage* archive, image_id imageId) - : BScreenSaver(archive, imageId) + : + BScreenSaver(archive, imageId) { } @@ -76,7 +82,7 @@ Butterfly::Draw(BView* view, int32 frame) if (frame == 1024) { // calculate bounding box ( (-5.92,-5.92) to (5.92, 5.92) ) fBounds.Set(-5.92f * fScale + fTrans.x, -5.92f * fScale + fTrans.y, - 5.92f * fScale + fTrans.x, 5.92f * fScale + fTrans.y); + 5.92f * fScale + fTrans.x, 5.92f * fScale + fTrans.y); } if ((frame & 3) == 0) { // fade out @@ -86,7 +92,7 @@ Butterfly::Draw(BView* view, int32 frame) // create a color from a hue of (fBase * 15) degrees view->SetHighColor(_HueToColor(fBase * 15)); BPoint p = _Iterate(); - + // cubic Hermite interpolation from fLast[1] to fLast[2] // calculate tangents for a Catmull-Rom spline //(these values need to be halved) @@ -108,7 +114,7 @@ Butterfly::Draw(BView* view, int32 frame) } -// convert from a hue in degrees to a fully saturated color +//! Convert from a hue in degrees to a fully saturated color inline rgb_color Butterfly::_HueToColor(float hue) { diff --git a/src/add-ons/screen_savers/butterfly/Butterfly.h b/src/add-ons/screen_savers/butterfly/Butterfly.h index adbb81f366..060044b832 100644 --- a/src/add-ons/screen_savers/butterfly/Butterfly.h +++ b/src/add-ons/screen_savers/butterfly/Butterfly.h @@ -14,26 +14,27 @@ class Butterfly : public BScreenSaver { public: - Butterfly(BMessage* archive, image_id imageId); + Butterfly(BMessage* archive, image_id imageID); - virtual void StartConfig(BView* view); - virtual status_t StartSaver(BView* view, bool preview); - virtual void Draw(BView* view, int32 frame); + virtual void StartConfig(BView* view); + virtual status_t StartSaver(BView* view, bool preview); + virtual void Draw(BView* view, int32 frame); + +private: + inline rgb_color _HueToColor(float hue); + inline BPoint _Iterate(); private: // base value for calculating the curves on each iteration - float fBase; + float fBase; // previously calculated points - BPoint fLast[3]; + BPoint fLast[3]; // transformation from graph coordinates to view coordinates - float fScale; - BPoint fTrans; + float fScale; + BPoint fTrans; // bounding box of drawn figure - BRect fBounds; - - inline rgb_color _HueToColor(float hue); - inline BPoint _Iterate(); + BRect fBounds; }; -#endif // _BUTTERFLY_H_ +#endif // _BUTTERFLY_H_