BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix Camera::add_arm_inertia -> addArmInertia

Browse Source
This commit is contained in:
Loic Blot 2017-06-26 20:10:11 +02:00
parent 1d1d922a7a
commit a8650e785d
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/camera.cpp
View File

@ -194,7 +194,7 @@ void Camera::step(f32 dtime)
} }
} }
void Camera::add_arm_inertia(f32 player_yaw, f32 frametime) void Camera::addArmInertia(f32 player_yaw, f32 frametime)
{ {
m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw) / m_timer.X) * 0.01f; m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw) / m_timer.X) * 0.01f;
m_cam_vel.Y = std::fabs((m_last_cam_pos.Y - m_camera_direction.Y) / m_timer.Y); m_cam_vel.Y = std::fabs((m_last_cam_pos.Y - m_camera_direction.Y) / m_timer.Y);
@ -458,7 +458,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
m_cameranode->setFOV(m_fov_y); m_cameranode->setFOV(m_fov_y);
if (m_arm_inertia) if (m_arm_inertia)
add_arm_inertia(player->getYaw(), frametime); addArmInertia(player->getYaw(), frametime);
// Position the wielded item // Position the wielded item
//v3f wield_position = v3f(45, -35, 65); //v3f wield_position = v3f(45, -35, 65);

2
src/camera.h
View File

@ -166,7 +166,7 @@ public:
void drawNametags(); void drawNametags();
inline void add_arm_inertia(f32 player_yaw, f32 frametime); inline void addArmInertia(f32 player_yaw, f32 frametime);
private: private:
// Nodes // Nodes