Adjust aiming while in vehicle

src/game/camera_controller.cpp

@@ -38,9 +38,7 @@ void game::CameraController::Recalculate(collision::DynamicsWorld* world)
     glm::vec3 start_aim(0.0f);
 
     float distance_noaim = 5.0f;
-    float distance_aim = 1.0f;
+    auto aim_end_offset = right * 0.4f - forward_ * 1.8f;
-
-    auto aim_end_offset =  right * 0.4f - forward_ * 1.8f;
 
     if (character_transform_)
     {
@@ -53,11 +51,11 @@ void game::CameraController::Recalculate(collision::DynamicsWorld* world)
     {
         start_noaim = TranslationFromMatrix(*rideable_transform_) + glm::vec3(0.0f, 0.0f, 2.0f);
         distance_noaim = 8.0f;
-        distance_aim = 3.0f;
+        aim_end_offset = right * 0.3f - forward_ * 4.5f + glm::vec3(0.0f, 0.0f, 0.8f);
     }
 
     glm::vec3 end_noaim = start_noaim - forward_ * distance_noaim; 
-    glm::vec3 end_aim = start_aim + aim_end_offset * distance_aim;
+    glm::vec3 end_aim = start_aim + aim_end_offset;
 
     auto aim_factor_smooth = glm::smoothstep(0.0f, 1.0f, aim_factor_);
     auto start = glm::mix(start_noaim, start_aim, aim_factor_smooth);

src/game/character.cpp

@@ -317,7 +317,7 @@ void game::Character::UpdateAiming()
 
     if (!aiming_)
     {
-        delta = 3.0f / 25.0f;
+        delta = 6.0f / 25.0f;
         MoveToward(animstate_.yaw, 0.0f, delta);
         MoveToward(animstate_.pitch, 0.0f, delta);
         UpdateAimDirection();