gered/MyGameFramework
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

some minor cleanups and new asserts

Browse source
This commit is contained in:
Gered 2013-04-02 12:14:09 -04:00
parent 6de773f270
commit c18ed56011
9 changed files with 52 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/states/gamestate.cpp
View file

@ -11,13 +11,14 @@ GameState::GameState(GameApp *gameApp, StateManager *stateManager)
: EventListenerEx(gameApp->GetEventManager()) : EventListenerEx(gameApp->GetEventManager())
{ {
STACK_TRACE; STACK_TRACE;
ASSERT(gameApp != NULL);
ASSERT(stateManager != NULL);
m_gameApp = gameApp; m_gameApp = gameApp;
m_stateManager = stateManager; m_stateManager = stateManager;
m_effectManager = new EffectManager(); m_effectManager = new EffectManager();
ASSERT(m_effectManager != NULL);
m_processManager = new ProcessManager(this); m_processManager = new ProcessManager(this);
ASSERT(m_processManager != NULL);
m_isFinished = FALSE; m_isFinished = FALSE;
m_returnValue = 0; m_returnValue = 0;

14
src/states/gamestate.h
View file

@ -43,18 +43,18 @@ public:
template<class T> T* As(); template<class T> T* As();
template<class T> const T* As() const; template<class T> const T* As() const;
GameApp* GetGameApp() const { return m_gameApp; } GameApp* GetGameApp() const { return m_gameApp; }
ProcessManager* GetProcessManager() const { return m_processManager; } ProcessManager* GetProcessManager() const { return m_processManager; }
EffectManager* GetEffectManager() const { return m_effectManager; } EffectManager* GetEffectManager() const { return m_effectManager; }
BOOL IsTransitioning() const; BOOL IsTransitioning() const;
BOOL IsTopState() const; BOOL IsTopState() const;
BOOL IsFinished() const { return m_isFinished; } BOOL IsFinished() const { return m_isFinished; }
BOOL HasReturnValue() const { return m_hasReturnValue; } BOOL HasReturnValue() const { return m_hasReturnValue; }
uint32_t GetReturnValue() const { return m_returnValue; } uint32_t GetReturnValue() const { return m_returnValue; }
protected: protected:
StateManager* GetStateManager() const { return m_stateManager; } StateManager* GetStateManager() const { return m_stateManager; }
void SetFinished(); void SetFinished();
void SetFinished(uint32_t returnValue); void SetFinished(uint32_t returnValue);

2
src/states/gwengamestate.cpp
View file

@ -4,7 +4,7 @@
#include "gwengamestateuicontroller.h" #include "gwengamestateuicontroller.h"
GwenGameState::GwenGameState(GameApp *gameApp, StateManager *stateManager) GwenGameState::GwenGameState(GameApp *gameApp, StateManager *stateManager)
: GameState(gameApp, stateManager) : GameState(gameApp, stateManager)
{ {
STACK_TRACE; STACK_TRACE;
m_gwenController = NULL; m_gwenController = NULL;

2
src/states/gwengamestate.h
View file

@ -19,7 +19,7 @@ public:
static GAMESTATE_TYPE typeName = "GwenGameState"; static GAMESTATE_TYPE typeName = "GwenGameState";
return typeName; return typeName;
} }
GAMESTATE_TYPE GetTypeOf() const { return GetType(); } GAMESTATE_TYPE GetTypeOf() const { return GetType(); }
GwenGameState(GameApp *gameApp, StateManager *stateManager); GwenGameState(GameApp *gameApp, StateManager *stateManager);
virtual ~GwenGameState(); virtual ~GwenGameState();

2
src/states/gwengamestateuicontroller.cpp
View file

@ -14,6 +14,8 @@
GwenGameStateUIController::GwenGameStateUIController(GwenGameState *gameState) GwenGameStateUIController::GwenGameStateUIController(GwenGameState *gameState)
{ {
STACK_TRACE; STACK_TRACE;
ASSERT(gameState != NULL);
m_gameState = gameState; m_gameState = gameState;
m_canvas = NULL; m_canvas = NULL;
m_inputProcessor = NULL; m_inputProcessor = NULL;

8
src/states/gwengamestateuicontroller.h
View file

@ -58,13 +58,13 @@ protected:
Gwen::Controls::Canvas* InitializeGwen(const stl::string &skinFilename, const stl::string &fontFilename, uint8_t fontSize); Gwen::Controls::Canvas* InitializeGwen(const stl::string &skinFilename, const stl::string &fontFilename, uint8_t fontSize);
void ResizeAndScaleCanvas(); void ResizeAndScaleCanvas();
GwenGameState* GetGameState() const { return m_gameState; } GwenGameState* GetGameState() const { return m_gameState; }
Gwen::Controls::Canvas* GetCanvas() const { return m_canvas; } Gwen::Controls::Canvas* GetCanvas() const { return m_canvas; }
void EnableGwenInput(BOOL enable); void EnableGwenInput(BOOL enable);
float GetAlpha() const { return m_alpha; } float GetAlpha() const { return m_alpha; }
float GetScale() const { return m_scale; } float GetScale() const { return m_scale; }
void SetAlpha(float alpha); void SetAlpha(float alpha);
void SetScale(float scale); void SetScale(float scale);

2
src/states/stateinfo.h
View file

@ -21,7 +21,7 @@ struct StateInfo
BOOL isInactive; BOOL isInactive;
BOOL isBeingPopped; BOOL isBeingPopped;
const stl::string& GetDescriptor() const { return m_descriptor; } const stl::string& GetDescriptor() const { return m_descriptor; }
private: private:
void SetDescriptor(); void SetDescriptor();

1
src/states/statemanager.cpp
View file

@ -13,6 +13,7 @@
StateManager::StateManager(GameApp *gameApp) StateManager::StateManager(GameApp *gameApp)
{ {
STACK_TRACE; STACK_TRACE;
ASSERT(gameApp != NULL);
m_gameApp = gameApp; m_gameApp = gameApp;
m_stateReturnValue = 0; m_stateReturnValue = 0;
m_hasStateReturnValue = FALSE; m_hasStateReturnValue = FALSE;

39
src/states/statemanager.h
View file

@ -43,15 +43,15 @@ public:
void OnUpdate(float delta); void OnUpdate(float delta);
BOOL IsTransitioning() const; BOOL IsTransitioning() const;
BOOL IsEmpty() const { return (m_states.empty() && m_pushQueue.empty() && m_swapQueue.empty()); } BOOL IsEmpty() const;
BOOL IsTop(const GameState *state) const { return GetTop()->gameState == state; } BOOL IsTop(const GameState *state) const;
BOOL IsTransitioning(const GameState *state) const { return GetStateInfoFor(state)->isTransitioning; } BOOL IsTransitioning(const GameState *state) const;
GameState* GetTopState() const { return GetTop()->gameState; } GameState* GetTopState() const;
GameState* GetTopNonOverlayState() const { return GetTopNonOverlay()->gameState; } GameState* GetTopNonOverlayState() const;
uint32_t GetLastReturnValue() const { return m_stateReturnValue; } uint32_t GetLastReturnValue() const { return m_stateReturnValue; }
BOOL HasLastReturnValue() const { return m_hasStateReturnValue; } BOOL HasLastReturnValue() const { return m_hasStateReturnValue; }
private: private:
void QueueForPush(StateInfo *newStateInfo); void QueueForPush(StateInfo *newStateInfo);
@ -151,6 +151,31 @@ T* StateManager::SwapTopNonOverlayWith(const stl::string &name)
return newState; return newState;
} }
inline BOOL StateManager::IsEmpty() const
{
return (m_states.empty() && m_pushQueue.empty() && m_swapQueue.empty());
}
inline BOOL StateManager::IsTop(const GameState *state) const
{
return GetTop()->gameState == state;
}
inline BOOL StateManager::IsTransitioning(const GameState *state) const
{
return GetStateInfoFor(state)->isTransitioning;
}
inline GameState* StateManager::GetTopState() const
{
return GetTop()->gameState;
}
inline GameState* StateManager::GetTopNonOverlayState() const
{
return GetTopNonOverlay()->gameState;
}
inline StateInfo* StateManager::GetTop() const inline StateInfo* StateManager::GetTop() const
{ {
if (m_states.empty()) if (m_states.empty())