differt-core 0.0.32__tar.gz → 0.0.34__tar.gz

{differt_core-0.0.32 → differt_core-0.0.34}/Cargo.lock

@@ -247,7 +247,7 @@ checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "differt-core"
-version = "0.0.32"
+version = "0.0.34"
 dependencies = [
  "criterion",
  "indexmap",
@@ -825,8 +825,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-log"
-version = "0.13.0"
-source = "git+https://github.com/vorner/pyo3-log.git?rev=refs/pull/62/head#5fdd313653dcb3fb3297180d1b7ca3564a0e18aa"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b78e4983ba15bc62833a0e0941d965bc03690163f1127864f1408db25063466"
 dependencies = [
  "arc-swap",
  "log",
@@ -869,9 +870,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003"
 dependencies = [
  "memchr",
  "serde",

{differt_core-0.0.32 → differt_core-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: differt-core
-Version: 0.0.32
+Version: 0.0.34
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{differt_core-0.0.32 → differt_core-0.0.34}/differt-core/Cargo.toml

@@ -11,8 +11,8 @@ numpy = "0.24"
 obj-rs = "0.7.1"
 ply-rs = "0.1.3"
 pyo3 = {version = "0.24", features = ["abi3-py310", "indexmap", "generate-import-lib"]}
-pyo3-log = {version = "0.13", git = "https://github.com/vorner/pyo3-log.git", rev = "refs/pull/62/head"}
-quick-xml = {version = "0.31.0", features = ["serialize"]}
+pyo3-log = "0.12.2"
+quick-xml = {version = "0.37.2", features = ["serialize", "serde-types"]}
 serde = {version = "1.0.197", features = ["derive"]}
 
 [dev-dependencies]
@@ -37,4 +37,4 @@ unexpected_cfgs = {level = "warn", check-cfg = ['cfg(tarpaulin_include)']}
 edition = "2021"
 name = "differt-core"
 rust-version = "1.78.0"
-version = "0.0.32"
+version = "0.0.34"

{differt_core-0.0.32 → differt_core-0.0.34/differt-core}/python/differt_core/_differt_core/scene/sionna.pyi

@@ -6,8 +6,10 @@ class SionnaScene:
     def load_xml(cls, file: str) -> SionnaScene: ...
 
 class Material:
+    name: str
     id: str
-    rgb: tuple[float, float, float]
+    color: tuple[float, float, float]
+    thickness: float | None
 
 class Shape:
     type: str

{differt_core-0.0.32 → differt_core-0.0.34}/differt-core/src/geometry/triangle_mesh.rs

@@ -281,7 +281,10 @@ impl TriangleMesh {
     pub(crate) fn load_obj(_: &Bound<'_, PyType>, filename: &str) -> PyResult<Self> {
         let input = BufReader::new(File::open(filename)?);
         let mut obj: RawObj = parse_obj(input).map_err(|err| {
-            PyValueError::new_err(format!("An error occurred while reading obj file: {}", err))
+            PyValueError::new_err(format!(
+                "An error occurred while reading obj file {filename:#?}: {}",
+                err
+            ))
         })?;
 
         for material_file in obj.material_libraries.iter_mut() {
@@ -317,7 +320,7 @@ impl TriangleMesh {
 
         let header = vertex_parser.read_header(&mut input).map_err(|err| {
             PyValueError::new_err(format!(
-                "An error occurred while reading the header of ply file: {}",
+                "An error occurred while reading the header of ply file {filename:#?}: {}",
                 err
             ))
         })?;
@@ -334,7 +337,7 @@ impl TriangleMesh {
                             .map_err(|err| {
                                 PyValueError::new_err(format!(
                                     "An error occurred while reading the vertex elements of ply \
-                                     file: {}",
+                                     file {filename:#?}: {}",
                                     err
                                 ))
                             })?
@@ -349,7 +352,7 @@ impl TriangleMesh {
                             .map_err(|err| {
                                 PyValueError::new_err(format!(
                                     "An error occurred while reading the face elements of PLY \
-                                     file: {}",
+                                     file {filename:#?}: {}",
                                     err
                                 ))
                             })?
@@ -423,14 +426,16 @@ impl From<RawObj> for TriangleMesh {
                             },
                             Err(e) => {
                                 log::warn!(
-                                    "An error occurred when parsing MTL file {material_file}: {e}."
+                                    "An error occurred when parsing MTL file {material_file:#?}: \
+                                     {e}."
                                 );
                             },
                         }
                     },
                     Err(e) => {
                         log::warn!(
-                            "An error occurred when trying to read MTL file {material_file}: {e}."
+                            "An error occurred when trying to read MTL file {material_file:#?}: \
+                             {e}."
                         );
                     },
                 }
@@ -460,7 +465,7 @@ impl From<RawObj> for TriangleMesh {
                     }
                 } else {
                     log::warn!(
-                        "Material {material_name} was listed in OBJ material libraries, but is \
+                        "Material {material_name:#?} was listed in OBJ material libraries, but is \
                          not present is mesh groups."
                     );
                 }

{differt_core-0.0.32 → differt_core-0.0.34}/differt-core/src/scene/sionna.rs

@@ -74,12 +74,47 @@ where
 #[pyclass(get_all)]
 #[derive(Clone, Debug, Default)]
 pub(crate) struct Material {
-    /// str: The material ID.
+    /// str: The material name.
     ///
     /// This can be, e.g., an ITU identifier.
+    pub(crate) name: String,
+    /// str: The material ID.
+    ///
+    /// This is used to match the material id used in shapes.
     pub(crate) id: String,
-    /// tuple[float, float, float]: The material color, used when plotted.
-    pub(crate) rgb: [f32; 3],
+    /// tuple[float, float, float]: The material color, used for plotting.
+    ///
+    /// The color is obtained from a---possibly-nested---``<rgb>`` element,
+    /// or from a ``<string>`` element with a ``type`` attribute. In the latter
+    /// case, the color is chosen from a predefined list of colors.
+    pub(crate) color: [f32; 3],
+    /// typing.Optional[float]: The thickness of the material.
+    pub(crate) thickness: Option<f32>,
+}
+
+fn deserialize_rgb<'de, D>(deserializer: D) -> Result<[f32; 3], D::Error>
+where
+    D: de::Deserializer<'de>,
+{
+    let value = <String>::deserialize(deserializer)?;
+
+    match value
+        .split_ascii_whitespace()
+        .collect::<Vec<_>>()
+        .as_slice()
+    {
+        [r_str, g_str, b_str] => {
+            let r = r_str.parse().map_err(de::Error::custom)?;
+            let g = g_str.parse().map_err(de::Error::custom)?;
+            let b = b_str.parse().map_err(de::Error::custom)?;
+            Ok([r, g, b])
+        },
+        _ => {
+            Err(de::Error::custom(
+                "value of <rgb> element must contain three floats",
+            ))
+        },
+    }
 }
 
 impl<'de> Deserialize<'de> for Material {
@@ -87,56 +122,129 @@ impl<'de> Deserialize<'de> for Material {
     where
         D: de::Deserializer<'de>,
     {
-        #[derive(Deserialize)]
-        struct RawMaterial {
-            #[serde(rename(deserialize = "@id"))]
-            id: String,
-            #[serde(rename = "$value")]
-            rgb: PossiblyNestedRgb,
-        }
-
-        #[derive(Deserialize)]
+        #[derive(Debug, Deserialize)]
         struct Rgb {
-            #[serde(rename(deserialize = "@value"))]
-            value: String,
+            #[serde(rename(deserialize = "@value"), deserialize_with = "deserialize_rgb")]
+            color: [f32; 3],
         }
 
-        #[derive(Deserialize)]
+        #[derive(Debug, Deserialize)]
         #[serde(rename_all = "snake_case")]
-        enum PossiblyNestedRgb {
-            Rgb {
-                #[serde(rename(deserialize = "@value"))]
-                value: String,
+        struct Bsdf {
+            #[serde(rename = "rgb")]
+            rgb: Rgb,
+        }
+
+        #[derive(Debug)]
+        enum Type {
+            Struct { value: String },
+        }
+
+        quick_xml::impl_deserialize_for_internally_tagged_enum! {
+            Type, "@name",
+            ("type"    => Struct {
+                #[serde(rename = "@value")]
+                 value: String }),
+        }
+
+        #[derive(Debug)]
+        enum Thickness {
+            Struct { value: f32 },
+        }
+
+        quick_xml::impl_deserialize_for_internally_tagged_enum! {
+            Thickness, "@name",
+            ("thickness"    => Struct {
+                #[serde(rename = "@value")]
+                value: f32,
+            }),
+        }
+
+        #[derive(Debug)]
+        enum RawMaterial {
+            TwoSided {
+                id: String,
+                bsdf: Bsdf,
+                //thickness: Option<f32>,
             },
-            Bsdf {
-                rgb: Rgb,
+            ItuRadioMaterial {
+                id: String,
+                r#type: Type,
+                thickness: Option<Thickness>,
             },
         }
 
+        quick_xml::impl_deserialize_for_internally_tagged_enum! {
+            RawMaterial, "@type",
+            ("twosided"    => TwoSided {
+                #[serde(rename = "@id")]
+                id: String,
+                bsdf: Bsdf,
+            }),
+            ("itu-radio-material"  => ItuRadioMaterial {
+                #[serde(rename = "@id")]
+                id: String,
+                #[serde(rename = "string")]
+                r#type: Type,
+                #[serde(skip)]
+                thickness: Option<Thickness>,
+            }),
+        }
+
         let raw_mat = RawMaterial::deserialize(deserializer)?;
 
-        let (id, rgb) = match raw_mat {
-            RawMaterial {
-                id,
-                rgb: PossiblyNestedRgb::Rgb { value },
-            } => (id, value),
-            RawMaterial {
+        match raw_mat {
+            RawMaterial::TwoSided {
                 id,
-                rgb: PossiblyNestedRgb::Bsdf { rgb: Rgb { value } },
-            } => (id, value),
-        };
-
-        match rgb.split_ascii_whitespace().collect::<Vec<_>>().as_slice() {
-            [r_str, g_str, b_str] => {
-                let r = r_str.parse().map_err(de::Error::custom)?;
-                let g = g_str.parse().map_err(de::Error::custom)?;
-                let b = b_str.parse().map_err(de::Error::custom)?;
-                Ok(Material { id, rgb: [r, g, b] })
+                bsdf: Bsdf { rgb: Rgb { color } },
+            } => {
+                Ok(Material {
+                    name: id.strip_prefix("mat-").unwrap_or(&id).to_string(),
+                    id,
+                    color,
+                    thickness: None,
+                })
             },
-            _ => {
-                Err(de::Error::custom(
-                    "value of <rgb> element must contain three floats",
-                ))
+            RawMaterial::ItuRadioMaterial {
+                id,
+                r#type: Type::Struct { value: r#type },
+                thickness,
+            } => {
+                let color = match r#type.as_str() {
+                    // Copied from Sionna-RT's code, to match their colors:
+                    // https://github.com/NVlabs/sionna-rt/blob/main/src/sionna/rt/radio_materials/itu_material.py
+                    // v1.0.0
+                    "marble" => [0.701, 0.644, 0.485],
+                    "concrete" => [0.539, 0.539, 0.539],
+                    "wood" => [0.266, 0.109, 0.060],
+                    "metal" => [0.220, 0.220, 0.254],
+                    "brick" => [0.402, 0.112, 0.087],
+                    "glass" => [0.168, 0.139, 0.509],
+                    "floorboard" => [0.539, 0.386, 0.025],
+                    "ceiling_board" => [0.376, 0.539, 0.117],
+                    "chipboard" => [0.509, 0.159, 0.323],
+                    "plasterboard" => [0.051, 0.539, 0.133],
+                    "plywood" => [0.136, 0.076, 0.539],
+                    "very_dry_ground" => [0.539, 0.319, 0.223],
+                    "medium_dry_ground" => [0.539, 0.181, 0.076],
+                    "wet_ground" => [0.539, 0.027, 0.147],
+                    _ => {
+                        log::warn!(
+                            "unknown material type: {type:#?}, using default color, i.e., black",
+                        );
+                        [0.0, 0.0, 0.0]
+                    },
+                };
+                Ok(Material {
+                    name: format!("itu_{type}"),
+                    id,
+                    color,
+                    thickness: thickness.map(|t| {
+                        match t {
+                            Thickness::Struct { value: thickness } => thickness,
+                        }
+                    }),
+                })
             },
         }
     }
@@ -218,7 +326,10 @@ impl SionnaScene {
     pub(crate) fn load_xml(_: &Bound<'_, PyType>, file: &str) -> PyResult<Self> {
         let input = BufReader::new(File::open(file)?);
         quick_xml::de::from_reader(input).map_err(|err| {
-            PyValueError::new_err(format!("An error occurred while reading XML file: {}", err))
+            PyValueError::new_err(format!(
+                "An error occurred while reading XML file {file:#?}: {}",
+                err
+            ))
         })
     }
 }

{differt_core-0.0.32 → differt_core-0.0.34/differt-core}/src/scene/triangle_scene.rs

@@ -60,10 +60,14 @@ impl TriangleScene {
                 },
             };
 
-            let color = sionna.materials.get(&shape.material_id).map(|mat| mat.rgb);
+            let material = sionna.materials.get(&shape.material_id);
+
+            let color = material.map(|mat| mat.color);
+
+            let material_name = material.map(|mat| mat.name.clone());
 
             other_mesh.set_face_color(color.as_ref());
-            other_mesh.set_face_material(Some(shape.material_id));
+            other_mesh.set_face_material(material_name);
 
             mesh.append(&mut other_mesh);
         }

{differt_core-0.0.32/differt-core → differt_core-0.0.34}/python/differt_core/_differt_core/scene/sionna.pyi

@@ -6,8 +6,10 @@ class SionnaScene:
     def load_xml(cls, file: str) -> SionnaScene: ...
 
 class Material:
+    name: str
     id: str
-    rgb: tuple[float, float, float]
+    color: tuple[float, float, float]
+    thickness: float | None
 
 class Shape:
     type: str

{differt_core-0.0.32 → differt_core-0.0.34}/src/geometry/triangle_mesh.rs

@@ -281,7 +281,10 @@ impl TriangleMesh {
     pub(crate) fn load_obj(_: &Bound<'_, PyType>, filename: &str) -> PyResult<Self> {
         let input = BufReader::new(File::open(filename)?);
         let mut obj: RawObj = parse_obj(input).map_err(|err| {
-            PyValueError::new_err(format!("An error occurred while reading obj file: {}", err))
+            PyValueError::new_err(format!(
+                "An error occurred while reading obj file {filename:#?}: {}",
+                err
+            ))
         })?;
 
         for material_file in obj.material_libraries.iter_mut() {
@@ -317,7 +320,7 @@ impl TriangleMesh {
 
         let header = vertex_parser.read_header(&mut input).map_err(|err| {
             PyValueError::new_err(format!(
-                "An error occurred while reading the header of ply file: {}",
+                "An error occurred while reading the header of ply file {filename:#?}: {}",
                 err
             ))
         })?;
@@ -334,7 +337,7 @@ impl TriangleMesh {
                             .map_err(|err| {
                                 PyValueError::new_err(format!(
                                     "An error occurred while reading the vertex elements of ply \
-                                     file: {}",
+                                     file {filename:#?}: {}",
                                     err
                                 ))
                             })?
@@ -349,7 +352,7 @@ impl TriangleMesh {
                             .map_err(|err| {
                                 PyValueError::new_err(format!(
                                     "An error occurred while reading the face elements of PLY \
-                                     file: {}",
+                                     file {filename:#?}: {}",
                                     err
                                 ))
                             })?
@@ -423,14 +426,16 @@ impl From<RawObj> for TriangleMesh {
                             },
                             Err(e) => {
                                 log::warn!(
-                                    "An error occurred when parsing MTL file {material_file}: {e}."
+                                    "An error occurred when parsing MTL file {material_file:#?}: \
+                                     {e}."
                                 );
                             },
                         }
                     },
                     Err(e) => {
                         log::warn!(
-                            "An error occurred when trying to read MTL file {material_file}: {e}."
+                            "An error occurred when trying to read MTL file {material_file:#?}: \
+                             {e}."
                         );
                     },
                 }
@@ -460,7 +465,7 @@ impl From<RawObj> for TriangleMesh {
                     }
                 } else {
                     log::warn!(
-                        "Material {material_name} was listed in OBJ material libraries, but is \
+                        "Material {material_name:#?} was listed in OBJ material libraries, but is \
                          not present is mesh groups."
                     );
                 }

{differt_core-0.0.32 → differt_core-0.0.34}/src/scene/sionna.rs

@@ -74,12 +74,47 @@ where
 #[pyclass(get_all)]
 #[derive(Clone, Debug, Default)]
 pub(crate) struct Material {
-    /// str: The material ID.
+    /// str: The material name.
     ///
     /// This can be, e.g., an ITU identifier.
+    pub(crate) name: String,
+    /// str: The material ID.
+    ///
+    /// This is used to match the material id used in shapes.
     pub(crate) id: String,
-    /// tuple[float, float, float]: The material color, used when plotted.
-    pub(crate) rgb: [f32; 3],
+    /// tuple[float, float, float]: The material color, used for plotting.
+    ///
+    /// The color is obtained from a---possibly-nested---``<rgb>`` element,
+    /// or from a ``<string>`` element with a ``type`` attribute. In the latter
+    /// case, the color is chosen from a predefined list of colors.
+    pub(crate) color: [f32; 3],
+    /// typing.Optional[float]: The thickness of the material.
+    pub(crate) thickness: Option<f32>,
+}
+
+fn deserialize_rgb<'de, D>(deserializer: D) -> Result<[f32; 3], D::Error>
+where
+    D: de::Deserializer<'de>,
+{
+    let value = <String>::deserialize(deserializer)?;
+
+    match value
+        .split_ascii_whitespace()
+        .collect::<Vec<_>>()
+        .as_slice()
+    {
+        [r_str, g_str, b_str] => {
+            let r = r_str.parse().map_err(de::Error::custom)?;
+            let g = g_str.parse().map_err(de::Error::custom)?;
+            let b = b_str.parse().map_err(de::Error::custom)?;
+            Ok([r, g, b])
+        },
+        _ => {
+            Err(de::Error::custom(
+                "value of <rgb> element must contain three floats",
+            ))
+        },
+    }
 }
 
 impl<'de> Deserialize<'de> for Material {
@@ -87,56 +122,129 @@ impl<'de> Deserialize<'de> for Material {
     where
         D: de::Deserializer<'de>,
     {
-        #[derive(Deserialize)]
-        struct RawMaterial {
-            #[serde(rename(deserialize = "@id"))]
-            id: String,
-            #[serde(rename = "$value")]
-            rgb: PossiblyNestedRgb,
-        }
-
-        #[derive(Deserialize)]
+        #[derive(Debug, Deserialize)]
         struct Rgb {
-            #[serde(rename(deserialize = "@value"))]
-            value: String,
+            #[serde(rename(deserialize = "@value"), deserialize_with = "deserialize_rgb")]
+            color: [f32; 3],
         }
 
-        #[derive(Deserialize)]
+        #[derive(Debug, Deserialize)]
         #[serde(rename_all = "snake_case")]
-        enum PossiblyNestedRgb {
-            Rgb {
-                #[serde(rename(deserialize = "@value"))]
-                value: String,
+        struct Bsdf {
+            #[serde(rename = "rgb")]
+            rgb: Rgb,
+        }
+
+        #[derive(Debug)]
+        enum Type {
+            Struct { value: String },
+        }
+
+        quick_xml::impl_deserialize_for_internally_tagged_enum! {
+            Type, "@name",
+            ("type"    => Struct {
+                #[serde(rename = "@value")]
+                 value: String }),
+        }
+
+        #[derive(Debug)]
+        enum Thickness {
+            Struct { value: f32 },
+        }
+
+        quick_xml::impl_deserialize_for_internally_tagged_enum! {
+            Thickness, "@name",
+            ("thickness"    => Struct {
+                #[serde(rename = "@value")]
+                value: f32,
+            }),
+        }
+
+        #[derive(Debug)]
+        enum RawMaterial {
+            TwoSided {
+                id: String,
+                bsdf: Bsdf,
+                //thickness: Option<f32>,
             },
-            Bsdf {
-                rgb: Rgb,
+            ItuRadioMaterial {
+                id: String,
+                r#type: Type,
+                thickness: Option<Thickness>,
             },
         }
 
+        quick_xml::impl_deserialize_for_internally_tagged_enum! {
+            RawMaterial, "@type",
+            ("twosided"    => TwoSided {
+                #[serde(rename = "@id")]
+                id: String,
+                bsdf: Bsdf,
+            }),
+            ("itu-radio-material"  => ItuRadioMaterial {
+                #[serde(rename = "@id")]
+                id: String,
+                #[serde(rename = "string")]
+                r#type: Type,
+                #[serde(skip)]
+                thickness: Option<Thickness>,
+            }),
+        }
+
         let raw_mat = RawMaterial::deserialize(deserializer)?;
 
-        let (id, rgb) = match raw_mat {
-            RawMaterial {
-                id,
-                rgb: PossiblyNestedRgb::Rgb { value },
-            } => (id, value),
-            RawMaterial {
+        match raw_mat {
+            RawMaterial::TwoSided {
                 id,
-                rgb: PossiblyNestedRgb::Bsdf { rgb: Rgb { value } },
-            } => (id, value),
-        };
-
-        match rgb.split_ascii_whitespace().collect::<Vec<_>>().as_slice() {
-            [r_str, g_str, b_str] => {
-                let r = r_str.parse().map_err(de::Error::custom)?;
-                let g = g_str.parse().map_err(de::Error::custom)?;
-                let b = b_str.parse().map_err(de::Error::custom)?;
-                Ok(Material { id, rgb: [r, g, b] })
+                bsdf: Bsdf { rgb: Rgb { color } },
+            } => {
+                Ok(Material {
+                    name: id.strip_prefix("mat-").unwrap_or(&id).to_string(),
+                    id,
+                    color,
+                    thickness: None,
+                })
             },
-            _ => {
-                Err(de::Error::custom(
-                    "value of <rgb> element must contain three floats",
-                ))
+            RawMaterial::ItuRadioMaterial {
+                id,
+                r#type: Type::Struct { value: r#type },
+                thickness,
+            } => {
+                let color = match r#type.as_str() {
+                    // Copied from Sionna-RT's code, to match their colors:
+                    // https://github.com/NVlabs/sionna-rt/blob/main/src/sionna/rt/radio_materials/itu_material.py
+                    // v1.0.0
+                    "marble" => [0.701, 0.644, 0.485],
+                    "concrete" => [0.539, 0.539, 0.539],
+                    "wood" => [0.266, 0.109, 0.060],
+                    "metal" => [0.220, 0.220, 0.254],
+                    "brick" => [0.402, 0.112, 0.087],
+                    "glass" => [0.168, 0.139, 0.509],
+                    "floorboard" => [0.539, 0.386, 0.025],
+                    "ceiling_board" => [0.376, 0.539, 0.117],
+                    "chipboard" => [0.509, 0.159, 0.323],
+                    "plasterboard" => [0.051, 0.539, 0.133],
+                    "plywood" => [0.136, 0.076, 0.539],
+                    "very_dry_ground" => [0.539, 0.319, 0.223],
+                    "medium_dry_ground" => [0.539, 0.181, 0.076],
+                    "wet_ground" => [0.539, 0.027, 0.147],
+                    _ => {
+                        log::warn!(
+                            "unknown material type: {type:#?}, using default color, i.e., black",
+                        );
+                        [0.0, 0.0, 0.0]
+                    },
+                };
+                Ok(Material {
+                    name: format!("itu_{type}"),
+                    id,
+                    color,
+                    thickness: thickness.map(|t| {
+                        match t {
+                            Thickness::Struct { value: thickness } => thickness,
+                        }
+                    }),
+                })
             },
         }
     }
@@ -218,7 +326,10 @@ impl SionnaScene {
     pub(crate) fn load_xml(_: &Bound<'_, PyType>, file: &str) -> PyResult<Self> {
         let input = BufReader::new(File::open(file)?);
         quick_xml::de::from_reader(input).map_err(|err| {
-            PyValueError::new_err(format!("An error occurred while reading XML file: {}", err))
+            PyValueError::new_err(format!(
+                "An error occurred while reading XML file {file:#?}: {}",
+                err
+            ))
         })
     }
 }

{differt_core-0.0.32/differt-core → differt_core-0.0.34}/src/scene/triangle_scene.rs

@@ -60,10 +60,14 @@ impl TriangleScene {
                 },
             };
 
-            let color = sionna.materials.get(&shape.material_id).map(|mat| mat.rgb);
+            let material = sionna.materials.get(&shape.material_id);
+
+            let color = material.map(|mat| mat.color);
+
+            let material_name = material.map(|mat| mat.name.clone());
 
             other_mesh.set_face_color(color.as_ref());
-            other_mesh.set_face_material(Some(shape.material_id));
+            other_mesh.set_face_material(material_name);
 
             mesh.append(&mut other_mesh);
         }