Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make camera offsets and aiming system only apply when wielding ranged

Browse Source
This commit is contained in:
Woeful_Wolf 2024-02-01 23:33:05 +02:00
parent 1c69614b4e
commit 63394719a1
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
voxygen/src/scene/mod.rs
View File

@ -33,7 +33,10 @@ use crate::{
use client::Client;
use common::{
calendar::Calendar,
comp::{self, ship::figuredata::VOXEL_COLLIDER_MANIFEST},
comp::{
self, item::ItemDesc, ship::figuredata::VOXEL_COLLIDER_MANIFEST, slot::EquipSlot,
tool::ToolKind,
},
outcome::Outcome,
resources::{DeltaTime, TimeScale},
terrain::{BlockKind, TerrainChunk, TerrainGrid},
@ -622,6 +625,19 @@ impl Scene {
.get(scene_data.viewpoint_entity)
.map(|p| p.on_ground.is_some());
let player_entity = client.entity();
let holding_ranged = client
.inventories()
.get(player_entity)
.and_then(|inv| inv.equipped(EquipSlot::ActiveMainhand))
.and_then(|item| item.tool_info())
.is_some_and(|tool_kind| {
matches!(
tool_kind,
ToolKind::Bow | ToolKind::Staff | ToolKind::Sceptre
)
});
let up = match self.camera.get_mode() {
CameraMode::FirstPerson => {
if viewpoint_rolling {
@ -633,16 +649,17 @@ impl Scene {
viewpoint_eye_height
}
},
CameraMode::ThirdPerson if scene_data.is_aiming => {
CameraMode::ThirdPerson if scene_data.is_aiming && holding_ranged => {
viewpoint_height * 1.16 + settings.gameplay.aim_offset_y
},
CameraMode::ThirdPerson if scene_data.is_aiming => viewpoint_height * 1.16,
CameraMode::ThirdPerson => viewpoint_eye_height,
CameraMode::Freefly => 0.0,
};
let right = match self.camera.get_mode() {
CameraMode::FirstPerson => 0.0,
CameraMode::ThirdPerson if scene_data.is_aiming => {
CameraMode::ThirdPerson if scene_data.is_aiming && holding_ranged => {
settings.gameplay.aim_offset_x
},
CameraMode::ThirdPerson => 0.0,

19
voxygen/src/session/mod.rs
View File

@ -1351,11 +1351,24 @@ impl PlayState for SessionState {
self.walk_forward_dir = self.scene.camera().forward_xy();
self.walk_right_dir = self.scene.camera().right_xy();
let dir = if is_aiming {
let client = self.client.borrow();
let client = self.client.borrow();
let holding_ranged = client
.inventories()
.get(player_entity)
.and_then(|inv| inv.equipped(EquipSlot::ActiveMainhand))
.and_then(|item| item.tool_info())
.is_some_and(|tool_kind| {
matches!(
tool_kind,
ToolKind::Bow | ToolKind::Staff | ToolKind::Sceptre
)
});
let dir = if is_aiming && holding_ranged {
// Shoot ray from camera forward direction and get the point it hits an
// entity or terrain
let ray_start = cam_pos + cam_dir * 2.0;
let ray_start = cam_pos + cam_dir * self.scene.camera().get_distance();
let entity_ray_end = ray_start + cam_dir * 500.0;
let terrain_ray_end = ray_start + cam_dir * 1000.0;