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

Adjust first person camera and underwater wield orientation

Browse Source
This commit is contained in:
timokoesters
2020-03-16 13:19:51 +01:00
parent d48dc8fa19
commit eda349189d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/states/utils.rs
View File

@ -84,7 +84,10 @@ fn swim_move(data: &JoinData, update: &mut StateUpdate) {
}; };
// Set direction based on move direction when on the ground // Set direction based on move direction when on the ground
let ori_dir = if update.character.is_attack() || update.character.is_block() { let ori_dir = if update.character.is_wield()
|| update.character.is_attack()
|| update.character.is_block()
{
Vec2::from(data.inputs.look_dir).normalized() Vec2::from(data.inputs.look_dir).normalized()
} else { } else {
Vec2::from(update.vel.0) Vec2::from(update.vel.0)

2
common/src/sys/combat.rs
View File

@ -14,7 +14,7 @@ use vek::*;
const BLOCK_EFFICIENCY: f32 = 0.9; const BLOCK_EFFICIENCY: f32 = 0.9;
const ATTACK_RANGE: f32 = 3.5; const ATTACK_RANGE: f32 = 3.5;
const ATTACK_ANGLE: f32 = 45.0; const ATTACK_ANGLE: f32 = 70.0;
const BLOCK_ANGLE: f32 = 180.0; const BLOCK_ANGLE: f32 = 180.0;
/// This system is responsible for handling accepted inputs like moving or /// This system is responsible for handling accepted inputs like moving or

2
voxygen/src/scene/camera.rs
View File

@ -6,7 +6,7 @@ use vek::*;
const NEAR_PLANE: f32 = 0.5; const NEAR_PLANE: f32 = 0.5;
const FAR_PLANE: f32 = 100000.0; const FAR_PLANE: f32 = 100000.0;
const FIRST_PERSON_INTERP_TIME: f32 = 0.05; const FIRST_PERSON_INTERP_TIME: f32 = 0.1;
const THIRD_PERSON_INTERP_TIME: f32 = 0.1; const THIRD_PERSON_INTERP_TIME: f32 = 0.1;
pub const MIN_ZOOM: f32 = 0.1; pub const MIN_ZOOM: f32 = 0.1;