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

This file was missing in r11589 - it is the actual camera change, so far

Browse Source 
there was no difference.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-09-19 00:59:08 +00:00
parent cdc16df963
commit 260a06df0a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/graphics/camera.cpp
View File

@ -67,6 +67,7 @@ Camera::Camera(int camera_index, AbstractKart* kart)
m_position_speed = 8.0f;
m_target_speed = 10.0f;
m_rotation_range = 0.4f;
m_rotation_range = 0.0f;
// TODO: Make this per user too if the one above goes that way.
switch(UserConfigParams::m_camera_style)
{
@ -487,8 +488,17 @@ void Camera::positionCamera(float dt, float above_kart, float cam_angle,
Vec3 relative_position(side_way,
fabsf(distance)*tan_up+above_kart,
distance);
const btTransform &trans=m_kart->getTrans();
wanted_position = trans(relative_position);
btTransform t=m_kart->getTrans();
if(stk_config->m_camera_follow_skid &&
m_kart->getSkidding()->getVisualSkidRotation()!=0)
{
// If the camera should follow the graphical skid, add the
// visual rotation to the relative vector:
btQuaternion q(m_kart->getSkidding()->getVisualSkidRotation(), 0, 0);
t.setBasis(t.getBasis() * btMatrix3x3(q));
}
wanted_position = t(relative_position);
if (smoothing)
{
smoothMoveCamera(dt, wanted_position, wanted_target);