Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ resolver = "2"

[features]
default = ["rkyv", "serde"]
glam-ext = ["dep:glam-ext"]
serde = ["dep:serde", "glam/serde", "bimap/serde" ]
rkyv = ["dep:rkyv", "dep:bytecheck", "glam/rkyv", "glam/bytecheck"]
wasm = []
Expand All @@ -25,7 +24,7 @@ nodejs = ["wasm", "dep:js-sys", "dep:wasm-bindgen"]
bimap = { version = "0.6" }
bytecheck = { version = "0.6", optional = true, default-features = false }
glam = { version = "0.29", features = [ "core-simd", "libm" ] }
glam-ext = { version = "0.2", optional = true, features = [ "core-simd", "libm" ] }
glam-ext = { version = "0.2", features = [ "core-simd", "libm" ] }
js-sys = { version = "0.3", optional = true }
rkyv = { version = "0.7", optional = true, features = [ "validation" ] }
serde = { version= "1.0", optional = true, features = [ "serde_derive" ] }
Expand Down
4 changes: 2 additions & 2 deletions src/blending_job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ where

/// Gets mutable layers of `BlendingJob`.
///
/// Job input layers, can be empty or nullptr. The range of layers that must be blended.
/// Job input layers, can be empty. The range of layers that must be blended.
#[inline]
pub fn layers_mut(&mut self) -> &mut Vec<BlendingLayer<I>> {
&mut self.layers
Expand All @@ -242,7 +242,7 @@ where

/// Gets mutable additive layers of `BlendingJob`.
///
/// Job input additive layers, can be empty or nullptr. The range of layers that must be added to the output.
/// Job input additive layers, can be empty. The range of layers that must be added to the output.
#[inline]
pub fn additive_layers_mut(&mut self) -> &mut Vec<BlendingLayer<I>> {
&mut self.additive_layers
Expand Down
2 changes: 0 additions & 2 deletions src/math.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#![allow(dead_code)]

use glam::{Mat4, Quat, Vec3, Vec3A, Vec4};
#[cfg(feature = "glam-ext")]
use glam_ext::Transform3A;
use static_assertions::const_assert_eq;
use std::fmt::Debug;
Expand Down Expand Up @@ -523,7 +522,6 @@ impl SoaTransform {
}
}

#[cfg(feature = "glam-ext")]
impl SoaTransform {
#[inline]
pub const fn splat_transform(transform: Transform3A) -> SoaTransform {
Expand Down
64 changes: 42 additions & 22 deletions src/track_sampling_job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use std::rc::Rc;
use std::sync::Arc;

use crate::base::{OzzError, OzzObj};
use crate::math::f32_clamp_or_max;
use crate::track::{Track, TrackValue};

/// Track sampling job implementation.
Expand Down Expand Up @@ -81,7 +80,7 @@ where
/// This is a ratio rather than a ratio because tracks have no duration.
#[inline]
pub fn set_ratio(&mut self, ratio: f32) {
self.ratio = f32_clamp_or_max(ratio, 0.0f32, 1.0f32);
self.ratio = ratio;
}

/// Gets **output** result of `TrackSamplingJob`.
Expand Down Expand Up @@ -113,28 +112,31 @@ where
pub fn run(&mut self) -> Result<(), OzzError> {
let track = self.track.as_ref().ok_or(OzzError::InvalidJob)?.obj();

if track.key_count() == 0 {
if track.ratios().len() == 0 {
self.result = V::default();
return Ok(());
}

let id1 = track
.ratios()
.iter()
.position(|&x| self.ratio < x)
.unwrap_or(track.key_count());
let id0 = id1.saturating_sub(1);

let id0_step = (track.steps()[id0 / 8] & (1 << (id0 & 7))) != 0;
if id0_step || id1 == track.key_count() {
self.result = track.values()[id0];
} else if track.ratios().len() == 1 || self.ratio < 0.0 {
self.result = *track.values().first().unwrap();
} else if self.ratio > 1.0 {
self.result = *track.values().last().unwrap();
} else {
let tk0 = track.ratios()[id0];
let tk1 = track.ratios()[id1];
let t = (self.ratio - tk0) / (tk1 - tk0);
let v0 = track.values()[id0];
let v1 = track.values()[id1];
self.result = V::lerp(v0, v1, t);
let id1 = track
.ratios()
.iter()
.position(|&x| self.ratio < x)
.unwrap_or(track.key_count());
let id0 = id1.saturating_sub(1);

let id0_step = (track.steps()[id0 / 8] & (1 << (id0 & 7))) != 0;
if id0_step || id1 == track.key_count() {
self.result = track.values()[id0];
} else {
let tk0 = track.ratios()[id0];
let tk1 = track.ratios()[id1];
let t = (self.ratio - tk0) / (tk1 - tk0);
let v0 = track.values()[id0];
let v1 = track.values()[id1];
self.result = V::lerp(v0, v1, t);
}
}
Ok(())
}
Expand Down Expand Up @@ -174,6 +176,24 @@ mod track_sampling_tests {
result
);
}

#[test]
#[wasm_bindgen_test]
fn test_default() {
let mut job = TrackSamplingJob::<f32>::default();
let track = Rc::new(Track::default());
job.set_track(track.clone());
execute_test(&mut job, 0.0, 0.0);
}

#[test]
#[wasm_bindgen_test]
fn test_constant() {
let mut job = TrackSamplingJob::<f32>::default();
let track = Rc::new(Track::from_raw(&[46.0], &[0.0], &[0]).unwrap());
job.set_track(track.clone());
execute_test(&mut job, 0.5, 46.0);
}

#[test]
#[wasm_bindgen_test]
Expand Down
12 changes: 12 additions & 0 deletions src/track_triggering_job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,18 @@ mod track_triggering_tests {
assert!(job.run().unwrap().count() == 0);
}

#[test]
#[wasm_bindgen_test]
fn test_const() {
let mut job: TrackTriggeringJobRef = TrackTriggeringJob::default();
let track = Track::from_raw(&[46.0], &[0.0], &[0]).unwrap();
job.set_track(&track);
job.set_from(0.0);
job.set_to(1.0);
job.set_threshold(0.0);
assert!(job.run().unwrap().count() == 0);
}

#[test]
#[wasm_bindgen_test]
fn test_no_range() {
Expand Down