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

remove slowmo test mode

Browse Source
This commit is contained in:
jshipsey 2020-07-05 10:00:44 -04:00
parent 2c14b2f891
commit 50fcd6c6a3
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/src/path.rs
View File

@ -75,7 +75,9 @@ impl Route {
where
V: BaseVol<Vox = Block> + ReadVol,
{
let next0 = self.next(0).unwrap_or_else(|| pos.map(|e| e.floor() as i32));
let next0 = self
.next(0)
.unwrap_or_else(|| pos.map(|e| e.floor() as i32));
let next1 = self.next(1).unwrap_or(next0);
if vol.get(next0).map(|b| b.is_solid()).unwrap_or(false) {
None
@ -129,7 +131,10 @@ impl Route {
let tgt2d = cb.evaluate(0.5);
let tgt = Vec3::from(tgt2d) + Vec3::unit_z() * next_tgt.z;
let tgt_dir = (tgt - pos).xy().try_normalized().unwrap_or_else(Vec2::unit_y);
let tgt_dir = (tgt - pos)
.xy()
.try_normalized()
.unwrap_or_else(Vec2::unit_y);
let next_dir = cb
.evaluate_derivative(0.5)
.try_normalized()
@ -187,16 +192,16 @@ impl Chaser {
let bearing = if let Some(end) = self.route.as_ref().and_then(|r| r.path().end().copied()) {
let end_to_tgt = end.map(|e| e as f32).distance(tgt);
if end_to_tgt > pos_to_tgt * 0.3 + 5.0 || thread_rng().gen::<f32>() < 0.005 {
None
} else {
self.route
.as_mut()
.and_then(|r| r.traverse(vol, pos, vel, traversal_tolerance))
}
} else {
None
};
if end_to_tgt > pos_to_tgt * 0.3 + 5.0 || thread_rng().gen::<f32>() < 0.005 {
None
} else {
self.route
.as_mut()
.and_then(|r| r.traverse(vol, pos, vel, traversal_tolerance))
}
} else {
None
};
// TODO: What happens when we get stuck?
if let Some(bearing) = bearing {

1
voxygen/src/anim/src/quadruped_low/run.rs
View File

@ -10,6 +10,7 @@ impl Animation for RunAnimation {
#[cfg(feature = "use-dyn-lib")]
const UPDATE_FN: &'static [u8] = b"quadruped_low_run\0";
#[allow(clippy::useless_conversion)] // TODO: Pending review in #587
#[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_low_run")]
fn update_skeleton_inner(

3
voxygen/src/anim/src/quadruped_medium/run.rs
View File

@ -10,6 +10,7 @@ impl Animation for RunAnimation {
#[cfg(feature = "use-dyn-lib")]
const UPDATE_FN: &'static [u8] = b"quadruped_medium_run\0";
#[allow(clippy::useless_conversion)] // TODO: Pending review in #587
#[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_medium_run")]
fn update_skeleton_inner(
@ -22,7 +23,7 @@ impl Animation for RunAnimation {
let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude();
*rate = 1.0;
let lab = 0.1; //6
let lab = 0.6; //6
let speedmult = if speed > 8.0 {
1.2 * (1.0 * skeleton_attr.tempo)