summaryrefslogtreecommitdiff
path: root/src/game/GameView.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-22 14:45:37 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-22 14:45:37 (GMT)
commit19c1fa5dcb4c4a2ba9d692e136b17da316a2631b (patch)
tree8436e6674dc4375f0392a9142be1a06ddf888337 /src/game/GameView.h
parent91bb5a8b781fba33901c0a2804b86055ed588aa4 (diff)
downloadpowder-19c1fa5dcb4c4a2ba9d692e136b17da316a2631b.zip
powder-19c1fa5dcb4c4a2ba9d692e136b17da316a2631b.tar.gz
Brush class for drawing on simulation, more interface for game
Diffstat (limited to 'src/game/GameView.h')
-rw-r--r--src/game/GameView.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/GameView.h b/src/game/GameView.h
index 284fd82..85a96e7 100644
--- a/src/game/GameView.h
+++ b/src/game/GameView.h
@@ -7,6 +7,7 @@
#include "interface/Window.h"
#include "interface/Point.h"
#include "interface/Button.h"
+#include "Brush.h"
using namespace std;
@@ -19,6 +20,7 @@ private:
queue<ui::Point*> pointQueue;
GameController * c;
Renderer * ren;
+ Brush * activeBrush;
//UI Elements
ui::Button * searchButton;
ui::Button * reloadButton;
@@ -37,10 +39,12 @@ public:
void NotifyRendererChanged(GameModel * sender);
void NotifySimulationChanged(GameModel * sender);
void NotifyPausedChanged(GameModel * sender);
+ void NotifySaveChanged(GameModel * sender);
+ void NotifyBrushChanged(GameModel * sender);
virtual void OnMouseMove(int x, int y, int dx, int dy);
virtual void OnMouseDown(int x, int y, unsigned button);
virtual void OnMouseUp(int x, int y, unsigned button);
- //virtual void OnMouseWheel(int x, int y, int d) {}
+ virtual void OnMouseWheel(int x, int y, int d);
//virtual void OnKeyPress(int key, bool shift, bool ctrl, bool alt) {}
//virtual void OnKeyRelease(int key, bool shift, bool ctrl, bool alt) {}
virtual void OnTick(float dt);