mirror of
https://codeberg.org/icewind/vmdl.git
synced 2026-06-03 16:44:11 +02:00
rename transform
This commit is contained in:
parent
8efdc90210
commit
01f24876a0
3 changed files with 4 additions and 9 deletions
|
|
@ -252,7 +252,7 @@ fn model_to_model(model: &Model, loader: &Loader, skin: usize) -> CpuModel {
|
||||||
|
|
||||||
let positions: Vec<Vec3> = mesh
|
let positions: Vec<Vec3> = mesh
|
||||||
.vertices()
|
.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(|position| map_coords(position) * 10.0)
|
||||||
.map(|vertex: Vec3| (transforms * vertex.extend(1.0)).truncate())
|
.map(|vertex: Vec3| (transforms * vertex.extend(1.0)).truncate())
|
||||||
.collect();
|
.collect();
|
||||||
|
|
|
||||||
|
|
@ -172,11 +172,9 @@ impl Model {
|
||||||
self.mdl.pose_parameters.iter()
|
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();
|
let transform = self.idle_transform() * self.root_transform();
|
||||||
transform
|
transform.transform_vector(Vector3::from(vec)).into()
|
||||||
.transform_vector(Vector3::from(vertex.position))
|
|
||||||
.into()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -225,10 +225,7 @@ impl<'a> FrameValues<'a> {
|
||||||
data: &self.data[offset..],
|
data: &self.data[offset..],
|
||||||
};
|
};
|
||||||
if next_header.total == 0 {
|
if next_header.total == 0 {
|
||||||
return Err(ModelError::OutOfBounds {
|
return Ok(0);
|
||||||
data: "animation value",
|
|
||||||
offset,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
next.get(index - self.header.total)
|
next.get(index - self.header.total)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue