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 the camera zoom as the bow is charging.

Browse Source
This commit is contained in:
Avi Weinstock 2021-05-22 15:50:29 -04:00
parent 7828112486
commit f516c041c5
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/states/charged_ranged.rs
View File

@ -61,6 +61,13 @@ pub struct Data {
pub exhausted: bool,
}
impl Data {
/// How complete the charge is, on a scale of 0.0 to 1.0
pub fn charge_frac(&self) -> f32 {
(self.timer.as_secs_f32() / self.static_data.charge_duration.as_secs_f32()).min(1.0)
}
}
impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
@ -91,9 +98,7 @@ impl CharacterBehavior for Data {
},
StageSection::Charge => {
if !input_is_pressed(data, self.static_data.ability_info.input) && !self.exhausted {
let charge_frac = (self.timer.as_secs_f32()
/ self.static_data.charge_duration.as_secs_f32())
.min(1.0);
let charge_frac = self.charge_frac();
let arrow = ProjectileConstructor::Arrow {
damage: self.static_data.initial_damage as f32
+ charge_frac * self.static_data.scaled_damage as f32,

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

@ -285,6 +285,22 @@ impl PlayState for SessionState {
camera.set_orientation(cam_dir);
}
let client = self.client.borrow();
let player_entity = client.entity();
let fov_scaling = {
if let Some(comp::CharacterState::ChargedRanged(cr)) = client
.state()
.read_storage::<comp::CharacterState>()
.get(player_entity)
{
1.0 - 3.0 * cr.charge_frac() / 4.0
} else {
1.0
}
};
camera.set_fov((global_state.settings.graphics.fov as f32 * fov_scaling).to_radians());
// Compute camera data
camera.compute_dependents(&*self.client.borrow().state().terrain());
let camera::Dependents {
@ -295,18 +311,17 @@ impl PlayState for SessionState {
let cam_pos = cam_pos + focus_off;
let (is_aiming, aim_dir_offset) = {
let client = self.client.borrow();
let is_aiming = client
.state()
.read_storage::<comp::CharacterState>()
.get(client.entity())
.get(player_entity)
.map(|cs| cs.is_aimed())
.unwrap_or(false);
(
is_aiming,
if is_aiming && self.scene.camera().get_mode() == CameraMode::ThirdPerson {
Vec3::unit_z() * 0.05
Vec3::unit_z() * 0.025
} else {
Vec3::zero()
},
@ -314,25 +329,21 @@ impl PlayState for SessionState {
};
self.is_aiming = is_aiming;
let player_entity = self.client.borrow().entity();
let can_build = self
.client
.borrow()
let can_build = client
.state()
.read_storage::<comp::CanBuild>()
.get(player_entity)
.map_or_else(|| false, |cb| cb.enabled);
let is_mining = self
.client
.borrow()
let is_mining = client
.inventories()
.get(player_entity)
.and_then(|inv| inv.equipped(EquipSlot::ActiveMainhand))
.and_then(|item| item.tool())
.map_or(false, |tool| tool.kind == ToolKind::Pick)
&& self.client.borrow().is_wielding() == Some(true);
&& client.is_wielding() == Some(true);
drop(client);
// Check to see whether we're aiming at anything
let (build_pos, select_pos, target_entity) =