differt-core 0.9.0__tar.gz → 0.10.0__tar.gz

{differt_core-0.9.0 → differt_core-0.10.0}/Cargo.lock

@@ -247,7 +247,7 @@ checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "differt-core"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "criterion",
  "indexmap",

{differt_core-0.9.0 → differt_core-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: differt-core
-Version: 0.9.0
+Version: 0.10.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{differt_core-0.9.0 → differt_core-0.10.0}/differt-core/Cargo.toml

@@ -37,5 +37,5 @@ unexpected_cfgs = {level = "warn", check-cfg = ['cfg(tarpaulin_include)']}
 edition = "2021"
 name = "differt-core"
 rust-version = "1.78.0"
-version = "0.9.0"
+version = "0.10.0"
 readme = "README.md"

{differt_core-0.9.0 → differt_core-0.10.0}/differt-core/benches/benchmarks/graph_iterators.rs

@@ -1,5 +1,5 @@
 use criterion::{Criterion, Throughput, black_box, criterion_group};
-use differt_core::rt::graph::{complete::CompleteGraph, directed::DiGraph};
+use differt_core::geometry::graph::{complete::CompleteGraph, directed::DiGraph};
 
 const NUM_NODES: usize = 1000;
 const DIRECT_PATH: bool = true;

differt_core-0.9.0/differt-core/src/geometry/triangle_mesh.rs → differt_core-0.10.0/differt-core/src/geometry/mesh.rs

@@ -9,10 +9,10 @@ use pyo3::{exceptions::PyValueError, prelude::*, types::PyType};
 /// A lower-level mesh made of triangles.
 ///
 /// This class should not be used directly, prefer its higher-level version
-/// :class:`differt.geometry.TriangleMesh` instead.
+/// :class:`differt.geometry.Mesh` instead.
 #[derive(Clone, Debug, Default)]
-#[pyclass]
-pub(crate) struct TriangleMesh {
+#[pyclass(subclass)]
+pub(crate) struct Mesh {
     vertices: Vec<[f32; 3]>,
     triangles: Vec<[usize; 3]>,
     face_colors: Option<Vec<[f32; 3]>>,
@@ -77,7 +77,7 @@ impl ply::PropertyAccess for PlyFace {
     }
 }
 
-impl TriangleMesh {
+impl Mesh {
     pub fn get_material_index(&mut self, material_name: Option<String>) -> isize {
         if let Some(material_name) = material_name {
             return self
@@ -122,7 +122,7 @@ impl TriangleMesh {
 }
 
 #[pymethods]
-impl TriangleMesh {
+impl Mesh {
     /// :class:`Float[np.ndarray, 'num_vertices 3']<jaxtyping.Float>`: The array of triangle vertices.
     #[getter]
     fn vertices<'py>(&self, py: Python<'py>) -> Bound<'py, PyArray2<f32>> {
@@ -184,7 +184,7 @@ impl TriangleMesh {
     /// After calling this method, ``other`` will be empty.
     ///
     /// Args:
-    ///     other(TriangleMesh): The mesh to be appended to ``self``.
+    ///     other(Mesh): The mesh to be appended to ``self``.
     pub(crate) fn append(&mut self, other: &mut Self) {
         match (&self.face_colors, &other.face_colors) {
             (None, None) => {},
@@ -268,7 +268,7 @@ impl TriangleMesh {
     ///
     /// Currently, only vertices and triangles are loaded. Triangle normals
     /// are ignored because they are computed with
-    /// :attr:`differt.geometry.TriangleMesh.normals` using
+    /// :attr:`differt.geometry.Mesh.normals` using
     /// JAX so that they can be differentiated with respect to triangle
     /// vertices.
     ///
@@ -276,7 +276,7 @@ impl TriangleMesh {
     ///     file (str): The path to the Wavefront .obj file.
     ///
     /// Returns:
-    ///     TriangleMesh: The corresponding mesh containing only triangles.
+    ///     Mesh: The corresponding mesh containing only triangles.
     #[classmethod]
     pub(crate) fn load_obj(_: &Bound<'_, PyType>, filename: &str) -> PyResult<Self> {
         let input = BufReader::new(File::open(filename)?);
@@ -302,7 +302,7 @@ impl TriangleMesh {
     ///
     /// Currently, only vertices and triangles are loaded. Triangle normals
     /// are ignored because they are computed with
-    /// :attr:`differt.geometry.TriangleMesh.normals` using
+    /// :attr:`differt.geometry.Mesh.normals` using
     /// JAX so that they can be differentiated with respect to triangle
     /// vertices.
     ///
@@ -310,7 +310,7 @@ impl TriangleMesh {
     ///     file (str): The path to the Stanford PLY .ply file.
     ///
     /// Returns:
-    ///     TriangleMesh: The corresponding mesh containing only triangles.
+    ///     Mesh: The corresponding mesh containing only triangles.
     #[classmethod]
     pub(crate) fn load_ply(_: &Bound<'_, PyType>, filename: &str) -> PyResult<Self> {
         let mut input = BufReader::new(File::open(filename)?);
@@ -380,7 +380,7 @@ impl TriangleMesh {
     }
 }
 
-impl From<RawObj> for TriangleMesh {
+impl From<RawObj> for Mesh {
     fn from(mut raw_obj: RawObj) -> Self {
         use obj::raw::object::Polygon::*;
 
@@ -503,7 +503,7 @@ impl From<RawObj> for TriangleMesh {
 
 #[cfg(not(tarpaulin_include))]
 #[pymodule(gil_used = false)]
-pub(crate) fn triangle_mesh(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_class::<TriangleMesh>()?;
+pub(crate) fn mesh(m: Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_class::<Mesh>()?;
     Ok(())
 }

differt_core-0.10.0/differt-core/src/geometry/mod.rs

@@ -0,0 +1,16 @@
+use pyo3::{prelude::*, wrap_pymodule};
+
+pub mod graph;
+pub mod mesh;
+pub mod scene;
+pub mod sionna;
+
+#[cfg(not(tarpaulin_include))]
+#[pymodule(gil_used = false)]
+pub(crate) fn geometry(m: Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_wrapped(wrap_pymodule!(graph::graph))?;
+    m.add_wrapped(wrap_pymodule!(mesh::mesh))?;
+    m.add_wrapped(wrap_pymodule!(scene::scene))?;
+    m.add_wrapped(wrap_pymodule!(sionna::sionna))?;
+    Ok(())
+}

differt_core-0.9.0/differt-core/src/scene/triangle_scene.rs → differt_core-0.10.0/differt-core/src/geometry/scene.rs

@@ -3,29 +3,29 @@ use std::path::PathBuf;
 use pyo3::{exceptions::PyValueError, prelude::*, types::PyType};
 
 use super::sionna::SionnaScene;
-use crate::geometry::triangle_mesh::TriangleMesh;
+use crate::geometry::mesh::Mesh;
 
-/// A scene that contains one mesh, usually being the results of multiple call to :meth:`TriangleMesh.append<differt_core.geometry.TriangleMesh.append>`.
+/// A scene that contains one mesh, usually being the results of multiple call to :meth:`Mesh.append<differt_core.geometry.Mesh.append>`.
 ///
 /// This class is only useful to provide a fast constructor for scenes
 /// created using the Sionna file format.
 #[derive(Clone)]
-#[pyclass]
-struct TriangleScene {
-    /// differt_core.geometry.TriangleMesh: The scene mesh.
+#[pyclass(subclass)]
+struct Scene {
+    /// differt_core.geometry.Mesh: The scene mesh.
     #[pyo3(get)]
-    mesh: TriangleMesh,
+    mesh: Mesh,
 }
 
 #[pymethods]
-impl TriangleScene {
+impl Scene {
     /// Load a scene from a Sionna-compatible XML file.
     ///
     /// Args:
     ///     file (str): The path to the XML file.
     ///
     /// Returns:
-    ///     TriangleScene: The corresponding scene.
+    ///     Scene: The corresponding scene.
     #[classmethod]
     fn load_xml(cls: &Bound<'_, PyType>, file: &str) -> PyResult<Self> {
         // TODO: create a Rust variant without PyType?
@@ -40,9 +40,9 @@ impl TriangleScene {
             ))
         })?;
 
-        let mut mesh = TriangleMesh::default();
+        let mut mesh = Mesh::default();
 
-        let triangle_mesh_py_type = PyType::new::<TriangleMesh>(cls.py());
+        let mesh_py_type = PyType::new::<Mesh>(cls.py());
 
         for (_, shape) in sionna.shapes.into_iter() {
             let mesh_file_path = folder.join(shape.file);
@@ -52,8 +52,8 @@ impl TriangleScene {
                 ))
             })?;
             let mut other_mesh = match shape.r#type.as_str() {
-                "obj" => TriangleMesh::load_obj(&triangle_mesh_py_type, mesh_file)?,
-                "ply" => TriangleMesh::load_ply(&triangle_mesh_py_type, mesh_file)?,
+                "obj" => Mesh::load_obj(&mesh_py_type, mesh_file)?,
+                "ply" => Mesh::load_ply(&mesh_py_type, mesh_file)?,
                 ty => {
                     log::warn!("Unsupported shape type {ty}, skipping.");
                     continue;
@@ -77,7 +77,7 @@ impl TriangleScene {
 
 #[cfg(not(tarpaulin_include))]
 #[pymodule(gil_used = false)]
-pub(crate) fn triangle_scene(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_class::<TriangleScene>()?;
+pub(crate) fn scene(m: Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_class::<Scene>()?;
     Ok(())
 }

{differt_core-0.9.0/src/scene → differt_core-0.10.0/differt-core/src/geometry}/sionna.rs

@@ -8,9 +8,9 @@ use serde::{Deserialize, de};
 ///
 /// Only a subset of the XML file is actually used.
 ///
-/// This class is useless unless converted
-/// to another scene type, like
-/// :class:`TriangleScene<differt.scene.TriangleScene>`.
+/// This scene acts as a bridge between Sionna and DiffeRT,
+/// and is essentially used to quickly load scenes from Sionna
+/// and export them as a :class:`Scene<differt.geometry.Scene>`.
 ///
 /// Warning:
 ///     We are still open to better ways to parse those XML files,

{differt_core-0.9.0 → differt_core-0.10.0/differt-core}/src/lib.rs

@@ -1,8 +1,6 @@
 use pyo3::{prelude::*, wrap_pymodule};
 
 pub mod geometry;
-pub mod rt;
-pub mod scene;
 
 /// Core of DiffeRT module, implemented in Rust.
 #[cfg(not(tarpaulin_include))]
@@ -20,7 +18,5 @@ fn _differt_core(m: Bound<'_, PyModule>) -> PyResult<()> {
     );
     m.add("__version_info__", version_info)?;
     m.add_wrapped(wrap_pymodule!(geometry::geometry))?;
-    m.add_wrapped(wrap_pymodule!(rt::rt))?;
-    m.add_wrapped(wrap_pymodule!(scene::scene))?;
     Ok(())
 }

differt_core-0.10.0/differt-core/tests/geometry/test_core_mesh.py

@@ -0,0 +1,11 @@
+import pytest
+
+
+def test_triangle_mesh_deprecated() -> None:
+    from differt_core.geometry import (  # ruff:ignore[import-outside-top-level]
+        TriangleMesh,
+    )
+
+    with pytest.warns(DeprecationWarning, match="TriangleMesh is deprecated"):
+        with pytest.raises(TypeError):
+            TriangleMesh()

differt_core-0.10.0/differt-core/tests/geometry/test_core_scene.py

@@ -0,0 +1,11 @@
+import pytest
+
+
+def test_triangle_scene_deprecated() -> None:
+    from differt_core.geometry import (  # ruff:ignore[import-outside-top-level]
+        TriangleScene,
+    )
+
+    with pytest.warns(DeprecationWarning, match="TriangleScene is deprecated"):
+        with pytest.raises(TypeError):
+            TriangleScene()

{differt_core-0.9.0/differt-core/tests/rt → differt_core-0.10.0/differt-core/tests/geometry}/test_graph.py

@@ -4,7 +4,7 @@ import re
 import numpy as np
 import pytest
 
-from differt_core.rt._graph import (
+from differt_core.geometry._graph import (
     CompleteGraph,
     DiGraph,
 )
@@ -27,7 +27,7 @@ class TestDiGraph:
             TypeError,
             match="takes 0 positional arguments but 1 was given",
         ):
-            _ = graph.insert_from_and_to_nodes(True)  # noqa: FBT003
+            _ = graph.insert_from_and_to_nodes(True)  # ruff:ignore[boolean-positional-value-in-call]
 
     @pytest.mark.parametrize("fast_mode", [True, False])
     def test_disconnect_nodes(self, fast_mode: bool) -> None:
@@ -154,7 +154,7 @@ class TestDiGraph:
             TypeError,
             match="takes 3 positional arguments but 4 were given",
         ):
-            _ = graph.all_paths(0, 1, 0, True)  # noqa: FBT003
+            _ = graph.all_paths(0, 1, 0, True)  # ruff:ignore[boolean-positional-value-in-call]
 
     @pytest.mark.parametrize(
         ("num_nodes", "depth"),

differt_core-0.9.0/python/differt_core/_differt_core/geometry/triangle_mesh.pyi → differt_core-0.10.0/python/differt_core/_differt_core/geometry/mesh.pyi

@@ -2,7 +2,7 @@
 import numpy as np
 from jaxtyping import Float, Int, UInt
 
-class TriangleMesh:
+class Mesh:
     vertices: Float[np.ndarray, "num_vertices 3"]
     triangles: UInt[np.ndarray, "num_triangles 3"]
     face_colors: Float[np.ndarray, "num_triangles 3"] | None
@@ -10,8 +10,8 @@ class TriangleMesh:
     material_names: list[str]
     object_bounds: UInt[np.ndarray, "num_objects 2"] | None
 
-    def append(self, other: TriangleMesh) -> None: ...
+    def append(self, other: Mesh) -> None: ...
     @classmethod
-    def load_obj(cls, file: str) -> TriangleMesh: ...
+    def load_obj(cls, file: str) -> Mesh: ...
     @classmethod
-    def load_ply(cls, file: str) -> TriangleMesh: ...
+    def load_ply(cls, file: str) -> Mesh: ...

differt_core-0.9.0/python/differt_core/_differt_core/scene/triangle_scene.pyi → differt_core-0.10.0/python/differt_core/_differt_core/geometry/scene.pyi

@@ -1,7 +1,7 @@
 from differt_core.geometry import TriangleMesh
 
-class TriangleScene:
+class Scene:
     mesh: list[TriangleMesh]
 
     @classmethod
-    def load_xml(cls, file: str) -> TriangleScene: ...
+    def load_xml(cls, file: str) -> Scene: ...

{differt_core-0.9.0/python/differt_core/rt → differt_core-0.10.0/python/differt_core/geometry}/__init__.py

@@ -1,4 +1,4 @@
-"""Ray Tracing utilities used by :mod:`differt.rt`."""
+"""Geometry utilities used by :mod:`differt.geometry`."""
 
 __all__ = (
     "AllPathsFromCompleteGraphChunksIter",
@@ -7,6 +7,13 @@ __all__ = (
     "AllPathsFromDiGraphIter",
     "CompleteGraph",
     "DiGraph",
+    "Material",
+    "Mesh",
+    "Scene",
+    "Shape",
+    "SionnaScene",
+    "TriangleMesh",
+    "TriangleScene",
 )
 
 from ._graph import (
@@ -17,3 +24,6 @@ from ._graph import (
     CompleteGraph,
     DiGraph,
 )
+from ._mesh import Mesh, TriangleMesh
+from ._scene import Scene, TriangleScene
+from ._sionna import Material, Shape, SionnaScene

differt_core-0.10.0/python/differt_core/geometry/_graph.py

@@ -0,0 +1,23 @@
+__all__ = (
+    "AllPathsFromCompleteGraphChunksIter",
+    "AllPathsFromCompleteGraphIter",
+    "AllPathsFromDiGraphChunksIter",
+    "AllPathsFromDiGraphIter",
+    "CompleteGraph",
+    "DiGraph",
+)
+
+from differt_core import _differt_core
+
+AllPathsFromCompleteGraphChunksIter = (
+    _differt_core.geometry.graph.AllPathsFromCompleteGraphChunksIter
+)
+AllPathsFromCompleteGraphIter = (
+    _differt_core.geometry.graph.AllPathsFromCompleteGraphIter
+)
+AllPathsFromDiGraphChunksIter = (
+    _differt_core.geometry.graph.AllPathsFromDiGraphChunksIter
+)
+AllPathsFromDiGraphIter = _differt_core.geometry.graph.AllPathsFromDiGraphIter
+CompleteGraph = _differt_core.geometry.graph.CompleteGraph
+DiGraph = _differt_core.geometry.graph.DiGraph

differt_core-0.10.0/python/differt_core/geometry/_mesh.py

@@ -0,0 +1,28 @@
+__all__ = ("Mesh", "TriangleMesh")
+
+
+import warnings
+from typing import Any, Self
+
+from differt_core import _differt_core
+
+Mesh = _differt_core.geometry.mesh.Mesh
+
+
+# Deprecated alias
+class TriangleMesh(Mesh):
+    """
+    Deprecated alias for :class:`Mesh`.
+
+    .. deprecated:: 0.10
+        Use :class:`Mesh` instead.
+    """
+
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
+        """Deprecated constructor."""
+        warnings.warn(
+            "TriangleMesh is deprecated, use Mesh instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return super().__new__(cls, *args, **kwargs)

differt_core-0.10.0/python/differt_core/geometry/_scene.py

@@ -0,0 +1,27 @@
+__all__ = ("Scene", "TriangleScene")
+
+import warnings
+from typing import Any, Self
+
+from differt_core import _differt_core
+
+Scene = _differt_core.geometry.scene.Scene
+
+
+# Deprecated alias
+class TriangleScene(Scene):
+    """
+    Deprecated alias for :class:`Scene`.
+
+    .. deprecated:: 0.10
+        Use :class:`Scene` instead.
+    """
+
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
+        """Deprecated constructor."""
+        warnings.warn(
+            "TriangleScene is deprecated, use Scene instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return super().__new__(cls, *args, **kwargs)

differt_core-0.10.0/python/differt_core/geometry/_sionna.py

@@ -0,0 +1,7 @@
+__all__ = ("Material", "Shape", "SionnaScene")
+
+from differt_core import _differt_core
+
+Material = _differt_core.geometry.sionna.Material
+Shape = _differt_core.geometry.sionna.Shape
+SionnaScene = _differt_core.geometry.sionna.SionnaScene

differt_core-0.9.0/src/geometry/triangle_mesh.rs → differt_core-0.10.0/src/geometry/mesh.rs

@@ -9,10 +9,10 @@ use pyo3::{exceptions::PyValueError, prelude::*, types::PyType};
 /// A lower-level mesh made of triangles.
 ///
 /// This class should not be used directly, prefer its higher-level version
-/// :class:`differt.geometry.TriangleMesh` instead.
+/// :class:`differt.geometry.Mesh` instead.
 #[derive(Clone, Debug, Default)]
-#[pyclass]
-pub(crate) struct TriangleMesh {
+#[pyclass(subclass)]
+pub(crate) struct Mesh {
     vertices: Vec<[f32; 3]>,
     triangles: Vec<[usize; 3]>,
     face_colors: Option<Vec<[f32; 3]>>,
@@ -77,7 +77,7 @@ impl ply::PropertyAccess for PlyFace {
     }
 }
 
-impl TriangleMesh {
+impl Mesh {
     pub fn get_material_index(&mut self, material_name: Option<String>) -> isize {
         if let Some(material_name) = material_name {
             return self
@@ -122,7 +122,7 @@ impl TriangleMesh {
 }
 
 #[pymethods]
-impl TriangleMesh {
+impl Mesh {
     /// :class:`Float[np.ndarray, 'num_vertices 3']<jaxtyping.Float>`: The array of triangle vertices.
     #[getter]
     fn vertices<'py>(&self, py: Python<'py>) -> Bound<'py, PyArray2<f32>> {
@@ -184,7 +184,7 @@ impl TriangleMesh {
     /// After calling this method, ``other`` will be empty.
     ///
     /// Args:
-    ///     other(TriangleMesh): The mesh to be appended to ``self``.
+    ///     other(Mesh): The mesh to be appended to ``self``.
     pub(crate) fn append(&mut self, other: &mut Self) {
         match (&self.face_colors, &other.face_colors) {
             (None, None) => {},
@@ -268,7 +268,7 @@ impl TriangleMesh {
     ///
     /// Currently, only vertices and triangles are loaded. Triangle normals
     /// are ignored because they are computed with
-    /// :attr:`differt.geometry.TriangleMesh.normals` using
+    /// :attr:`differt.geometry.Mesh.normals` using
     /// JAX so that they can be differentiated with respect to triangle
     /// vertices.
     ///
@@ -276,7 +276,7 @@ impl TriangleMesh {
     ///     file (str): The path to the Wavefront .obj file.
     ///
     /// Returns:
-    ///     TriangleMesh: The corresponding mesh containing only triangles.
+    ///     Mesh: The corresponding mesh containing only triangles.
     #[classmethod]
     pub(crate) fn load_obj(_: &Bound<'_, PyType>, filename: &str) -> PyResult<Self> {
         let input = BufReader::new(File::open(filename)?);
@@ -302,7 +302,7 @@ impl TriangleMesh {
     ///
     /// Currently, only vertices and triangles are loaded. Triangle normals
     /// are ignored because they are computed with
-    /// :attr:`differt.geometry.TriangleMesh.normals` using
+    /// :attr:`differt.geometry.Mesh.normals` using
     /// JAX so that they can be differentiated with respect to triangle
     /// vertices.
     ///
@@ -310,7 +310,7 @@ impl TriangleMesh {
     ///     file (str): The path to the Stanford PLY .ply file.
     ///
     /// Returns:
-    ///     TriangleMesh: The corresponding mesh containing only triangles.
+    ///     Mesh: The corresponding mesh containing only triangles.
     #[classmethod]
     pub(crate) fn load_ply(_: &Bound<'_, PyType>, filename: &str) -> PyResult<Self> {
         let mut input = BufReader::new(File::open(filename)?);
@@ -380,7 +380,7 @@ impl TriangleMesh {
     }
 }
 
-impl From<RawObj> for TriangleMesh {
+impl From<RawObj> for Mesh {
     fn from(mut raw_obj: RawObj) -> Self {
         use obj::raw::object::Polygon::*;
 
@@ -503,7 +503,7 @@ impl From<RawObj> for TriangleMesh {
 
 #[cfg(not(tarpaulin_include))]
 #[pymodule(gil_used = false)]
-pub(crate) fn triangle_mesh(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_class::<TriangleMesh>()?;
+pub(crate) fn mesh(m: Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_class::<Mesh>()?;
     Ok(())
 }

differt_core-0.10.0/src/geometry/mod.rs

@@ -0,0 +1,16 @@
+use pyo3::{prelude::*, wrap_pymodule};
+
+pub mod graph;
+pub mod mesh;
+pub mod scene;
+pub mod sionna;
+
+#[cfg(not(tarpaulin_include))]
+#[pymodule(gil_used = false)]
+pub(crate) fn geometry(m: Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_wrapped(wrap_pymodule!(graph::graph))?;
+    m.add_wrapped(wrap_pymodule!(mesh::mesh))?;
+    m.add_wrapped(wrap_pymodule!(scene::scene))?;
+    m.add_wrapped(wrap_pymodule!(sionna::sionna))?;
+    Ok(())
+}

differt_core-0.9.0/src/scene/triangle_scene.rs → differt_core-0.10.0/src/geometry/scene.rs

@@ -3,29 +3,29 @@ use std::path::PathBuf;
 use pyo3::{exceptions::PyValueError, prelude::*, types::PyType};
 
 use super::sionna::SionnaScene;
-use crate::geometry::triangle_mesh::TriangleMesh;
+use crate::geometry::mesh::Mesh;
 
-/// A scene that contains one mesh, usually being the results of multiple call to :meth:`TriangleMesh.append<differt_core.geometry.TriangleMesh.append>`.
+/// A scene that contains one mesh, usually being the results of multiple call to :meth:`Mesh.append<differt_core.geometry.Mesh.append>`.
 ///
 /// This class is only useful to provide a fast constructor for scenes
 /// created using the Sionna file format.
 #[derive(Clone)]
-#[pyclass]
-struct TriangleScene {
-    /// differt_core.geometry.TriangleMesh: The scene mesh.
+#[pyclass(subclass)]
+struct Scene {
+    /// differt_core.geometry.Mesh: The scene mesh.
     #[pyo3(get)]
-    mesh: TriangleMesh,
+    mesh: Mesh,
 }
 
 #[pymethods]
-impl TriangleScene {
+impl Scene {
     /// Load a scene from a Sionna-compatible XML file.
     ///
     /// Args:
     ///     file (str): The path to the XML file.
     ///
     /// Returns:
-    ///     TriangleScene: The corresponding scene.
+    ///     Scene: The corresponding scene.
     #[classmethod]
     fn load_xml(cls: &Bound<'_, PyType>, file: &str) -> PyResult<Self> {
         // TODO: create a Rust variant without PyType?
@@ -40,9 +40,9 @@ impl TriangleScene {
             ))
         })?;
 
-        let mut mesh = TriangleMesh::default();
+        let mut mesh = Mesh::default();
 
-        let triangle_mesh_py_type = PyType::new::<TriangleMesh>(cls.py());
+        let mesh_py_type = PyType::new::<Mesh>(cls.py());
 
         for (_, shape) in sionna.shapes.into_iter() {
             let mesh_file_path = folder.join(shape.file);
@@ -52,8 +52,8 @@ impl TriangleScene {
                 ))
             })?;
             let mut other_mesh = match shape.r#type.as_str() {
-                "obj" => TriangleMesh::load_obj(&triangle_mesh_py_type, mesh_file)?,
-                "ply" => TriangleMesh::load_ply(&triangle_mesh_py_type, mesh_file)?,
+                "obj" => Mesh::load_obj(&mesh_py_type, mesh_file)?,
+                "ply" => Mesh::load_ply(&mesh_py_type, mesh_file)?,
                 ty => {
                     log::warn!("Unsupported shape type {ty}, skipping.");
                     continue;
@@ -77,7 +77,7 @@ impl TriangleScene {
 
 #[cfg(not(tarpaulin_include))]
 #[pymodule(gil_used = false)]
-pub(crate) fn triangle_scene(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_class::<TriangleScene>()?;
+pub(crate) fn scene(m: Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_class::<Scene>()?;
     Ok(())
 }

{differt_core-0.9.0/differt-core/src/scene → differt_core-0.10.0/src/geometry}/sionna.rs

@@ -8,9 +8,9 @@ use serde::{Deserialize, de};
 ///
 /// Only a subset of the XML file is actually used.
 ///
-/// This class is useless unless converted
-/// to another scene type, like
-/// :class:`TriangleScene<differt.scene.TriangleScene>`.
+/// This scene acts as a bridge between Sionna and DiffeRT,
+/// and is essentially used to quickly load scenes from Sionna
+/// and export them as a :class:`Scene<differt.geometry.Scene>`.
 ///
 /// Warning:
 ///     We are still open to better ways to parse those XML files,

{differt_core-0.9.0/differt-core → differt_core-0.10.0}/src/lib.rs

@@ -1,8 +1,6 @@
 use pyo3::{prelude::*, wrap_pymodule};
 
 pub mod geometry;
-pub mod rt;
-pub mod scene;
 
 /// Core of DiffeRT module, implemented in Rust.
 #[cfg(not(tarpaulin_include))]
@@ -20,7 +18,5 @@ fn _differt_core(m: Bound<'_, PyModule>) -> PyResult<()> {
     );
     m.add("__version_info__", version_info)?;
     m.add_wrapped(wrap_pymodule!(geometry::geometry))?;
-    m.add_wrapped(wrap_pymodule!(rt::rt))?;
-    m.add_wrapped(wrap_pymodule!(scene::scene))?;
     Ok(())
 }

differt_core-0.9.0/differt-core/src/geometry/mod.rs

@@ -1,10 +0,0 @@
-use pyo3::{prelude::*, wrap_pymodule};
-
-pub mod triangle_mesh;
-
-#[cfg(not(tarpaulin_include))]
-#[pymodule(gil_used = false)]
-pub(crate) fn geometry(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(triangle_mesh::triangle_mesh))?;
-    Ok(())
-}

differt_core-0.9.0/differt-core/src/rt/mod.rs

@@ -1,10 +0,0 @@
-use pyo3::{prelude::*, wrap_pymodule};
-
-pub mod graph;
-
-#[cfg(not(tarpaulin_include))]
-#[pymodule(gil_used = false)]
-pub(crate) fn rt(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(graph::graph))?;
-    Ok(())
-}

differt_core-0.9.0/differt-core/src/scene/mod.rs

@@ -1,12 +0,0 @@
-use pyo3::{prelude::*, wrap_pymodule};
-
-pub mod sionna;
-pub mod triangle_scene;
-
-#[cfg(not(tarpaulin_include))]
-#[pymodule(gil_used = false)]
-pub(crate) fn scene(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(sionna::sionna))?;
-    m.add_wrapped(wrap_pymodule!(triangle_scene::triangle_scene))?;
-    Ok(())
-}

differt_core-0.9.0/python/differt_core/geometry/__init__.py

@@ -1,5 +0,0 @@
-"""Geometry utilities used by :mod:`differt.geometry`."""
-
-__all__ = ("TriangleMesh",)
-
-from ._triangle_mesh import TriangleMesh

differt_core-0.9.0/python/differt_core/geometry/_triangle_mesh.py

@@ -1,5 +0,0 @@
-__all__ = ("TriangleMesh",)
-
-from differt_core import _differt_core
-
-TriangleMesh = _differt_core.geometry.triangle_mesh.TriangleMesh

differt_core-0.9.0/python/differt_core/rt/_graph.py

@@ -1,19 +0,0 @@
-__all__ = (
-    "AllPathsFromCompleteGraphChunksIter",
-    "AllPathsFromCompleteGraphIter",
-    "AllPathsFromDiGraphChunksIter",
-    "AllPathsFromDiGraphIter",
-    "CompleteGraph",
-    "DiGraph",
-)
-
-from differt_core import _differt_core
-
-AllPathsFromCompleteGraphChunksIter = (
-    _differt_core.rt.graph.AllPathsFromCompleteGraphChunksIter
-)
-AllPathsFromCompleteGraphIter = _differt_core.rt.graph.AllPathsFromCompleteGraphIter
-AllPathsFromDiGraphChunksIter = _differt_core.rt.graph.AllPathsFromDiGraphChunksIter
-AllPathsFromDiGraphIter = _differt_core.rt.graph.AllPathsFromDiGraphIter
-CompleteGraph = _differt_core.rt.graph.CompleteGraph
-DiGraph = _differt_core.rt.graph.DiGraph

differt_core-0.9.0/python/differt_core/scene/__init__.py

@@ -1,6 +0,0 @@
-"""Scene utilities used by :mod:`differt.scene`."""
-
-__all__ = ("Material", "Shape", "SionnaScene", "TriangleScene")
-
-from ._sionna import Material, Shape, SionnaScene
-from ._triangle_scene import TriangleScene

differt_core-0.9.0/python/differt_core/scene/_sionna.py

@@ -1,7 +0,0 @@
-__all__ = ("Material", "Shape", "SionnaScene")
-
-from differt_core import _differt_core
-
-Material = _differt_core.scene.sionna.Material
-Shape = _differt_core.scene.sionna.Shape
-SionnaScene = _differt_core.scene.sionna.SionnaScene

differt_core-0.9.0/python/differt_core/scene/_triangle_scene.py

@@ -1,5 +0,0 @@
-__all__ = ("TriangleScene",)
-
-from differt_core import _differt_core
-
-TriangleScene = _differt_core.scene.triangle_scene.TriangleScene

differt_core-0.9.0/src/geometry/mod.rs

@@ -1,10 +0,0 @@
-use pyo3::{prelude::*, wrap_pymodule};
-
-pub mod triangle_mesh;
-
-#[cfg(not(tarpaulin_include))]
-#[pymodule(gil_used = false)]
-pub(crate) fn geometry(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(triangle_mesh::triangle_mesh))?;
-    Ok(())
-}

differt_core-0.9.0/src/rt/mod.rs

@@ -1,10 +0,0 @@
-use pyo3::{prelude::*, wrap_pymodule};
-
-pub mod graph;
-
-#[cfg(not(tarpaulin_include))]
-#[pymodule(gil_used = false)]
-pub(crate) fn rt(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(graph::graph))?;
-    Ok(())
-}

differt_core-0.9.0/src/scene/mod.rs

@@ -1,12 +0,0 @@
-use pyo3::{prelude::*, wrap_pymodule};
-
-pub mod sionna;
-pub mod triangle_scene;
-
-#[cfg(not(tarpaulin_include))]
-#[pymodule(gil_used = false)]
-pub(crate) fn scene(m: Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(sionna::sionna))?;
-    m.add_wrapped(wrap_pymodule!(triangle_scene::triangle_scene))?;
-    Ok(())
-}

{differt_core-0.9.0 → differt_core-0.10.0}/python/differt_core/__init__.py

@@ -13,11 +13,11 @@ so that one can use :mod:`differt_core` and still be able to differentiate
 its code. We welcome any contribution on that topic!
 """
 
+__all__ = ("__version__", "__version_info__")
+
 from differt_core._differt_core import __version__ as _version
 from differt_core._differt_core import __version_info__ as _version_info
 
-__all__ = ("__version__", "__version_info__")
-
 __version__ = _version
 """The current full version of this module."""
 __version_info__ = _version_info