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-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/render/camera.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/render/camera.h')
-rw-r--r--src/render/camera.h29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/render/camera.h b/src/render/camera.h
index 49cba74..80fdb36 100644
--- a/src/render/camera.h
+++ b/src/render/camera.h
@@ -1,7 +1,7 @@
-/*
+/*
render/camera.h
- This file is part of the Osirion project and is distributed under
- the terms and conditions of the GNU General Public License version 2
+ This file is part of the Osirion project and is distributed under
+ the terms and conditions of the GNU General Public License version 2
*/
#ifndef __INCLUDED_RENDER_CAMERA_H__
@@ -10,7 +10,8 @@
#include "math/mathlib.h"
#include "core/range.h"
-namespace render {
+namespace render
+{
const float WORLDSCALE = 4.0f;
const float FARPLANE = core::range::maxdistance;
@@ -32,16 +33,24 @@ public:
static void shutdown();
/// gameworld coordinates of the camera eye
- static inline const math::Vector3f & eye() { return camera_eye; }
+ static inline const math::Vector3f & eye() {
+ return camera_eye;
+ }
/// gameworld coordinates of the camera target
- static inline const math::Vector3f & target() { return camera_target; }
+ static inline const math::Vector3f & target() {
+ return camera_target;
+ }
/// gameworld camera axis
- static inline const math::Axis & axis() { return camera_axis; }
+ static inline const math::Axis & axis() {
+ return camera_axis;
+ }
/// current camera mode
- static inline Mode mode() { return camera_mode; }
+ static inline Mode mode() {
+ return camera_mode;
+ }
/// reset the current mode
static void reset();
@@ -63,7 +72,7 @@ public:
/** The ortographic projetion is used to draw the user interface
*/
static void ortho();
-
+
/// set target zoom
static void set_zoom(float zoom);
@@ -106,5 +115,5 @@ private:
};
} // namespace client
-
+
#endif // __INCLUDED_RENDER_CAMERA_H__