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

review fixes

Browse Source
This commit is contained in:
flo666 2023-05-09 00:57:58 +02:00 committed by Sam
parent 0ba58d8785
commit aca38d0cf4
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/events/inventory_manip.rs
View File

@ -322,7 +322,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
// TODO: Abstract this code into a generalised way to do block updates? // TODO: Abstract this code into a generalised way to do block updates?
if matches!( if matches!(
block.get_sprite(), block.get_sprite(),
Some(SpriteKind::Keyhole) | Some(SpriteKind::BoneKeyhole) Some(SpriteKind::Keyhole | SpriteKind::BoneKeyhole)
) { ) {
let dirs = [ let dirs = [
Vec3::unit_x(), Vec3::unit_x(),

2
voxygen/anim/src/biped_small/alpha.rs
View File

@ -113,7 +113,7 @@ impl Animation for AlphaAnimation {
next.tail.orientation = Quaternion::rotation_x(0.05 * fastalt * speednormcancel) next.tail.orientation = Quaternion::rotation_x(0.05 * fastalt * speednormcancel)
* Quaternion::rotation_z(fast * 0.15 * speednormcancel); * Quaternion::rotation_z(fast * 0.15 * speednormcancel);
}, },
Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Pick) => { Some(ToolKind::Axe | ToolKind::Hammer | ToolKind::Pick) => {
next.head.orientation = Quaternion::rotation_z(move1abs * 0.3 + move2abs * -0.6); next.head.orientation = Quaternion::rotation_z(move1abs * 0.3 + move2abs * -0.6);
next.control_l.position = Vec3::new(2.0 - s_a.grip.0 * 2.0, 1.0, 3.0); next.control_l.position = Vec3::new(2.0 - s_a.grip.0 * 2.0, 1.0, 3.0);
next.control_r.position = Vec3::new( next.control_r.position = Vec3::new(

2
voxygen/anim/src/biped_small/wield.rs
View File

@ -167,7 +167,7 @@ impl Animation for WieldAnimation {
* Quaternion::rotation_y(-0.2 * speednorm) * Quaternion::rotation_y(-0.2 * speednorm)
* Quaternion::rotation_z(0.5); * Quaternion::rotation_z(0.5);
}, },
Some(ToolKind::Axe) | Some(ToolKind::Hammer | ToolKind::Pick) => { Some(ToolKind::Axe | ToolKind::Hammer | ToolKind::Pick) => {
next.control_l.position = Vec3::new(2.0 - s_a.grip.0 * 2.0, 1.0, 3.0); next.control_l.position = Vec3::new(2.0 - s_a.grip.0 * 2.0, 1.0, 3.0);
next.control_r.position = next.control_r.position =
Vec3::new(9.0 + s_a.grip.0 * 2.0, -1.0, -2.0 + speednorm * -3.0); Vec3::new(9.0 + s_a.grip.0 * 2.0, -1.0, -2.0 + speednorm * -3.0);

6
world/src/site2/mod.rs
View File

@ -1423,8 +1423,10 @@ impl Site {
} }
let mut last_block = None; let mut last_block = None;
// TODO: Don't unwrap here let col = canvas
let col = canvas.col(wpos).unwrap().get_info(); .col(wpos)
.map(|col| col.get_info())
.unwrap_or_default();
for z in aabb.min.z..aabb.max.z { for z in aabb.min.z..aabb.max.z {
let pos = Vec3::new(x, y, z); let pos = Vec3::new(x, y, z);