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

Reorder impl member order to match trait member order

Browse Source
This commit is contained in:
tygyh 2022-07-15 15:54:32 +02:00
parent 997a572647
commit fefe745508
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/inventory/item/mod.rs
View File

@ -1234,11 +1234,11 @@ impl<'a, T: ItemDesc + ?Sized> ItemDesc for &'a T {
fn item_definition_id(&self) -> ItemDefinitionId<'_> { (*self).item_definition_id() }
fn components(&self) -> &[Item] { (*self).components() }
fn tags(&self) -> Vec<ItemTag> { (*self).tags() }
fn is_modular(&self) -> bool { (*self).is_modular() }
fn components(&self) -> &[Item] { (*self).components() }
}
/// Returns all item asset specifiers

22
voxygen/src/scene/figure/volume.rs
View File

@ -29,6 +29,17 @@ impl anim::Skeleton for VolumeKey {
#[cfg(feature = "hot-anim")]
const COMPUTE_FN: &'static [u8] = b"I AM NOT USED\0";
// Override compute_matrices so that hotloading is not done for this (since it
// will fail as this isn't part of the hotloaded anim crate)
fn compute_matrices(
&self,
base_mat: anim::vek::Mat4<f32>,
buf: &mut [anim::FigureBoneData; anim::MAX_BONE_COUNT],
body: Self::Body,
) -> anim::Offsets {
self.compute_matrices_inner(base_mat, buf, body)
}
fn compute_matrices_inner(
&self,
base_mat: anim::vek::Mat4<f32>,
@ -53,17 +64,6 @@ impl anim::Skeleton for VolumeKey {
secondary_trail_mat: None,
}
}
// Override compute_matrices so that hotloading is not done for this (since it
// will fail as this isn't part of the hotloaded anim crate)
fn compute_matrices(
&self,
base_mat: anim::vek::Mat4<f32>,
buf: &mut [anim::FigureBoneData; anim::MAX_BONE_COUNT],
body: Self::Body,
) -> anim::Offsets {
self.compute_matrices_inner(base_mat, buf, body)
}
}
impl BodySpec for VolumeKey {