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

camera movement changes

Browse Source
This commit is contained in:
IsseW 2022-08-12 12:12:21 +02:00
parent f77cce68d5
commit 911be0113d
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,6 @@ pub struct SessionState {
selected_block: Block, selected_block: Block,
walk_forward_dir: Vec2<f32>, walk_forward_dir: Vec2<f32>,
walk_right_dir: Vec2<f32>, walk_right_dir: Vec2<f32>,
freefly_vel: Vec3<f32>,
free_look: bool, free_look: bool,
auto_walk: bool, auto_walk: bool,
camera_clamp: bool, camera_clamp: bool,
@ -143,7 +142,6 @@ impl SessionState {
selected_block: Block::new(BlockKind::Misc, Rgb::broadcast(255)), selected_block: Block::new(BlockKind::Misc, Rgb::broadcast(255)),
walk_forward_dir, walk_forward_dir,
walk_right_dir, walk_right_dir,
freefly_vel: Vec3::zero(),
free_look: false, free_look: false,
auto_walk: false, auto_walk: false,
camera_clamp: false, camera_clamp: false,
@ -1112,37 +1110,23 @@ impl PlayState for SessionState {
self.inputs.move_dir = self.inputs.move_dir =
self.walk_right_dir * axis_right + self.walk_forward_dir * axis_up; self.walk_right_dir * axis_right + self.walk_forward_dir * axis_up;
} }
self.freefly_vel = Vec3::zero();
}, },
CameraMode::Freefly => { CameraMode::Freefly => {
// Move the camera freely in 3d space. Apply acceleration so that // Move the camera freely in 3d space. Apply acceleration so that
// the movement feels more natural and controlled. // the movement feels more natural and controlled.
const FREEFLY_ACCEL: f32 = 120.0; const FREEFLY_SPEED: f32 = 50.0;
const FREEFLY_DAMPING: f32 = 80.0;
const FREEFLY_MAX_SPEED: f32 = 50.0;
const FREEFLY_SPEED_BOOST: f32 = 5.0; const FREEFLY_SPEED_BOOST: f32 = 5.0;
let forward = self.scene.camera().forward(); let forward = self.scene.camera().forward().with_z(0.0).normalized();
let right = self.scene.camera().right(); let right = self.scene.camera().right().with_z(0.0).normalized();
let dir = right * axis_right + forward * axis_up; let up = Vec3::unit_z();
let up_axis = self.key_state.swim_up as i32 as f32
- self.key_state.swim_down as i32 as f32;
if self.freefly_vel.magnitude_squared() > 0.01 { let dir = (right * axis_right + forward * axis_up + up * up_axis).normalized();
let new_vel = self.freefly_vel
- self.freefly_vel.normalized() * (FREEFLY_DAMPING * dt);
if self.freefly_vel.dot(new_vel) > 0.0 {
self.freefly_vel = new_vel;
} else {
self.freefly_vel = Vec3::zero();
}
}
if dir.magnitude_squared() > 0.01 {
self.freefly_vel += dir * (FREEFLY_ACCEL * dt);
if self.freefly_vel.magnitude() > FREEFLY_MAX_SPEED {
self.freefly_vel = self.freefly_vel.normalized() * FREEFLY_MAX_SPEED;
}
}
let boost = if self.inputs_state.contains(&GameInput::SpectateSpeedBoost) { let speed = FREEFLY_SPEED
* if self.inputs_state.contains(&GameInput::SpectateSpeedBoost) {
FREEFLY_SPEED_BOOST FREEFLY_SPEED_BOOST
} else { } else {
1.0 1.0
@ -1151,7 +1135,7 @@ impl PlayState for SessionState {
let pos = self.scene.camera().get_focus_pos(); let pos = self.scene.camera().get_focus_pos();
self.scene self.scene
.camera_mut() .camera_mut()
.set_focus_pos(pos + self.freefly_vel * dt * boost); .set_focus_pos(pos + dir * dt * speed);
// Do not apply any movement to the player character // Do not apply any movement to the player character
self.inputs.move_dir = Vec2::zero(); self.inputs.move_dir = Vec2::zero();