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

Merge branch 'zesterer/small-fixes' into 'master'

Browse Source 
A plethora of improvements

See merge request veloren/veloren!2486
This commit is contained in:
Joshua Barretto 2021-06-21 14:19:13 +00:00
commit f85a59d33a
7 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/comp/character_state.rs
View File

@ -19,6 +19,7 @@ pub struct StateUpdate {
pub density: Density,
pub energy: Energy,
pub swap_equipped_weapons: bool,
pub should_strafe: bool,
pub queued_inputs: BTreeMap<InputKind, InputAttr>,
pub removed_inputs: Vec<InputKind>,
pub local_events: VecDeque<LocalEvent>,
@ -34,6 +35,7 @@ impl From<&JoinData<'_>> for StateUpdate {
density: *data.density,
energy: *data.energy,
swap_equipped_weapons: false,
should_strafe: data.inputs.strafing,
character: data.character.clone(),
queued_inputs: BTreeMap::new(),
removed_inputs: Vec::new(),

4
common/src/comp/controller.rs
View File

@ -199,6 +199,10 @@ pub struct ControllerInputs {
* limits) */
pub look_dir: Dir,
pub select_pos: Option<Vec3<f32>>,
/// Attempt to enable strafing.
/// Currently, setting this to false will *not* disable strafing during a
/// wielding character state.
pub strafing: bool,
}
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]

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

@ -307,7 +307,10 @@ pub fn handle_forced_movement(data: &JoinData, update: &mut StateUpdate, movemen
}
pub fn handle_orientation(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
let strafe_aim = update.character.is_aimed() && data.body.can_strafe();
// TODO: Don't always check `character.is_aimed()`, allow the frontend to
// control whether the player strafes during an aimed `CharacterState`.
let strafe_aim =
(update.character.is_aimed() || update.should_strafe) && data.body.can_strafe();
if let Some(dir) = (strafe_aim || update.character.is_attack())
.then(|| data.inputs.look_dir.to_horizontal().unwrap_or_default())
.or_else(|| Dir::from_unnormalized(data.inputs.move_dir.into()))

19
voxygen/anim/src/character/stand.rs
View File

@ -13,6 +13,8 @@ impl Animation for StandAnimation {
Option<ToolKind>,
Option<ToolKind>,
(Option<Hands>, Option<Hands>),
Vec3<f32>,
Vec3<f32>,
f32,
Vec3<f32>,
);
@ -24,7 +26,7 @@ impl Animation for StandAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_stand")]
fn update_skeleton_inner<'a>(
skeleton: &Self::Skeleton,
(active_tool_kind, second_tool_kind, hands, global_time, avg_vel): Self::Dependency<'a>,
(active_tool_kind, second_tool_kind, hands, orientation, last_ori, global_time, avg_vel): Self::Dependency<'a>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,
@ -33,6 +35,19 @@ impl Animation for StandAnimation {
let slow = (anim_time * 1.0).sin();
let impact = (avg_vel.z).max(-15.0);
let ori: Vec2<f32> = Vec2::from(orientation);
let last_ori = Vec2::from(last_ori);
let tilt = if ::vek::Vec2::new(ori, last_ori)
.map(|o| o.magnitude_squared())
.map(|m| m > 0.001 && m.is_finite())
.reduce_and()
&& ori.angle_between(last_ori).is_finite()
{
ori.angle_between(last_ori).min(0.2)
* last_ori.determine_side(Vec2::zero(), ori).signum()
} else {
0.0
} * 1.3;
let head_look = Vec2::new(
((global_time + anim_time) / 10.0).floor().mul(7331.0).sin() * 0.15,
((global_time + anim_time) / 10.0).floor().mul(1337.0).sin() * 0.07,
@ -159,7 +174,7 @@ impl Animation for StandAnimation {
next.lantern.position = Vec3::new(-0.5, -0.5, -2.5);
next.lantern.orientation = next.hand_r.orientation.inverse()
* Quaternion::rotation_x(fast * 0.1)
* Quaternion::rotation_y(fast2 * 0.1);
* Quaternion::rotation_y(fast2 * 0.1 + tilt * 3.0);
}
next.torso.position = Vec3::new(0.0, 0.0, 0.0) * s_a.scaler;

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

@ -6,7 +6,7 @@ use treeculler::Frustum;
use vek::*;
pub const NEAR_PLANE: f32 = 0.0625;
pub const FAR_PLANE: f32 = 524288.06; // excessive precision: 524288.0625
pub const FAR_PLANE: f32 = 524288.06; // excessive precision: 524288.0625
const FIRST_PERSON_INTERP_TIME: f32 = 0.1;
const THIRD_PERSON_INTERP_TIME: f32 = 0.1;
@ -415,8 +415,8 @@ impl Camera {
self.tgt_ori.x = (self.tgt_ori.x + delta.x).rem_euclid(2.0 * PI);
// Clamp camera pitch to the vertical limits
self.tgt_ori.y = (self.tgt_ori.y + delta.y)
.min(PI / 2.0 - 0.0001)
.max(-PI / 2.0 + 0.0001);
.min(PI / 2.0 - 0.001)
.max(-PI / 2.0 + 0.001);
// Wrap camera roll
self.tgt_ori.z = (self.tgt_ori.z + delta.z).rem_euclid(2.0 * PI);
}

11
voxygen/src/scene/figure/mod.rs
View File

@ -807,7 +807,16 @@ impl FigureMgr {
// Standing
(true, false, false) => anim::character::StandAnimation::update_skeleton(
&CharacterSkeleton::new(holding_lantern),
(active_tool_kind, second_tool_kind, hands, time, rel_avg_vel),
(
active_tool_kind,
second_tool_kind,
hands,
// TODO: Update to use the quaternion.
ori * anim::vek::Vec3::<f32>::unit_y(),
state.last_ori * anim::vek::Vec3::<f32>::unit_y(),
time,
rel_avg_vel,
),
state.state_time,
&mut state_animation_rate,
skeleton_attr,

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

@ -846,6 +846,10 @@ impl PlayState for SessionState {
Dir::from_unnormalized(cam_dir + aim_dir_offset).unwrap();
}
}
self.inputs.strafing = matches!(
self.scene.camera().get_mode(),
camera::CameraMode::FirstPerson
);
// Get the current state of movement related inputs
let input_vec = self.key_state.dir_vec();