refactor: Use Option instead of UvIndex::None

Author: Waelwindows

src/material/texture/mod.rs

@@ -42,8 +42,8 @@ pub struct SamplerFlags {
 #[derive(Debug, Clone, PartialEq)]
 pub struct TextureFlags {
     map: TextureMap,
-    uv_index: UvIndex,
     uv_translation: UvTranslationType,
+    uv_index: Option<UvIndex>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -70,7 +70,6 @@ pub enum TextureMap {
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum UvIndex {
-    None = 15,
     Index0 = 0,
     Index1,
     Index2,
@@ -80,3 +79,7 @@ pub enum UvIndex {
     Index6,
     Index7,
 }
+
+impl UvIndex {
+    const NONE: u32 = 15;
+}

src/material/texture/py_ffi.rs

@@ -25,7 +25,7 @@ pub struct PyTexture {
 #[derive(Debug, Default, PartialEq, Clone)]
 pub struct PyTextureFlags {
     #[pyo3(get, set)]
-    uv_index: u8,
+    uv_index: Option<u8>,
     #[pyo3(get, set)]
     uv_translation: u8,
     /// 0: None,
@@ -73,7 +73,7 @@ impl From<TextureFlags> for PyTextureFlags {
             uv_translation,
         } = flags;
         let map = map as u8;
-        let uv_index = uv_index as u8;
+        let uv_index = uv_index.map(|x| x as u8);
         let uv_translation = uv_translation as u8;
         Self {
             map,
@@ -96,7 +96,7 @@ impl<'p> PyObjectProtocol<'p> for PyTextureFlags {
     fn __repr__(&'p self) -> PyResult<String> {
         let format = TextureMap::from_byte(self.map).unwrap_or(TextureMap::None);
         Ok(format!(
-            "PyTextureFlags: {:?} UV {} {}",
+            "PyTextureFlags: {:?} UV {:?} {}",
             format, self.uv_index, self.uv_translation
         ))
     }

src/material/texture/read.rs

@@ -57,7 +57,7 @@ impl TextureFlags {
     fn parse(i: &[u8]) -> IResult<&[u8], Self> {
         let b = i[0];
         let uv_index = b >> 4;
-        let uv_index = UvIndex::from_byte(uv_index).unwrap_or(UvIndex::None);
+        let uv_index = UvIndex::from_byte(uv_index);
         let map = TextureMap::from_byte(b & 0x0F).unwrap();
         let b = i[1];
         let uv_translation = b;
@@ -73,7 +73,6 @@ impl TextureFlags {
 impl UvIndex {
     fn from_byte(id: u8) -> Option<Self> {
         Some(match id {
-            15 => Self::None,
             0 => Self::Index0,
             1 => Self::Index1,
             2 => Self::Index2,