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

Make the camera look at/above the kart, not the ground; and make the rotation

Browse Source 
range depend in a variable (like position and target speeds, so it can
be adjusted later). Also some white space cleanups.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3468 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
mbjornstk 2009-05-08 16:07:01 +00:00
parent d72aaa70f5
commit d964805365
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/stk_config.data
View File

@ -158,7 +158,7 @@
(rubber-band-duration 1) ;; Duration a rubber band acts.
(camera-max-accel 10)
(camera-max-brake 10)
(camera-distance 3.5)
(camera-distance 3.0)
) ;; end kart-defaults
)
;; EOF ;;

24
src/graphics/camera.cpp
View File

@ -41,8 +41,10 @@ Camera::Camera(int camera_index, const Kart* kart)
m_angle_around = 0.0f;
// TODO: Put these values into a config file
// Global or per split screen zone?
m_position_speed = 8.0f;
m_target_speed = 10.0;
m_target_speed = 10.0f;
m_rotation_range = 1.0f;
// TODO: Set fog distance and clipping planes
setScreenPosition(camera_index);
@ -127,7 +129,7 @@ void Camera::reset()
//-----------------------------------------------------------------------------
/** Saves the current kart position as initial starting position for the
* camera.
* camera.
*/
void Camera::setInitialTransform()
{
@ -147,10 +149,11 @@ void Camera::update(float dt)
case CM_NORMAL:
// This first line moves the camera around behind the kart, pointing it
// towards where the kart is turning (but only at lower speeds).
m_angle_around = m_kart->getHPR().getX() + (m_kart->getSteerPercent() / (m_kart->getSpeed() * 0.1f + 1));
m_angle_up = m_kart->getHPR().getY() - DEGREE_TO_RAD(30.0f);
m_angle_around = m_kart->getHPR().getX() + m_rotation_range * (m_kart->getSteerPercent() / (m_kart->getSpeed() * 0.1f + 1));
m_angle_up = m_kart->getHPR().getY() - DEGREE_TO_RAD(30.0f);
m_target = m_kart->getXYZ();
m_target.setZ(m_target.getZ()+0.75f);
m_position.setX( sin(m_angle_around));
m_position.setY(-cos(m_angle_around));
@ -160,30 +163,31 @@ void Camera::update(float dt)
break;
case CM_CLOSEUP: // Lower to the ground and closer to the kart
m_angle_around = m_kart->getHPR().getX() + (m_kart->getSteerPercent() / (m_kart->getSpeed() * 0.1f + 1));
m_angle_around = m_kart->getHPR().getX() + m_rotation_range * (m_kart->getSteerPercent() / (m_kart->getSpeed() * 0.1f + 1));
m_angle_up = m_kart->getHPR().getY() - DEGREE_TO_RAD(20.0f);
m_target = m_kart->getXYZ();
m_target.setZ(m_target.getZ()+0.75f);
m_position.setX( sin(m_angle_around));
m_position.setY(-cos(m_angle_around));
m_position.setZ(-sin(m_angle_up));
m_position *= m_distance * 0.75f;
m_position += m_target;
m_position += m_target;
break;
case CM_LEADER_MODE: // Follows the leader kart, higher off of the ground, further from the kart,
// and turns in the opposite direction from the kart for a nice effect. :)
// and turns in the opposite direction from the kart for a nice effect. :)
m_angle_around = RaceManager::getKart(0)->getHPR().getX();
m_angle_up = RaceManager::getKart(0)->getHPR().getY() + DEGREE_TO_RAD(40.0f);
m_target = RaceManager::getKart(0)->getXYZ();
m_position.setX(sin(m_angle_around));
m_position.setY(cos(m_angle_around));
m_position.setZ(sin(m_angle_up));
m_position *= m_distance * 2.0f;
m_position += m_target;
m_position += m_target;
break;
case CM_FINAL:

1
src/graphics/camera.hpp
View File

@ -60,6 +60,7 @@ protected:
float m_angle_around; // Angle around the kart (should actually match the rotation of the kart)
float m_position_speed; // The speed at which the camera changes position
float m_target_speed; // The speed at which the camera changes targets
float m_rotation_range; // Factor of the effects of steering in camera aim
float m_x, m_y, m_w, m_h;