Ellipsoids -> Ellipsoids3D

Author: teh-cmc

crates/store/re_types/definitions/rerun/archetypes.fbs

@@ -12,7 +12,7 @@ namespace rerun.archetypes;
 /// Opaque and transparent rendering will be supported later.
 ///
 /// \example archetypes/ellipsoid_batch !api title="Batch of ellipsoids"
-table Ellipsoids (
+table Ellipsoids3D (
   "attr.rust.derive": "PartialEq",
   "attr.rust.new_pub_crate",
   "attr.cpp.no_field_ctors",

crates/store/re_types/definitions/rerun/archetypes/ellipsoids.fbs crates/store/re_types/definitions/rerun/archetypes/ellipsoids3d.fbs

@@ -1,9 +1,9 @@
 use crate::components::{HalfSize3D, Position3D};
 
-use super::Ellipsoids;
+use super::Ellipsoids3D;
 
-impl Ellipsoids {
-    /// Creates a new [`Ellipsoids`] for spheres with the given radii.
+impl Ellipsoids3D {
+    /// Creates a new [`Ellipsoids3D`] for spheres with the given radii.
     // Note: This is not a `Radius` component because the `Radius` component is for
     // the on-screen sizes of lines and points.
     #[inline]
@@ -12,7 +12,7 @@ impl Ellipsoids {
         Self::new(radii.into_iter().map(HalfSize3D::splat))
     }
 
-    /// Creates a new [`Ellipsoids`] for spheres with the given [`Self::centers`], and
+    /// Creates a new [`Ellipsoids3D`] for spheres with the given [`Self::centers`], and
     /// [`Self::half_sizes`] all equal to the given radii.
     // Note: This is not a `Radius` component because the `Radius` component is for
     // the on-screen sizes of lines and points.
@@ -25,13 +25,13 @@ impl Ellipsoids {
         Self::new(radii.into_iter().map(HalfSize3D::splat)).with_centers(centers)
     }
 
-    /// Creates a new [`Ellipsoids`] with [`Self::half_sizes`].
+    /// Creates a new [`Ellipsoids3D`] with [`Self::half_sizes`].
     #[inline]
     pub fn from_half_sizes(half_sizes: impl IntoIterator<Item = impl Into<HalfSize3D>>) -> Self {
         Self::new(half_sizes)
     }
 
-    /// Creates a new [`Ellipsoids`] with [`Self::centers`] and [`Self::half_sizes`].
+    /// Creates a new [`Ellipsoids3D`] with [`Self::centers`] and [`Self::half_sizes`].
     #[inline]
     pub fn from_centers_and_half_sizes(
         centers: impl IntoIterator<Item = impl Into<Position3D>>,

crates/store/re_types/src/archetypes/.gitattributes

@@ -4,7 +4,7 @@ use re_renderer::{
     renderer::MeshInstance, LineDrawableBuilder, PickingLayerInstanceId, RenderContext,
 };
 use re_types::{
-    archetypes::Ellipsoids,
+    archetypes::Ellipsoids3D,
     components::{
         ClassId, Color, FillMode, HalfSize3D, KeypointId, Position3D, Radius, Rotation3D, Text,
     },
@@ -32,9 +32,9 @@ use super::{
 
 // ---
 
-pub struct EllipsoidsVisualizer(SpatialViewVisualizerData);
+pub struct Ellipsoids3DVisualizer(SpatialViewVisualizerData);
 
-impl Default for EllipsoidsVisualizer {
+impl Default for Ellipsoids3DVisualizer {
     fn default() -> Self {
         Self(SpatialViewVisualizerData::new(Some(
             SpatialSpaceViewKind::ThreeD,
@@ -44,7 +44,7 @@ impl Default for EllipsoidsVisualizer {
 
 // NOTE: Do not put profile scopes in these methods. They are called for all entities and all
 // timestamps within a time range -- it's _a lot_.
-impl EllipsoidsVisualizer {
+impl Ellipsoids3DVisualizer {
     fn process_labels<'a>(
         entity_path: &'a EntityPath,
         centers: &'a [Position3D],
@@ -83,7 +83,7 @@ impl EllipsoidsVisualizer {
         mesh_instances: &mut Vec<MeshInstance>,
         query: &ViewQuery<'_>,
         ent_context: &SpatialSceneEntityContext<'_>,
-        data: impl Iterator<Item = EllipsoidsComponentData<'a>>,
+        data: impl Iterator<Item = Ellipsoids3DComponentData<'a>>,
         render_ctx: &RenderContext,
     ) -> Result<(), SpaceViewSystemExecutionError> {
         let entity_path = ctx.target_entity_path;
@@ -232,7 +232,7 @@ impl EllipsoidsVisualizer {
 
 // ---
 
-struct EllipsoidsComponentData<'a> {
+struct Ellipsoids3DComponentData<'a> {
     // Point of views
     half_sizes: &'a [HalfSize3D],
 
@@ -248,15 +248,15 @@ struct EllipsoidsComponentData<'a> {
     fill_mode: FillMode,
 }
 
-impl IdentifiedViewSystem for EllipsoidsVisualizer {
+impl IdentifiedViewSystem for Ellipsoids3DVisualizer {
     fn identifier() -> re_viewer_context::ViewSystemIdentifier {
-        "Ellipsoids".into()
+        "Ellipsoids3D".into()
     }
 }
 
-impl VisualizerSystem for EllipsoidsVisualizer {
+impl VisualizerSystem for Ellipsoids3DVisualizer {
     fn visualizer_query_info(&self) -> VisualizerQueryInfo {
-        VisualizerQueryInfo::from_archetype::<Ellipsoids>()
+        VisualizerQueryInfo::from_archetype::<Ellipsoids3D>()
     }
 
     fn filter_visualizable_entities(
@@ -286,7 +286,7 @@ impl VisualizerSystem for EllipsoidsVisualizer {
         // Collects solid (that is, triangles rather than wireframe) instances to be drawn.
         let mut solid_instances: Vec<MeshInstance> = Vec::new();
 
-        super::entity_iterator::process_archetype::<Self, Ellipsoids, _>(
+        super::entity_iterator::process_archetype::<Self, Ellipsoids3D, _>(
             ctx,
             view_query,
             context_systems,
@@ -347,7 +347,7 @@ impl VisualizerSystem for EllipsoidsVisualizer {
                         class_ids,
                         keypoint_ids,
                     )| {
-                        EllipsoidsComponentData {
+                        Ellipsoids3DComponentData {
                             half_sizes,
                             centers: centers.unwrap_or_default(),
                             rotations: rotations.unwrap_or_default(),
@@ -413,10 +413,10 @@ impl VisualizerSystem for EllipsoidsVisualizer {
     }
 }
 
-impl TypedComponentFallbackProvider<Color> for EllipsoidsVisualizer {
+impl TypedComponentFallbackProvider<Color> for Ellipsoids3DVisualizer {
     fn fallback_for(&self, ctx: &QueryContext<'_>) -> Color {
         auto_color_for_entity_path(ctx.target_entity_path)
     }
 }
 
-re_viewer_context::impl_component_fallback_provider!(EllipsoidsVisualizer => [Color]);
+re_viewer_context::impl_component_fallback_provider!(Ellipsoids3DVisualizer => [Color]);