ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed 'relaxed' camera view, fixed (usually unused) camera debug mode,

Browse Source 
removed unused code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-03-11 22:06:41 +00:00
parent 3541e0a305
commit 5de3555ac2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/camera.cpp
View File

@ -216,10 +216,6 @@ void Camera::setInitialTransform()
void Camera::smoothMoveCamera(float dt, const Vec3 &wanted_position, void Camera::smoothMoveCamera(float dt, const Vec3 &wanted_position,
const Vec3 &wanted_target) const Vec3 &wanted_target)
{ {
//m_camera->setPosition(wanted_position.toIrrVector());
//m_camera->setTarget(wanted_target.toIrrVector());
//return;
// Smoothly interpolate towards the position and target // Smoothly interpolate towards the position and target
core::vector3df current_position = m_camera->getPosition(); core::vector3df current_position = m_camera->getPosition();
core::vector3df current_target = m_camera->getTarget(); core::vector3df current_target = m_camera->getTarget();
@ -236,7 +232,7 @@ void Camera::smoothMoveCamera(float dt, const Vec3 &wanted_position,
// high above the kart straight down. // high above the kart straight down.
#undef DEBUG_CAMERA #undef DEBUG_CAMERA
#ifdef DEBUG_CAMERA #ifdef DEBUG_CAMERA
core::vector3df xyz = RaceManager::getKart(0)->getXYZ().toIrrVector(); core::vector3df xyz = m_kart->getXYZ().toIrrVector();
m_camera->setTarget(xyz); m_camera->setTarget(xyz);
xyz.Y = xyz.Y+30; xyz.Y = xyz.Y+30;
m_camera->setPosition(xyz); m_camera->setPosition(xyz);
@ -264,7 +260,7 @@ void Camera::computeNormalCameraPosition(Vec3 *wanted_position,
// quadratically to dampen small variations (but keep sign) // quadratically to dampen small variations (but keep sign)
float dampened_steer = fabsf(steering) * steering; float dampened_steer = fabsf(steering) * steering;
float angle_around = m_kart->getHeading() float angle_around = m_kart->getHeading()
+ m_rotation_range * dampened_steer * 0.5f; - m_rotation_range * dampened_steer * 0.5f;
float angle_up = m_kart->getPitch() + 30.0f*DEGREE_TO_RAD; float angle_up = m_kart->getPitch() + 30.0f*DEGREE_TO_RAD;
wanted_position->setX(-sin(angle_around)); wanted_position->setX(-sin(angle_around));