rename transform

This commit is contained in:
Robin Appelman 2024-08-29 14:21:48 +02:00
commit 01f24876a0
3 changed files with 4 additions and 9 deletions

View file

@ -252,7 +252,7 @@ fn model_to_model(model: &Model, loader: &Loader, skin: usize) -> CpuModel {
let positions: Vec<Vec3> = mesh
.vertices()
.map(|vertex| model.vertex_to_world_space(vertex))
.map(|vertex| model.apply_root_transform(vertex.position))
.map(|position| map_coords(position) * 10.0)
.map(|vertex: Vec3| (transforms * vertex.extend(1.0)).truncate())
.collect();

View file

@ -172,11 +172,9 @@ impl Model {
self.mdl.pose_parameters.iter()
}
pub fn vertex_to_world_space(&self, vertex: &Vertex) -> Vector {
pub fn apply_root_transform(&self, vec: Vector) -> Vector {
let transform = self.idle_transform() * self.root_transform();
transform
.transform_vector(Vector3::from(vertex.position))
.into()
transform.transform_vector(Vector3::from(vec)).into()
}
}

View file

@ -225,10 +225,7 @@ impl<'a> FrameValues<'a> {
data: &self.data[offset..],
};
if next_header.total == 0 {
return Err(ModelError::OutOfBounds {
data: "animation value",
offset,
});
return Ok(0);
}
next.get(index - self.header.total)
} else {