diff options
Diffstat (limited to 'src/client/view.cc')
| -rw-r--r-- | src/client/view.cc | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index 24eb8e3..6d3f456 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -12,7 +12,6 @@ #include <iomanip> #include "client/client.h" -#include "client/camera.h" #include "client/chat.h" #include "client/console.h" #include "client/input.h" @@ -21,6 +20,7 @@ #include "render/draw.h" #include "render/render.h" #include "render/textures.h" +#include "render/camera.h" #include "core/core.h" #include "core/stats.h" #include "math/mathlib.h" @@ -41,8 +41,6 @@ float fps = 0; void init() { - camera::init(); - draw_stats = core::Cvar::get("draw_stats", "0", core::Cvar::Archive); draw_stats->set_info("[bool] draw network and render statistics"); @@ -58,7 +56,6 @@ void init() void shutdown() { - camera::shutdown(); } void reset() @@ -244,22 +241,7 @@ void frame(float seconds) gl::clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); if (core::application()->connected() && core::game()->serverframetime()) { - - // Change to the projection matrix and set our viewing volume. - gl::matrixmode(GL_PROJECTION); - gl::loadidentity(); - - // FIXME width must always be one - const float frustumsize = .5f; - gl::frustum(-frustumsize*video::aspect, frustumsize*video::aspect, -frustumsize, frustumsize, 1.0f, 1024.0f); - - gl::matrixmode(GL_MODELVIEW); - gl::loadidentity(); - - camera::draw(seconds); // draw the current camera transformation - - render::draw(camera::axis, camera::eye, camera::target, seconds); // draw the world - + render::draw(seconds); // draw the world } // switch to ortographic projection to draw the GUI |