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

Use a smooth dt on camera to determine its position

Browse Source
This commit is contained in:
Benau 2016-11-14 15:47:55 +08:00
parent 621e61c644
commit 2f2940115e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/camera_normal.cpp
View File

@ -42,6 +42,7 @@ CameraNormal::CameraNormal(Camera::CameraType type, int camera_index,
{ {
m_distance = kart ? kart->getKartProperties()->getCameraDistance() : 1000.0f; m_distance = kart ? kart->getKartProperties()->getCameraDistance() : 1000.0f;
m_ambient_light = World::getWorld()->getTrack()->getDefaultAmbientColor(); m_ambient_light = World::getWorld()->getTrack()->getDefaultAmbientColor();
m_smooth_dt = 0.0f;
// TODO: Put these values into a config file // TODO: Put these values into a config file
// Global or per split screen zone? // Global or per split screen zone?
@ -111,7 +112,8 @@ void CameraNormal::smoothMoveCamera(float dt)
f = current_speed >0 ? current_speed/3 + 1.0f f = current_speed >0 ? current_speed/3 + 1.0f
: -1.5f * current_speed + 2.0f; : -1.5f * current_speed + 2.0f;
} }
current_position += (wanted_position - current_position) * (dt *f); m_smooth_dt = 0.3f * dt + 0.7f * m_smooth_dt;
current_position += (wanted_position - current_position) * (m_smooth_dt*f);
// Avoid camera crash: if the speed is negative, the current_position // Avoid camera crash: if the speed is negative, the current_position
// can oscillate between plus and minus, getting bigger and bigger. If // can oscillate between plus and minus, getting bigger and bigger. If

2
src/graphics/camera_normal.hpp
View File

@ -49,6 +49,8 @@ private:
/** Factor of the effects of steering in camera aim. */ /** Factor of the effects of steering in camera aim. */
float m_rotation_range; float m_rotation_range;
/** Used to smoothly move the camera. */
float m_smooth_dt;
void smoothMoveCamera(float dt); void smoothMoveCamera(float dt);
void handleEndCamera(float dt); void handleEndCamera(float dt);
void getCameraSettings(float *above_kart, float *cam_angle, void getCameraSettings(float *above_kart, float *cam_angle,