Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
@@ -13,118 +13,117 @@
|
||||
|
||||
#ifndef GWEN_NO_ANIMATION
|
||||
|
||||
namespace Gwen
|
||||
namespace Gwen
|
||||
{
|
||||
namespace Anim
|
||||
namespace Anim
|
||||
{
|
||||
class GWEN_EXPORT Animation
|
||||
{
|
||||
public:
|
||||
typedef std::list<Animation*> ChildList;
|
||||
typedef std::map<Gwen::Controls::Base*, ChildList> List;
|
||||
|
||||
virtual void Think() = 0;
|
||||
virtual bool Finished() = 0;
|
||||
|
||||
virtual ~Animation() {}
|
||||
|
||||
Gwen::Controls::Base* m_Control;
|
||||
};
|
||||
|
||||
GWEN_EXPORT void Add(Gwen::Controls::Base* control, Animation* animation);
|
||||
GWEN_EXPORT void Cancel(Gwen::Controls::Base* control);
|
||||
GWEN_EXPORT void Think();
|
||||
|
||||
//
|
||||
// Timed animation. Provides a useful base for animations.
|
||||
//
|
||||
class GWEN_EXPORT TimedAnimation : public Animation
|
||||
{
|
||||
public:
|
||||
TimedAnimation(float fLength, float fDelay = 0.0f, float fEase = 1.0f);
|
||||
|
||||
virtual void Think();
|
||||
virtual bool Finished();
|
||||
|
||||
//
|
||||
// These are the magic functions you should be overriding
|
||||
//
|
||||
virtual void OnStart() {}
|
||||
virtual void Run(float /*delta*/) {}
|
||||
virtual void OnFinish() {}
|
||||
|
||||
protected:
|
||||
bool m_bStarted;
|
||||
bool m_bFinished;
|
||||
float m_fStart;
|
||||
float m_fEnd;
|
||||
float m_fEase;
|
||||
};
|
||||
|
||||
namespace Size
|
||||
{
|
||||
class GWEN_EXPORT Height : public TimedAnimation
|
||||
{
|
||||
public:
|
||||
Height(int iStartSize, int iEndSize, float fLength, bool bHide = false, float fDelay = 0.0f, float fEase = 1.0f) : TimedAnimation(fLength, fDelay, fEase)
|
||||
{
|
||||
class GWEN_EXPORT Animation
|
||||
{
|
||||
public:
|
||||
|
||||
typedef std::list<Animation*> ChildList;
|
||||
typedef std::map< Gwen::Controls::Base *, ChildList > List;
|
||||
|
||||
virtual void Think() = 0;
|
||||
virtual bool Finished() = 0;
|
||||
|
||||
virtual ~Animation() {}
|
||||
|
||||
Gwen::Controls::Base* m_Control;
|
||||
};
|
||||
|
||||
GWEN_EXPORT void Add( Gwen::Controls::Base* control, Animation* animation );
|
||||
GWEN_EXPORT void Cancel( Gwen::Controls::Base* control );
|
||||
GWEN_EXPORT void Think();
|
||||
|
||||
//
|
||||
// Timed animation. Provides a useful base for animations.
|
||||
//
|
||||
class GWEN_EXPORT TimedAnimation : public Animation
|
||||
{
|
||||
public:
|
||||
|
||||
TimedAnimation( float fLength, float fDelay = 0.0f, float fEase = 1.0f );
|
||||
|
||||
virtual void Think();
|
||||
virtual bool Finished();
|
||||
|
||||
//
|
||||
// These are the magic functions you should be overriding
|
||||
//
|
||||
virtual void OnStart(){}
|
||||
virtual void Run( float /*delta*/ ){}
|
||||
virtual void OnFinish(){}
|
||||
|
||||
protected:
|
||||
|
||||
bool m_bStarted;
|
||||
bool m_bFinished;
|
||||
float m_fStart;
|
||||
float m_fEnd;
|
||||
float m_fEase;
|
||||
};
|
||||
|
||||
namespace Size
|
||||
{
|
||||
class GWEN_EXPORT Height : public TimedAnimation
|
||||
{
|
||||
public:
|
||||
|
||||
Height( int iStartSize, int iEndSize, float fLength, bool bHide = false, float fDelay = 0.0f, float fEase = 1.0f ) : TimedAnimation( fLength, fDelay, fEase )
|
||||
{
|
||||
m_iStartSize = iStartSize;
|
||||
m_iDelta = iEndSize - m_iStartSize;
|
||||
m_bHide = bHide;
|
||||
}
|
||||
|
||||
virtual void OnStart(){ m_Control->SetHeight( m_iStartSize ); }
|
||||
virtual void Run( float delta ){ m_Control->SetHeight( m_iStartSize + (((float)m_iDelta) * delta) ); }
|
||||
virtual void OnFinish(){ m_Control->SetHeight( m_iStartSize + m_iDelta ); m_Control->SetHidden( m_bHide ); }
|
||||
|
||||
protected:
|
||||
|
||||
int m_iStartSize;
|
||||
int m_iDelta;
|
||||
bool m_bHide;
|
||||
};
|
||||
|
||||
class Width : public TimedAnimation
|
||||
{
|
||||
public:
|
||||
|
||||
Width( int iStartSize, int iEndSize, float fLength, bool bHide = false, float fDelay = 0.0f, float fEase = 1.0f ) : TimedAnimation( fLength, fDelay, fEase )
|
||||
{
|
||||
m_iStartSize = iStartSize;
|
||||
m_iDelta = iEndSize - m_iStartSize;
|
||||
m_bHide = bHide;
|
||||
}
|
||||
|
||||
virtual void OnStart(){ m_Control->SetWidth( m_iStartSize ); }
|
||||
virtual void Run( float delta ){ m_Control->SetWidth( m_iStartSize + (((float)m_iDelta) * delta) ); }
|
||||
virtual void OnFinish(){ m_Control->SetWidth( m_iStartSize + m_iDelta ); m_Control->SetHidden( m_bHide ); }
|
||||
|
||||
protected:
|
||||
|
||||
int m_iStartSize;
|
||||
int m_iDelta;
|
||||
bool m_bHide;
|
||||
};
|
||||
}
|
||||
|
||||
namespace Tools
|
||||
{
|
||||
class Remove : public TimedAnimation
|
||||
{
|
||||
public:
|
||||
|
||||
Remove( float fDelay = 0.0f ) : TimedAnimation( 0.0f, fDelay ){}
|
||||
virtual void OnFinish(){ m_Control->DelayedDelete(); }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
m_iStartSize = iStartSize;
|
||||
m_iDelta = iEndSize - m_iStartSize;
|
||||
m_bHide = bHide;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnStart() { m_Control->SetHeight(m_iStartSize); }
|
||||
virtual void Run(float delta) { m_Control->SetHeight(m_iStartSize + (((float)m_iDelta) * delta)); }
|
||||
virtual void OnFinish()
|
||||
{
|
||||
m_Control->SetHeight(m_iStartSize + m_iDelta);
|
||||
m_Control->SetHidden(m_bHide);
|
||||
}
|
||||
|
||||
protected:
|
||||
int m_iStartSize;
|
||||
int m_iDelta;
|
||||
bool m_bHide;
|
||||
};
|
||||
|
||||
class Width : public TimedAnimation
|
||||
{
|
||||
public:
|
||||
Width(int iStartSize, int iEndSize, float fLength, bool bHide = false, float fDelay = 0.0f, float fEase = 1.0f) : TimedAnimation(fLength, fDelay, fEase)
|
||||
{
|
||||
m_iStartSize = iStartSize;
|
||||
m_iDelta = iEndSize - m_iStartSize;
|
||||
m_bHide = bHide;
|
||||
}
|
||||
|
||||
virtual void OnStart() { m_Control->SetWidth(m_iStartSize); }
|
||||
virtual void Run(float delta) { m_Control->SetWidth(m_iStartSize + (((float)m_iDelta) * delta)); }
|
||||
virtual void OnFinish()
|
||||
{
|
||||
m_Control->SetWidth(m_iStartSize + m_iDelta);
|
||||
m_Control->SetHidden(m_bHide);
|
||||
}
|
||||
|
||||
protected:
|
||||
int m_iStartSize;
|
||||
int m_iDelta;
|
||||
bool m_bHide;
|
||||
};
|
||||
} // namespace Size
|
||||
|
||||
namespace Tools
|
||||
{
|
||||
class Remove : public TimedAnimation
|
||||
{
|
||||
public:
|
||||
Remove(float fDelay = 0.0f) : TimedAnimation(0.0f, fDelay) {}
|
||||
virtual void OnFinish() { m_Control->DelayedDelete(); }
|
||||
};
|
||||
} // namespace Tools
|
||||
|
||||
} // namespace Anim
|
||||
} // namespace Gwen
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user