new trait demo

SlimeYummy · Apr 9, 2024 · 0d525fe · 0d525fe
1 parent c6ff670
commit 0d525fe
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/demo/src/blend.rs b/demo/src/blend.rs
@@ -8,11 +8,11 @@ use crate::base::*;
 
 pub struct OzzBlend {
     skeleton: Arc<Skeleton>,
-    sample_job1: SamplingJobMT,
-    sample_job2: SamplingJobMT,
-    sample_job3: SamplingJobMT,
-    blending_job: BlendingJobMT,
-    l2m_job: LocalToModelJobMT,
+    sample_job1: SamplingJobArc,
+    sample_job2: SamplingJobArc,
+    sample_job3: SamplingJobArc,
+    blending_job: BlendingJobArc,
+    l2m_job: LocalToModelJobArc,
     models: Arc<RwLock<Vec<Mat4>>>,
     bone_trans: Vec<OzzTransform>,
     spine_trans: Vec<OzzTransform>,

diff --git a/demo/src/playback.rs b/demo/src/playback.rs
@@ -8,8 +8,8 @@ use crate::base::*;
 
 pub struct OzzPlayback {
     skeleton: Arc<Skeleton>,
-    sample_job: SamplingJobMT,
-    l2m_job: LocalToModelJobMT,
+    sample_job: SamplingJobArc,
+    l2m_job: LocalToModelJobArc,
     models: Arc<RwLock<Vec<Mat4>>>,
     bone_trans: Vec<OzzTransform>,
     spine_trans: Vec<OzzTransform>,

diff --git a/demo/src/two_bone_ik.rs b/demo/src/two_bone_ik.rs
@@ -10,9 +10,9 @@ const TARGET_OFFSET: Vec3 = Vec3::new(0.0, 0.2, 0.1);
 
 pub struct OzzTwoBoneIK {
     skeleton: Arc<Skeleton>,
-    l2m_job1: LocalToModelJobMT,
+    l2m_job1: LocalToModelJobArc,
     ik_job: IKTwoBoneJob,
-    l2m_job2: LocalToModelJobMT,
+    l2m_job2: LocalToModelJobArc,
     locals: Arc<RwLock<Vec<SoaTransform>>>,
     models1: Arc<RwLock<Vec<Mat4>>>,
     models2: Arc<RwLock<Vec<Mat4>>>,
@@ -122,7 +122,7 @@ impl OzzExample for OzzTwoBoneIK {
         self.models2
             .mut_buf()
             .unwrap()
-            .clone_from_slice(self.models1.buf().unwrap().as_slice());
+            .clone_from_slice(self.models1.buf().unwrap().as_ref());
         {
             let mut locals_mut = self.locals.mut_buf().unwrap();
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -80,9 +80,9 @@ pub use sampling_job::{
     InterpSoaFloat3, InterpSoaQuaternion, SamplingContext, SamplingJob, SamplingJobArc, SamplingJobRc, SamplingJobRef,
 };
 pub use skeleton::Skeleton;
-pub use skinning_job::{SkinningJob, SkinningJobArc, SkinningJobRc, SkinningJobRef};
-pub use track::Track;
-pub use track_sampling_job::{TrackSamplingJob, TrackSamplingJobArc, TrackSamplingJobRc, TrackSamplingJobRef};
-pub use track_triggering_job::{
-    TrackTriggeringJob, TrackTriggeringJobArc, TrackTriggeringJobRc, TrackTriggeringJobRef,
-};
+// pub use skinning_job::{SkinningJob, SkinningJobArc, SkinningJobRc, SkinningJobRef};
+// pub use track::Track;
+// pub use track_sampling_job::{TrackSamplingJob, TrackSamplingJobArc, TrackSamplingJobRc, TrackSamplingJobRef};
+// pub use track_triggering_job::{
+//     TrackTriggeringJob, TrackTriggeringJobArc, TrackTriggeringJobRc, TrackTriggeringJobRef,
+// };
diff --git a/src/sampling_job.rs b/src/sampling_job.rs
@@ -136,6 +136,9 @@ pub struct SamplingContext {
     scale_cursor: usize,
 }
 
+unsafe impl Send for SamplingContext {}
+unsafe impl Sync for SamplingContext {}
+
 impl Debug for SamplingContext {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         return f