readme/clippy

Cargo.toml

@@ -2,7 +2,7 @@
 name = "vbsp-to-gltf"
 version = "0.1.0"
 edition = "2021"
-
+rust-version = "1.70.0"
 
 [dependencies]
 miette = { version = "5.5.0", features = ["fancy"] }

README.md

@@ -0,0 +1,17 @@
+# vbsp-to-gtlf
+
+Convert Valve BSP files to GLTF files
+
+## Usage
+
+```bash
+vbsp-to-gltf input.bsp output.glb
+```
+
+## Model optimization
+
+The output for the converter isn't particularly optimized, it's strongly recommended to run the output through [gltfpack](https://github.com/zeux/meshoptimizer) before usage.
+
+![screenshot of koth_bagel model](readme/bagel.png)
+
+`koth_bagel` as vieweed with the [PlayCanvas model viewer](https://playcanvas.com/viewer).

src/bsp.rs

@@ -42,7 +42,7 @@ pub fn bsp_models(bsp: &Bsp) -> Result<Vec<(Handle<Model>, Vector)>, Error> {
     Ok(models)
 }
 
-fn bounding_box<'a>(vertices: impl IntoIterator<Item = Vector>) -> ([f32; 3], [f32; 3]) {
+fn bounding_box(vertices: impl IntoIterator<Item = Vector>) -> ([f32; 3], [f32; 3]) {
     let mut min = Vector::from([f32::MAX, f32::MAX, f32::MAX]);
     let mut max = Vector::from([f32::MIN, f32::MIN, f32::MIN]);
 

src/gltf_builder.rs

@@ -23,7 +23,7 @@ impl From<&vmdl::vvd::Vertex> for Vertex {
     fn from(vertex: &vmdl::vvd::Vertex) -> Self {
         Vertex {
             position: vertex.position.into(),
-            uv: vertex.texture_coordinates.into(),
+            uv: vertex.texture_coordinates,
             normal: vertex.normal.into(),
         }
     }
@@ -36,7 +36,7 @@ pub fn push_or_get_material(
     material: &str,
 ) -> Index<Material> {
     let material = material.to_ascii_lowercase();
-    match get_material_index(&mut gltf.materials, &material) {
+    match get_material_index(&gltf.materials, &material) {
         Some(index) => index,
         None => {
             let material = load_material_fallback(&material, &[String::new()], loader);
@@ -96,7 +96,7 @@ fn push_or_get_texture(
     gltf: &mut Root,
     texture: TextureData,
 ) -> Index<Texture> {
-    match get_texture_index(&mut gltf.textures, &texture.name) {
+    match get_texture_index(&gltf.textures, &texture.name) {
         Some(index) => index,
         None => {
             let index = gltf.textures.len() as u32;

src/main.rs

@@ -56,7 +56,7 @@ fn main() -> miette::Result<()> {
     let map = Bsp::read(&data).map_err(Error::from)?;
     loader.add_source(map.pack.clone());
 
-    let glb = export(map, &mut loader)?;
+    let glb = export(map, &loader)?;
 
     let writer = File::create(&args.target)
         .map_err(Error::from)
@@ -80,7 +80,7 @@ fn export(bsp: Bsp, loader: &Loader) -> Result<Glb<'static>, Error> {
     }
 
     for prop in bsp.static_props() {
-        let mesh = push_or_get_model(&mut buffer, &mut root, loader, &prop.model(), prop.skin);
+        let mesh = push_or_get_model(&mut buffer, &mut root, loader, prop.model(), prop.skin);
         let rotation = prop.rotation();
 
         let node = Node {

src/materials.rs

@@ -48,7 +48,7 @@ pub fn load_material(
         .map(|dir| {
             format!(
                 "materials/{}",
-                dir.to_ascii_lowercase().trim_start_matches("/")
+                dir.to_ascii_lowercase().trim_start_matches('/')
             )
         })
         .collect::<Vec<_>>();
@@ -96,7 +96,7 @@ pub fn load_material(
 
     let bump_map = material.bump_map().and_then(|path| {
         Some(TextureData {
-            image: load_texture(&path, loader).ok()?,
+            image: load_texture(path, loader).ok()?,
             name: path.into(),
         })
     });

src/prop.rs

@@ -22,7 +22,7 @@ impl From<&vmdl::vvd::Vertex> for ModelVertex {
     fn from(vertex: &vmdl::vvd::Vertex) -> Self {
         ModelVertex {
             position: map_coords(vertex.position),
-            uv: vertex.texture_coordinates.into(),
+            uv: vertex.texture_coordinates,
             normal: vertex.normal.into(),
         }
     }
@@ -125,7 +125,7 @@ pub fn push_or_get_model(
     skin: i32,
 ) -> Index<Mesh> {
     let skinned_name = format!("{model}_{skin}");
-    match get_mesh_index(&mut gltf.meshes, &skinned_name) {
+    match get_mesh_index(&gltf.meshes, &skinned_name) {
         Some(index) => index,
         None => {
             let prop = load_prop(loader, model).expect("failed to load prop");