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-03-08 11:00:30 +0000
committerStijn Buys <ingar@osirion.org>2009-03-08 11:00:30 +0000
commite4618a1c7e5fb0629997d389cb941a61095490ac (patch)
treeadbebcbd3ae487bc7642d374dfc3d9a343b111d5 /src/render/camera.cc
parent4c53365c16362156529c7669079e31845384589f (diff)
changed camera settings for crash-view, map tweaks
Diffstat (limited to 'src/render/camera.cc')
-rw-r--r--src/render/camera.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/render/camera.cc b/src/render/camera.cc
index 91a7095..ba056d0 100644
--- a/src/render/camera.cc
+++ b/src/render/camera.cc
@@ -230,10 +230,17 @@ void Camera::frame(float seconds)
if (core::localplayer()->view()) {
// player view entity
- distance = math::max(core::localplayer()->view()->radius(), 1.0f) * 3.0f;
+
camera_axis.assign(core::localplayer()->view()->axis());
- camera_axis.change_direction(180.0f);
- camera_target.assign(core::localplayer()->view()->location() - core::localplayer()->view()->axis().left()* (math::max(core::localplayer()->view()->radius(), 1.0f)*0.5f) );
+ if (core::localplayer()->view() == core::localcontrol()) {
+ camera_axis.change_pitch(pitch_free);
+ camera_target.assign(core::localplayer()->view()->location());
+ distance = math::max(core::localplayer()->view()->radius(), 1.0f) * 2.0f;
+ } else {
+ distance = math::max(core::localplayer()->view()->radius(), 1.0f) * 3.0f;
+ camera_axis.change_direction(180.0f);
+ camera_target.assign(core::localplayer()->view()->location() - core::localplayer()->view()->axis().left()* (math::max(core::localplayer()->view()->radius(), 1.0f)*0.5f) );
+ }
/*
} else if (core::localplayer()->zone()->default_view()) {