diff options
author | Stijn Buys <ingar@osirion.org> | 2008-05-14 21:07:10 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-05-14 21:07:10 +0000 |
commit | a185c11f2397c0296a4b62cc266b4fa00a63c1e2 (patch) | |
tree | 186da4cdee2d9cd46fb2415567da1c441c7431ef /src/client/view.cc | |
parent | 599adb817e19d9be3502e501dc904c7255cd616c (diff) |
console, camera & interpolation
Diffstat (limited to 'src/client/view.cc')
-rw-r--r-- | src/client/view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index 63c373e..e2c8687 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -128,7 +128,7 @@ void draw_status() { using namespace render; - if (console::visible()) + if (console()->visible()) return; // print the status in the upper left corner @@ -171,7 +171,7 @@ void draw_status() void draw_cursor() { - if (!core::localcontrol() || console::visible()) + if (!core::localcontrol() || console()->visible()) return; float crosshair_size = 48.0f; @@ -222,7 +222,7 @@ void frame(float seconds) fps = 9999; // flush console messages - console::flush(); + console()->flush(); // Clear the color and depth buffers. gl::clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -234,7 +234,7 @@ void frame(float seconds) gl::loadidentity(); // FIXME width must always be one - const float frustumsize = 0.5f; + const float frustumsize = 0.25f; gl::frustum(-frustumsize*video::aspect, frustumsize*video::aspect, -frustumsize, frustumsize, 1.0f, 1024.0f); gl::matrixmode(GL_MODELVIEW); // map world to screen coordinates @@ -263,7 +263,7 @@ void frame(float seconds) // draw text elements Text::setfont("bitmaps/fonts/console", 12, 18); - console::draw(); + console()->draw(); chat::draw(); Text::setfont("bitmaps/fonts/gui", 16, 24); |