From 529ba8002d686cdf004405e033fe7e95ea6cbacd Mon Sep 17 00:00:00 2001 From: kilbith Date: Fri, 31 Mar 2017 21:57:08 +0200 Subject: [PATCH] Wieldmesh: Natural orientation depending on pitch (#5490) --- src/camera.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/camera.cpp b/src/camera.cpp index a7679e43a..d5c337fe8 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -404,9 +404,12 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, m_cameranode->setAspectRatio(m_aspect); m_cameranode->setFOV(m_fov_y); + float wieldmesh_offset_Y = -35 + player->getPitch() * 0.05; + wieldmesh_offset_Y = rangelim(wieldmesh_offset_Y, -52, -32); + // Position the wielded item //v3f wield_position = v3f(45, -35, 65); - v3f wield_position = v3f(55, -35, 65); + v3f wield_position = v3f(55, wieldmesh_offset_Y, 65); //v3f wield_rotation = v3f(-100, 120, -100); v3f wield_rotation = v3f(-100, 120, -100); wield_position.Y += fabs(m_wield_change_timer)*320 - 40;