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>2008-06-01 14:56:22 +0000
committerStijn Buys <ingar@osirion.org>2008-06-01 14:56:22 +0000
commit0f87d2fd05786f7ab128d4a041673f6fb085139f (patch)
tree37ca8cb6da4fcc2a5c6dc066f3ac033092923c19 /src/client/video.cc
parent190cede795ac4c7fcd6865a6c2083b5ce53a154a (diff)
moved camera into render::
Diffstat (limited to 'src/client/video.cc')
-rw-r--r--src/client/video.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/client/video.cc b/src/client/video.cc
index 2253c52..0dfe8ef 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -9,6 +9,7 @@
#include "client/video.h"
#include "client/view.h"
+#include "render/camera.h"
#include "render/render.h"
#include "render/tga.h"
#include "core/core.h"
@@ -32,8 +33,6 @@ int height_prev = 0;
const int width_default = 1024;
const int height_default = 768;
-float aspect = 1;
-
//--- cvars -------------------------------------------------------
core::Cvar *r_width;
@@ -43,7 +42,7 @@ core::Cvar *r_fullscreen;
void reset()
{
// recalculate the video aspect
- aspect = (float) width / (float) height;
+ render::Camera::set_aspect((float) width / (float) height);
// settup our viewport.
gl::viewport(0, 0, width, height );
@@ -106,7 +105,7 @@ bool init()
}
con_print << " video mode " << width << "x" << height << "x" << bpp << "bpp" << std::endl;
- aspect = (float) width / (float) height;
+ render::Camera::set_aspect((float) width / (float) height);
(*r_width) = width;
(*r_height) = height;