diff options
Diffstat (limited to 'world/src')
| -rw-r--r-- | world/src/mesh.rs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/world/src/mesh.rs b/world/src/mesh.rs index 4e6317d..0d90b82 100644 --- a/world/src/mesh.rs +++ b/world/src/mesh.rs @@ -20,10 +20,7 @@ use gltf::{Mesh, Node, buffer::Data}; use log::{debug, info}; use std::path::Path; use weareshared::{ - Affine3A, Vec3A, - resources::{Armature, MeshPart, Prefab}, - store::ResourceStore, - vec2, vec3a, + resources::{Armature, MeshPart, Prefab}, store::ResourceStore, vec2, vec3a, vec4, Affine3A, Vec3A }; pub fn import_mesh( @@ -69,7 +66,9 @@ pub fn import_mesh( .read_tangents() .map(|iter| { // TODO dont ignore handedness - let a = iter.map(|[x, y, z, _h]| vec3a(x, y, z)).collect::<Vec<_>>(); + let a = iter + .map(|[x, y, z, h]| vec4(x, y, z, h)) + .collect::<Vec<_>>(); debug!("{} vertex tangents", a.len()); store.set(&a) }) @@ -198,11 +197,7 @@ pub fn import_mesh( )?); } let mut tex_thickness = None; - if let Some(tex) = p - .material() - .volume() - .and_then(|t| t.thickness_texture()) - { + if let Some(tex) = p.material().volume().and_then(|t| t.thickness_texture()) { tex_thickness = Some(load_texture( "thickness", store, @@ -387,6 +382,6 @@ pub fn import_mesh( })?; prefab.mesh.push((trans, mesh)) - }; + } Ok(()) } |