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

Fixes animation hot reloading (credit to Imbris)

Browse Source
This commit is contained in:
Snowram 2021-12-18 20:36:14 +01:00
parent 1986d80a3c
commit 66a5f9fded
2 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,38 @@ pub trait Skeleton: Send + Sync + 'static {
#[cfg(feature = "use-dyn-lib")]
const COMPUTE_FN: &'static [u8];
fn compute_matrices(
&self,
base_mat: Mat4<f32>,
buf: &mut [FigureBoneData; MAX_BONE_COUNT],
body: Self::Body,
) -> Offsets {
#[cfg(not(feature = "use-dyn-lib"))]
{
self.compute_matrices_inner(base_mat, buf, body)
}
#[cfg(feature = "use-dyn-lib")]
{
let lock = LIB.lock().unwrap();
let lib = &lock.as_ref().unwrap().lib;
let compute_fn: voxygen_dynlib::Symbol<
fn(&Self, Mat4<f32>, &mut [FigureBoneData; MAX_BONE_COUNT], Self::Body) -> Offsets,
> = unsafe { lib.get(Self::COMPUTE_FN) }.unwrap_or_else(|e| {
panic!(
"Trying to use: {} but had error: {:?}",
CStr::from_bytes_with_nul(Self::COMPUTE_FN)
.map(CStr::to_str)
.unwrap()
.unwrap(),
e
)
});
compute_fn(self, base_mat, buf, body)
}
}
fn compute_matrices_inner(
&self,
base_mat: Mat4<f32>,
@ -126,30 +158,7 @@ pub fn compute_matrices<S: Skeleton>(
buf: &mut [FigureBoneData; MAX_BONE_COUNT],
body: S::Body,
) -> Offsets {
#[cfg(not(feature = "use-dyn-lib"))]
{
S::compute_matrices_inner(skeleton, base_mat, buf, body)
}
#[cfg(feature = "use-dyn-lib")]
{
let lock = LIB.lock().unwrap();
let lib = &lock.as_ref().unwrap().lib;
let compute_fn: voxygen_dynlib::Symbol<
fn(&S, Mat4<f32>, &mut [FigureBoneData; MAX_BONE_COUNT], S::Body) -> Offsets,
> = unsafe { lib.get(S::COMPUTE_FN) }.unwrap_or_else(|e| {
panic!(
"Trying to use: {} but had error: {:?}",
CStr::from_bytes_with_nul(S::COMPUTE_FN)
.map(CStr::to_str)
.unwrap()
.unwrap(),
e
)
});
compute_fn(skeleton, base_mat, buf, body)
}
S::compute_matrices(skeleton, base_mat, buf, body)
}
pub trait Animation {

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

@ -26,9 +26,8 @@ impl anim::Skeleton for VolumeKey {
type Body = Self;
const BONE_COUNT: usize = 4;
//#[cfg(feature = "use-dyn-lib")]
// TODO
#[cfg(feature = "hot-anim")]
const COMPUTE_FN: &'static [u8] = b"I AM NOT USED\0";
fn compute_matrices_inner(
&self,
@ -52,6 +51,17 @@ impl anim::Skeleton for VolumeKey {
mount_bone: anim::vek::Transform::default(),
}
}
// 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 {