robin/vbsp-to-gltf
1
0
Fork 0
mirror of https://codeberg.org/icewind/vbsp-to-gltf.git synced 2026-06-03 10:14:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix prop mesh reuse

Browse source
This commit is contained in:
Robin Appelman 2023-12-21 16:42:51 +01:00
commit 81672af828
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/prop.rs
View file

@ -130,7 +130,7 @@ pub fn push_or_get_model(
None => { None => {
let prop = load_prop(loader, model).expect("failed to load prop"); let prop = load_prop(loader, model).expect("failed to load prop");
let index = gltf.meshes.len() as u32; let index = gltf.meshes.len() as u32;
let material = push_model(buffer, gltf, loader, &prop, skin); let material = push_model(buffer, gltf, loader, &prop, skin, skinned_name);
gltf.meshes.push(material); gltf.meshes.push(material);
Index::new(index) Index::new(index)
} }
@ -151,6 +151,7 @@ pub fn push_model(
loader: &Loader, loader: &Loader,
model: &Model, model: &Model,
skin: i32, skin: i32,
skinned_name: String,
) -> Mesh { ) -> Mesh {
let accessor_start = gltf.accessors.len() as u32; let accessor_start = gltf.accessors.len() as u32;
push_vertices(buffer, gltf, model); push_vertices(buffer, gltf, model);
@ -167,7 +168,7 @@ pub fn push_model(
Mesh { Mesh {
extensions: Default::default(), extensions: Default::default(),
extras: Default::default(), extras: Default::default(),
name: Some(format!("{}_{skin}", model.name())), name: Some(skinned_name),
primitives, primitives,
weights: None, weights: None,
} }