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

no bsp normals, let the loader figure them out

Browse source
This commit is contained in:
Robin Appelman 2023-12-22 17:25:26 +01:00
commit 2fb63ab17f
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/bsp.rs
View file

@ -63,7 +63,6 @@ fn bounding_box(vertices: impl IntoIterator<Item = Vector>) -> ([f32; 3], [f32;
#[repr(C)] #[repr(C)]
pub struct BspVertexData { pub struct BspVertexData {
position: [f32; 3], position: [f32; 3],
normal: [f32; 3],
uv: [f32; 2], uv: [f32; 2],
} }
@ -122,7 +121,6 @@ pub fn push_bsp_face(
let texture = face.texture(); let texture = face.texture();
let vertices = face.vertex_positions().map(move |pos| BspVertexData { let vertices = face.vertex_positions().map(move |pos| BspVertexData {
position: map_coords(pos), position: map_coords(pos),
normal: map_coords(face.normal()),
uv: texture.uv(pos), uv: texture.uv(pos),
}); });
@ -157,20 +155,6 @@ pub fn push_bsp_face(
normalized: false, normalized: false,
sparse: None, sparse: None,
}; };
let normals = Accessor {
buffer_view: Some(vertex_view),
byte_offset: Some(USize64(offset_of!(BspVertexData, normal) as u64)),
count: USize64(vertex_count),
component_type: Valid(GenericComponentType(ComponentType::F32)),
extensions: Default::default(),
extras: Default::default(),
type_: Valid(Type::Vec3),
min: None,
max: None,
name: None,
normalized: false,
sparse: None,
};
let uvs = Accessor { let uvs = Accessor {
buffer_view: Some(vertex_view), buffer_view: Some(vertex_view),
byte_offset: Some(USize64(offset_of!(BspVertexData, uv) as u64)), byte_offset: Some(USize64(offset_of!(BspVertexData, uv) as u64)),
@ -188,7 +172,6 @@ pub fn push_bsp_face(
let accessor_start = gltf.accessors.len() as u32; let accessor_start = gltf.accessors.len() as u32;
gltf.accessors.push(positions); gltf.accessors.push(positions);
gltf.accessors.push(normals);
gltf.accessors.push(uvs); gltf.accessors.push(uvs);
let material_index = push_or_get_material(buffer, gltf, loader, face.texture().name()); let material_index = push_or_get_material(buffer, gltf, loader, face.texture().name());
@ -197,10 +180,9 @@ pub fn push_bsp_face(
attributes: { attributes: {
let mut map = std::collections::BTreeMap::new(); let mut map = std::collections::BTreeMap::new();
map.insert(Valid(Semantic::Positions), Index::new(accessor_start)); map.insert(Valid(Semantic::Positions), Index::new(accessor_start));
map.insert(Valid(Semantic::Normals), Index::new(accessor_start + 1));
map.insert( map.insert(
Valid(Semantic::TexCoords(0)), Valid(Semantic::TexCoords(0)),
Index::new(accessor_start + 2), Index::new(accessor_start + 1),
); );
map map
}, },