i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed some more style violations.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40115 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-01-04 19:26:44 +00:00
parent b76ca311d1
commit 1fd632e67c
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/screen_savers/butterfly/Butterfly.cpp
+10 -4
View File
@@ -6,6 +6,8 @@
* Geoffry Song, [email protected]
* Ryan Leavengood, [email protected]
*/
#include "Butterfly.h"
#include <math.h>
@@ -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)
{
src/add-ons/screen_savers/butterfly/Butterfly.h
+14 -13
View File
@@ -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_