From b7dc0938eb7d59f928bbcf2a3a4877a6f60940e5 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 8 Nov 2010 14:34:44 +0000 Subject: moved clear() from game::Game~ to core::GameServer~ (solves FIXME), unified bounding box code into math::BoundingBox3f class --- src/render/camera.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/render/camera.cc') diff --git a/src/render/camera.cc b/src/render/camera.cc index d13a532..37453b9 100644 --- a/src/render/camera.cc +++ b/src/render/camera.cc @@ -290,8 +290,8 @@ void Camera::frame(float seconds) } if (core::localcontrol()->model()) { - camera_target -= camera_axis.forward() * math::max(FRUSTUMFRONT / WORLDSCALE, core::localcontrol()->model()->maxbbox().x()); - camera_target += camera_axis.up() * math::max(FRUSTUMFRONT / WORLDSCALE, core::localcontrol()->model()->maxbbox().z() * 2.0f); + camera_target -= camera_axis.forward() * math::max(FRUSTUMFRONT / WORLDSCALE, core::localcontrol()->model()->box().max().x()); + camera_target += camera_axis.up() * math::max(FRUSTUMFRONT / WORLDSCALE, core::localcontrol()->model()->box().max().z() * 2.0f); } else { camera_target -= camera_axis.forward() * math::max(FRUSTUMFRONT / WORLDSCALE, FRUSTUMFRONT / WORLDSCALE + core::localcontrol()->radius()); camera_target += camera_axis.up() * math::max(FRUSTUMFRONT / WORLDSCALE, FRUSTUMFRONT / WORLDSCALE + core::localcontrol()->radius()); @@ -323,7 +323,7 @@ void Camera::frame(float seconds) camera_axis.assign(target_axis); if (core::localcontrol()->model()) { - camera_target += (core::localcontrol()->model()->maxbbox().x()) * + camera_target += (core::localcontrol()->model()->box().max().x()) * core::localcontrol()->axis().forward(); } else { camera_target += (core::localcontrol()->radius()) * -- cgit v1.2.3