No code change just reformatting of header files.
finishing up my reformatting of the source from November/December following the guidelines that were posted. some extra things I added: * Any empty virtual declarations were kept to one line. * Enums were split up into separate lines to promote uniformity across all headers. ( each header file had a different style for enums)
This commit is contained in:
@@ -5,30 +5,36 @@
|
||||
#include <JGui.h>
|
||||
#include "GameState.h"
|
||||
|
||||
class TransitionBase: public GameState, public JGuiListener{
|
||||
class TransitionBase: public GameState, public JGuiListener
|
||||
{
|
||||
public:
|
||||
TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration);
|
||||
~TransitionBase();
|
||||
virtual void Start();
|
||||
virtual void End();
|
||||
TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration);
|
||||
~TransitionBase();
|
||||
virtual void Start();
|
||||
virtual void End();
|
||||
|
||||
virtual bool Finished() {return (mElapsed >= mDuration);};
|
||||
virtual void Update(float dt);
|
||||
virtual void Render() = 0;
|
||||
virtual void ButtonPressed(int controllerId, int controlId);
|
||||
virtual bool Finished()
|
||||
{
|
||||
return (mElapsed >= mDuration);
|
||||
}
|
||||
;
|
||||
virtual void Update(float dt);
|
||||
virtual void Render() = 0;
|
||||
virtual void ButtonPressed(int controllerId, int controlId);
|
||||
|
||||
float mElapsed;
|
||||
float mDuration;
|
||||
GameState* from;
|
||||
GameState* to;
|
||||
bool bAnimationOnly; //Does not call start or end on subordinates.
|
||||
float mElapsed;
|
||||
float mDuration;
|
||||
GameState* from;
|
||||
GameState* to;
|
||||
bool bAnimationOnly; //Does not call start or end on subordinates.
|
||||
};
|
||||
|
||||
class TransitionFade: public TransitionBase {
|
||||
class TransitionFade: public TransitionBase
|
||||
{
|
||||
public:
|
||||
TransitionFade(GameApp* p, GameState* f, GameState* t, float dur, bool reversed);
|
||||
virtual void Render();
|
||||
bool mReversed;
|
||||
TransitionFade(GameApp* p, GameState* f, GameState* t, float dur, bool reversed);
|
||||
virtual void Render();
|
||||
bool mReversed;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user