Permalink
Browse files

All systems now have macros for calling their instance (mutable and c…

…onst)
  • Loading branch information...
1 parent 42db581 commit 310ed033c6d3c771c9dee04c9badc8b7843bb747 Max Tyslenko committed Aug 28, 2010
Showing with 9 additions and 4 deletions.
  1. +3 −4 include/Systems/GraphicSystem.hpp
  2. +3 −0 include/Systems/GuiSystem.hpp
  3. +3 −0 include/Systems/InputSystem.hpp
View
7 include/Systems/GraphicSystem.hpp
@@ -12,13 +12,12 @@
#include <boost/foreach.hpp>
#include <boost/serialization/singleton.hpp>
-#include <Ogre.h>
-
using namespace boost::serialization;
using namespace std;
-//class GraphicSystem : public ISystem, public Ogre::Singleton<GraphicSystem>
-//class GraphicSystem : public ISystem, public singleton<GraphicSystem>
+#define graphicSystem (GraphicSystem::get_mutable_instance())
+#define graphicSystemConst (GraphicSystem::get_const_instance())
+
class GraphicSystem : public ISystem, public ISingleton<GraphicSystem>
{
protected:
View
3 include/Systems/GuiSystem.hpp
@@ -17,6 +17,9 @@
using namespace boost::serialization;
using namespace std;
+#define guiSystem (GuiSystem::get_mutable_instance())
+#define guiSystemConst (GuiSystem::get_const_instance())
+
class GuiSystem : public ISystem, public ISingleton<GuiSystem>
{
private:
View
3 include/Systems/InputSystem.hpp
@@ -21,6 +21,9 @@
using namespace boost::serialization;
using namespace Engine;
+#define inputSystem (InputSystem::get_mutable_instance())
+#define inputSystemConst (InputSystem::get_const_instance())
+
class InputSystem : public ISystem, public ISingleton<InputSystem>, public OIS::KeyListener, public OIS::MouseListener,
public Ogre::WindowEventListener
{

0 comments on commit 310ed03

Please sign in to comment.