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

Fix hotloading and Clippy.

Browse Source
This commit is contained in:
Joshua Yanovski 2020-08-08 00:53:02 +02:00
parent 3dc973e0be
commit 16aa9ef40a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/anim/src/lib.rs
View File

@ -107,7 +107,7 @@ pub fn compute_matrices<S: Skeleton>(
let compute_fn: libloading::Symbol< let compute_fn: libloading::Symbol<
fn(&S, Mat4<f32>, &mut [FigureBoneData; MAX_BONE_COUNT]) -> Vec3<f32>, fn(&S, Mat4<f32>, &mut [FigureBoneData; MAX_BONE_COUNT]) -> Vec3<f32>,
> = unsafe { lib.get(Self::COMPUTE_FN) }.unwrap_or_else(|e| { > = unsafe { lib.get(S::COMPUTE_FN) }.unwrap_or_else(|e| {
panic!( panic!(
"Trying to use: {} but had error: {:?}", "Trying to use: {} but had error: {:?}",
CStr::from_bytes_with_nul(S::COMPUTE_FN) CStr::from_bytes_with_nul(S::COMPUTE_FN)

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

@ -416,7 +416,6 @@ impl FigureMgr {
visible_psr_bounds: math::Aabr<f32>, visible_psr_bounds: math::Aabr<f32>,
camera: &Camera, camera: &Camera,
) -> anim::vek::Aabb<f32> { ) -> anim::vek::Aabb<f32> {
let visible_psr_bounds = math::Aabr::from(visible_psr_bounds);
let state = scene_data.state; let state = scene_data.state;
let time = state.get_time(); let time = state.get_time();
let tick = scene_data.tick; let tick = scene_data.tick;