Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-01-10 15:36:15 +0000
committerStijn Buys <ingar@osirion.org>2009-01-10 15:36:15 +0000
commit272d229094309bc5875287a5063f818c58c5f4f8 (patch)
treefb9a84748c0a88bfa0e59f63be51455fc239becc /src/client/view.h
parent44500292f5a964036e9d915a38a2773bf5aa765d (diff)
hud widget, drawing code reorganization
Diffstat (limited to 'src/client/view.h')
-rw-r--r--src/client/view.h26
1 files changed, 6 insertions, 20 deletions
diff --git a/src/client/view.h b/src/client/view.h
index 250fa2d..499f6ec 100644
--- a/src/client/view.h
+++ b/src/client/view.h
@@ -9,6 +9,7 @@
#include "core/zone.h"
#include "client/chat.h"
+#include "client/hud.h"
#include "client/map.h"
#include "client/notifications.h"
#include "ui/widget.h"
@@ -29,7 +30,7 @@ public:
protected:
/// draw developer info
- void draw();
+ virtual void draw();
};
/// a widget that shows engine statistics
@@ -75,7 +76,6 @@ public:
inline Map *map() { return view_map; }
inline Chat *chat() { return view_chat; }
-
inline Notifications *notify() { return view_notify; }
protected:
@@ -84,34 +84,20 @@ protected:
virtual void resize();
private:
+ HUD *view_hud;
Chat *view_chat;
DevInfo *view_devinfo;
Stats *view_stats;
KeyPress *view_keypress;
Notifications *view_notify;
Map *view_map;
- ui::Bitmap *view_center;
};
-/// functions to draw the client view
-namespace view
-{
- /// intialize the view
- void init();
-
- /// shutdown the view
- void shutdown();
-
- /// draw the next frame
- void frame(float elapsed);
-
- /// reset OpenGL state
- void reset();
+namespace view {
- /// clear client-side assets of a zone
- void clear_zone(core::Zone *zone);
+void draw_hud();
-} // namespace view
+}
} // namespace client