Skip to content

Commit 4cac7ca

Browse files
authored
Merge pull request #116 from SlimeYummy/feat/version
upgeade version to 0.11.0
2 parents d31d4bf + e02780a commit 4cac7ca

File tree

5 files changed

+4
-46
lines changed

5 files changed

+4
-46
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ozz-animation-rs"
3-
version = "0.10.3"
3+
version = "0.11.0"
44
authors = ["SlimeYummy <zzzcccnnn@outlook.com>"]
55
edition = "2021"
66
rust-version = "1.75"
@@ -16,7 +16,7 @@ resolver = "2"
1616
[features]
1717
default = ["rkyv", "serde"]
1818
serde = ["dep:serde", "glam/serde", "bimap/serde" ]
19-
rkyv = ["dep:rkyv", "dep:bytecheck", "glam/rkyv", "glam/bytecheck"]
19+
rkyv = ["dep:rkyv", "dep:bytecheck", "glam/rkyv", "glam/bytecheck", "glam-ext/rkyv", "glam-ext/bytecheck"]
2020
wasm = []
2121
nodejs = ["wasm", "dep:js-sys", "dep:wasm-bindgen"]
2222

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The library supports almost all runtime features supported by C++ version ozz, i
2020
- Two bone IK
2121
- Aim (Look-at) IK
2222
- User channels
23+
- Root motion (motion blending)
2324
- Skinning
2425
- Multi-threading
2526
- SIMD (SSE2 + NEON)
@@ -97,6 +98,7 @@ With the release of ozz-animation versions, .ozz files and some APIs will also b
9798

9899
|ozz-animation-rs|ozz-animation(C++)|
99100
|--|--|
101+
|0.11.x|0.16.x|
100102
|0.10.x|0.15.x|
101103
|0.9.x|0.14.x|
102104

src/animation.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ impl ArchiveRead<QuaternionKey> for QuaternionKey {
180180
/// time, then by track number.
181181
///
182182
#[derive(Debug)]
183-
// #[cfg_attr(feature = "rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))]
184-
// #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
185183
pub struct Animation {
186184
size: usize,
187185
duration: f32,

src/base.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ pub trait OzzBuf<T: Debug + Clone> {
206206
fn buf(&self) -> Result<Self::Buf<'_>, OzzError>;
207207
}
208208

209-
// pub trait OzzAsSlice<'t, T: Debug + Clone> {
210-
// fn slice(&'t self) -> Result<&'t [T], OzzError>;
211-
// }
212-
213209
/// Represents a reference to the ozz mutable buffers.
214210
/// `T` usually is `SoaTransform`, `Mat4`, .etc.
215211
///

src/blending_job.rs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,44 +1195,6 @@ mod blending_tests {
11951195
}
11961196
}
11971197

1198-
// fn new_layers3() -> Vec<BlendingLayer<f32>> {
1199-
// let mut input1 = vec![SoaTransform::<f32>::default(); 4];
1200-
// input1[0].translation = Vec3::new(0.0, 4.0, 8.0);
1201-
// input1[1].translation = Vec3::new(1.0, 5.0, 9.0);
1202-
// input1[2].translation = Vec3::new(2.0, 6.0, 10.0);
1203-
// input1[3].translation = Vec3::new(3.0, 7.0, 11.0);
1204-
// input1[0].rotation = Quat::new(0.70710677, 0.70710677, 0.0, 0.0);
1205-
// input1[1].rotation = Quat::identity();
1206-
// input1[2].rotation = Quat::new(-0.70710677, 0.0, 0.70710677, 0.0);
1207-
// input1[3].rotation = Quat::new(0.9238795, 0.382683432, 0.0, 0.0);
1208-
// input1[0].scale = Vec3::new(12.0, 16.0, 20.0);
1209-
// input1[1].scale = Vec3::new(13.0, 17.0, 21.0);
1210-
// input1[2].scale = Vec3::new(14.0, 18.0, 22.0);
1211-
// input1[3].scale = Vec3::new(15.0, 19.0, 23.0);
1212-
1213-
// let input2 = input1
1214-
// .iter()
1215-
// .map(|x| SoaTransform {
1216-
// translation: x.translation.neg(),
1217-
// rotation: x.rotation.conjugate(),
1218-
// scale: x.scale.neg(),
1219-
// })
1220-
// .collect::<Vec<_>>();
1221-
1222-
// return vec![
1223-
// BlendingLayer {
1224-
// input: make_buf(input1),
1225-
// weight: 0.0,
1226-
// joint_weights: Vec::new(),
1227-
// },
1228-
// BlendingLayer {
1229-
// input: make_buf(input2),
1230-
// weight: 0.0,
1231-
// joint_weights: Vec::new(),
1232-
// },
1233-
// ];
1234-
// }
1235-
12361198
#[test]
12371199
#[wasm_bindgen_test]
12381200
fn test_additive_weight() {

0 commit comments

Comments
 (0)