diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-02-23 22:59:28 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-02-23 22:59:28 +0100 |
| commit | 65a87b276d8ec1e8eb15ba1d86ec25c3968a5972 (patch) | |
| tree | 62d3b1790465df07ddc9edd1d1a09cf3595570f6 | |
| parent | 6d3b5da011059e7030af4fa30228aaf81234daca (diff) | |
| download | weareserver-65a87b276d8ec1e8eb15ba1d86ec25c3968a5972.tar weareserver-65a87b276d8ec1e8eb15ba1d86ec25c3968a5972.tar.bz2 weareserver-65a87b276d8ec1e8eb15ba1d86ec25c3968a5972.tar.zst | |
rename rest transform to ibm
| -rw-r--r-- | doc/resources.md | 12 | ||||
| -rw-r--r-- | shared/src/resources.rs | 2 | ||||
| -rw-r--r-- | world/src/main.rs | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/doc/resources.md b/doc/resources.md index 7d06e71..4ae1d9e 100644 --- a/doc/resources.md +++ b/doc/resources.md @@ -125,12 +125,12 @@ Armature is used for humanoid avatar rigging and generally follows VRM specification. Joints are arranged in a hierarchy where transforms are inherited. Attribute values are zipped similar to vertex attributes. -| Key | Value Type | | -| ---------------- | ----------- | -------------------------------------- | -| `parent` | `[u16]` | Parent indecies, Root points to itself | -| `transform` | `[Affine3]` | | -| `rest_transform` | `[Affine3]` | | -| `name` | `[String]` | Each string prefixed with u16 length | +| Key | Value Type | | +| ------------------------ | ----------- | -------------------------------------- | +| `parent` | `[u16]` | Parent indecies, Root points to itself | +| `transform` | `[Affine3]` | | +| `inverse_bind_transform` | `[Affine3]` | | +| `name` | `[String]` | Each string prefixed with u16 length | - **Names**: Indirectly controlled joints have an empty name. All other bones are named like in [VRMC_vrm]. diff --git a/shared/src/resources.rs b/shared/src/resources.rs index f502485..fbc171b 100644 --- a/shared/src/resources.rs +++ b/shared/src/resources.rs @@ -179,7 +179,7 @@ resource_dicts!( pub struct ArmaturePart { parent: Vec<u16>, transform: Vec<Affine3A>, - rest_transform: Vec<Affine3A>, + inverse_bind_transform: Vec<Affine3A>, name: Vec<String>, } diff --git a/world/src/main.rs b/world/src/main.rs index cfe2361..66c2a91 100644 --- a/world/src/main.rs +++ b/world/src/main.rs @@ -27,7 +27,7 @@ use clap::Parser; use gltf::{Gltf, Node, image::Source, import_buffers, scene::Transform}; use humansize::BINARY; use image::{ImageReader, codecs::webp::WebPEncoder}; -use log::{debug, info, warn}; +use log::{debug, info}; use mesh::import_mesh; use physics::import_physics; use rand::random; @@ -171,7 +171,7 @@ fn main() -> Result<()> { let mut name = Vec::new(); let mut parent_pre_map = Vec::new(); let mut transform = Vec::new(); - let mut rest = Vec::new(); + let mut inverse_bind_transform = Vec::new(); for skin in gltf.skins() { let mut inverse_bind_mat = skin @@ -195,7 +195,7 @@ fn main() -> Result<()> { .find(|n| n.children().any(|c| c.index() == j.index())) .map(|n| n.index()), ); - rest.push( + inverse_bind_transform.push( ibm.map(|a| transform_to_affine(Transform::Matrix { matrix: a })) .unwrap_or(Affine3A::IDENTITY), ); @@ -239,7 +239,7 @@ fn main() -> Result<()> { name: Some(name), parent: Some(parent), transform: Some(transform), - rest_transform: Some(rest), + inverse_bind_transform: Some(inverse_bind_transform), } }; |