Fix off-by-one index error

ajtribick · Feb 3, 2025 · f27a887 · f27a887
1 parent eab180c
commit f27a887
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -40,8 +40,8 @@ fn output_path(
 }
 
 fn run(args: Args) -> Result<(), Box<dyn std::error::Error>> {
-    let output_obj = output_path(args.output_obj, &args.input_file, ".obj")?;
-    let output_mtl = output_path(args.output_mtl, &args.input_file, ".mtl")?;
+    let output_obj = output_path(args.output_obj, &args.input_file, "obj")?;
+    let output_mtl = output_path(args.output_mtl, &args.input_file, "mtl")?;
 
     cmodconvert::convert_cmod(args.input_file, output_obj, output_mtl)
 }

diff --git a/src/reader/binaryread.rs b/src/reader/binaryread.rs
@@ -22,7 +22,7 @@ impl<R: Read> BinaryReader<R> {
     fn read_expected_data_type(&mut self, expected_type: DataType) -> Result<(), CmodError> {
         let token = self.input.read_u16::<LittleEndian>()?;
         let data_type =
-            DataType::from_u16(token).ok_or_else(|| CmodError::InvalidDataType(token))?;
+            DataType::from_u16(token).ok_or(CmodError::InvalidDataType(token))?;
         if data_type == expected_type {
             Ok(())
         } else {
@@ -36,20 +36,20 @@ impl<R: Read> CmodTokenizer for BinaryReader<R> {
         match self.input.read_u16::<LittleEndian>() {
             Ok(token) => Token::from_u16(token)
                 .map(Some)
-                .ok_or_else(|| CmodError::InvalidToken(token)),
+                .ok_or( CmodError::InvalidToken(token)),
             Err(err) if err.kind() == io::ErrorKind::UnexpectedEof => Ok(None),
             Err(err) => Err(err.into()),
         }
     }
 
     fn read_texture_semantic(&mut self) -> Result<TextureSemantic, CmodError> {
         let token = self.input.read_u16::<LittleEndian>()?;
-        TextureSemantic::from_u16(token).ok_or_else(|| CmodError::InvalidTextureSemantic(token))
+        TextureSemantic::from_u16(token).ok_or( CmodError::InvalidTextureSemantic(token))
     }
 
     fn read_blend_mode(&mut self) -> Result<BlendMode, CmodError> {
         let token = self.input.read_u16::<LittleEndian>()?;
-        BlendMode::from_u16(token).ok_or_else(|| CmodError::InvalidBlendMode(token))
+        BlendMode::from_u16(token).ok_or( CmodError::InvalidBlendMode(token))
     }
 
     fn read_attribute_type(&mut self) -> Result<Option<AttributeType>, CmodError> {
@@ -59,14 +59,14 @@ impl<R: Read> CmodTokenizer for BinaryReader<R> {
         }
 
         let attribute_type =
-            AttributeType::from_u16(token).ok_or_else(|| CmodError::InvalidAttributeType(token))?;
+            AttributeType::from_u16(token).ok_or( CmodError::InvalidAttributeType(token))?;
 
         Ok(Some(attribute_type))
     }
 
     fn read_attribute_format(&mut self) -> Result<AttributeFormat, CmodError> {
         let token = self.input.read_u16::<LittleEndian>()?;
-        AttributeFormat::from_u16(token).ok_or_else(|| CmodError::InvalidAttributeFormat(token))
+        AttributeFormat::from_u16(token).ok_or( CmodError::InvalidAttributeFormat(token))
     }
 
     fn read_primitive_type(&mut self) -> Result<Option<PrimitiveType>, CmodError> {
@@ -76,7 +76,7 @@ impl<R: Read> CmodTokenizer for BinaryReader<R> {
         }
 
         let primitive_type =
-            PrimitiveType::from_u16(token).ok_or_else(|| CmodError::InvalidPrimitiveType(token))?;
+            PrimitiveType::from_u16(token).ok_or( CmodError::InvalidPrimitiveType(token))?;
 
         Ok(Some(primitive_type))
     }

diff --git a/src/wavefront.rs b/src/wavefront.rs
@@ -101,7 +101,7 @@ impl VertexHandler {
                 .position_lookup
                 .entry(position)
                 .or_insert_with_key(|key| {
-                    let position_idx = self.positions.len();
+                    let position_idx = self.positions.len() + 1;
                     self.positions.push(*key);
                     position_idx as u32
                 });
@@ -118,7 +118,7 @@ impl VertexHandler {
                     .tex_coord_lookup
                     .entry(tex_coord)
                     .or_insert_with_key(|key| {
-                        let tex_coord_idx = self.tex_coords.len();
+                        let tex_coord_idx = self.tex_coords.len() + 1;
                         self.tex_coords.push(*key);
                         tex_coord_idx as u32
                     })
@@ -131,7 +131,7 @@ impl VertexHandler {
                 };
 
                 *self.normal_lookup.entry(normal).or_insert_with_key(|key| {
-                    let normal_idx = self.normals.len();
+                    let normal_idx = self.normals.len() + 1;
                     self.normals.push(*key);
                     normal_idx as u32
                 })
@@ -307,7 +307,11 @@ impl From<EquatableF32> for f32 {
 
 impl Display for EquatableF32 {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
+        if self.0 == 0.0 || (self.0.abs() >= 1e-4 && self.0.abs() <= 1e9) {
+            write!(f, "{}", self.0)
+        } else {
+            write!(f, "{:E}", self.0)
+        }
     }
 }