diff --git a/.github/workflows/lsan_suppressions.supp b/.github/workflows/lsan_suppressions.supp index d713001b4fe5..41134dd9a4e3 100644 --- a/.github/workflows/lsan_suppressions.supp +++ b/.github/workflows/lsan_suppressions.supp @@ -1,2 +1 @@ -leak:indicator_arrow_array - +leak:null_arrow_array diff --git a/crates/build/re_types_builder/src/codegen/cpp/mod.rs b/crates/build/re_types_builder/src/codegen/cpp/mod.rs index 953f0ef709b9..96b245555f14 100644 --- a/crates/build/re_types_builder/src/codegen/cpp/mod.rs +++ b/crates/build/re_types_builder/src/codegen/cpp/mod.rs @@ -458,7 +458,6 @@ impl QuotedObject { let mut cpp_includes = Includes::new(obj.fqname.clone(), obj.scope()); cpp_includes.insert_rerun("collection_adapter_builtins.hpp"); hpp_includes.insert_system("utility"); // std::move - hpp_includes.insert_rerun("indicator_component.hpp"); let field_declarations = obj .fields @@ -741,11 +740,6 @@ impl QuotedObject { .iter() .map(|m| m.to_cpp_tokens("e!(#archetype_type_ident))); - let indicator_comment = quote_doc_comment( - "Indicator component, used to identify the archetype when converting to a list of components.", - ); - let indicator_component_fqname = - format!("{}Indicator", obj.fqname).replace("archetypes", "components"); let doc_hide_comment = quote_hide_from_docs(); let deprecated_notice = quote_deprecated_notice(obj); let name_doc_string = @@ -792,12 +786,6 @@ impl QuotedObject { #(#field_declarations;)* public: - static constexpr const char IndicatorComponentType[] = #indicator_component_fqname; - #NEWLINE_TOKEN - #NEWLINE_TOKEN - #indicator_comment - using IndicatorComponent = rerun::components::IndicatorComponent; - #NEWLINE_TOKEN #name_doc_string static constexpr const char ArchetypeName[] = #archetype_name; diff --git a/crates/build/re_types_builder/src/codegen/rust/api.rs b/crates/build/re_types_builder/src/codegen/rust/api.rs index 2148e271d714..69b6b4949c41 100644 --- a/crates/build/re_types_builder/src/codegen/rust/api.rs +++ b/crates/build/re_types_builder/src/codegen/rust/api.rs @@ -1145,48 +1145,15 @@ fn quote_trait_impls_for_archetype(reporter: &Reporter, obj: &Object) -> TokenSt } } }) - .chain(std::iter::once({ - let indicator_component_type = format!( - "{}Indicator", - obj.fqname.replace("archetypes", "components") - ); - - let doc = "Returns the [`ComponentDescriptor`] for the associated indicator component."; - - quote! { - #[doc = #doc] - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: #indicator_component_type.into(), - component_type: None, - } - } - } - })) .collect_vec(); - let archetype_name = format_ident!("{}", obj.name); - let indicator_name = format!("{}Indicator", obj.name); - - let quoted_indicator_name = format_ident!("{indicator_name}"); - let quoted_indicator_doc = - format!("Indicator component for the [`{name}`] [`::re_types_core::Archetype`]"); - let (num_required_descriptors, required_descriptors) = compute_component_descriptors(obj, ATTR_RERUN_COMPONENT_REQUIRED); - let (mut num_recommended_descriptors, mut recommended_descriptors) = + let (num_recommended_descriptors, recommended_descriptors) = compute_component_descriptors(obj, ATTR_RERUN_COMPONENT_RECOMMENDED); let (num_optional_descriptors, optional_descriptors) = compute_component_descriptors(obj, ATTR_RERUN_COMPONENT_OPTIONAL); - num_recommended_descriptors += 1; - recommended_descriptors = quote! { - #recommended_descriptors - #archetype_name::descriptor_indicator(), - }; - let num_components_docstring = quote_doc_line(&format!( "The total number of components in the archetype: {num_required_descriptors} required, {num_recommended_descriptors} recommended, {num_optional_descriptors} optional" )); @@ -1260,12 +1227,7 @@ fn quote_trait_impls_for_archetype(reporter: &Reporter, obj: &Object) -> TokenSt pub const NUM_COMPONENTS: usize = #num_all_descriptors; } - #[doc = #quoted_indicator_doc] - pub type #quoted_indicator_name = ::re_types_core::GenericIndicatorComponent<#name>; - impl ::re_types_core::Archetype for #name { - type Indicator = #quoted_indicator_name; - #[inline] fn name() -> ::re_types_core::ArchetypeName { #fqname.into() @@ -1276,12 +1238,6 @@ fn quote_trait_impls_for_archetype(reporter: &Reporter, obj: &Object) -> TokenSt #display_name } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] // There is no such thing as failing to serialize an indicator. - #quoted_indicator_name::DEFAULT.serialized(Self::descriptor_indicator()).unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_chunk_store/tests/dataframe.rs b/crates/store/re_chunk_store/tests/dataframe.rs index 0a5b5e00da45..0d29ec22b1ab 100644 --- a/crates/store/re_chunk_store/tests/dataframe.rs +++ b/crates/store/re_chunk_store/tests/dataframe.rs @@ -57,7 +57,6 @@ fn schema() -> anyhow::Result<()> { // indicator plays a special role here, because it has the archetype field set to // `None`. Also, indicators will be removed soon anyways. vec![ - MyPoints::descriptor_indicator(), MyPoints::descriptor_colors(), MyPoints::descriptor_labels(), MyPoints::descriptor_points(), diff --git a/crates/store/re_data_loader/src/loader_archetype.rs b/crates/store/re_data_loader/src/loader_archetype.rs index ee627df0bccd..1a901b910b1e 100644 --- a/crates/store/re_data_loader/src/loader_archetype.rs +++ b/crates/store/re_data_loader/src/loader_archetype.rs @@ -2,7 +2,6 @@ use itertools::Either; use re_chunk::{Chunk, RowId}; use re_log_types::{EntityPath, TimePoint}; -use re_types::Archetype; use re_types::ComponentBatch; use re_types::archetypes::{AssetVideo, VideoFrameReference}; use re_types::components::VideoTimestamp; @@ -214,28 +213,14 @@ fn load_video( .to_arrow_list_array() .map_err(re_chunk::ChunkError::from)?; - // Indicator column. - let video_frame_reference_indicators = - ::Indicator::new_array(video_timestamps.len()); - let video_frame_reference_indicators_list_array = video_frame_reference_indicators - .to_arrow_list_array() - .map_err(re_chunk::ChunkError::from)?; - Some(Chunk::from_auto_row_ids( re_chunk::ChunkId::new(), entity_path.clone(), std::iter::once((*video_timeline.name(), time_column)).collect(), - [ - ( - VideoFrameReference::indicator().descriptor.clone(), - video_frame_reference_indicators_list_array, - ), - ( - VideoFrameReference::descriptor_timestamp(), - video_timestamp_list_array, - ), - ] - .into_iter() + std::iter::once(( + VideoFrameReference::descriptor_timestamp(), + video_timestamp_list_array, + )) .collect(), )?) } diff --git a/crates/store/re_log_types/src/example_components.rs b/crates/store/re_log_types/src/example_components.rs index 9073d9e08030..b4eb6fb93d73 100644 --- a/crates/store/re_log_types/src/example_components.rs +++ b/crates/store/re_log_types/src/example_components.rs @@ -54,14 +54,6 @@ impl MyPoints { } } - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.MyPointsIndicator".into(), - component_type: None, - } - } - pub fn update_fields() -> Self { Self::default() } @@ -97,17 +89,6 @@ impl MyPoints { } impl re_types_core::Archetype for MyPoints { - type Indicator = re_types_core::GenericIndicatorComponent; - - fn indicator() -> SerializedComponentBatch { - use re_types_core::ComponentBatch as _; - // These is no such thing as failing to serialized an indicator. - #[allow(clippy::unwrap_used)] - Self::Indicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - fn name() -> re_types_core::ArchetypeName { "example.MyPoints".into() } @@ -121,21 +102,14 @@ impl re_types_core::Archetype for MyPoints { } fn recommended_components() -> std::borrow::Cow<'static, [re_types_core::ComponentDescriptor]> { - vec![ - Self::descriptor_indicator(), - Self::descriptor_colors(), - Self::descriptor_labels(), - ] - .into() + vec![Self::descriptor_colors(), Self::descriptor_labels()].into() } } impl ::re_types_core::AsComponents for MyPoints { #[inline] fn as_serialized_batches(&self) -> Vec { - use ::re_types_core::Archetype as _; [ - Some(Self::indicator()), self.colors.clone(), self.labels.clone(), self.points.clone(), diff --git a/crates/store/re_types/src/archetypes/annotation_context.rs b/crates/store/re_types/src/archetypes/annotation_context.rs index 23d3782087ac..d6e38cf5bf16 100644 --- a/crates/store/re_types/src/archetypes/annotation_context.rs +++ b/crates/store/re_types/src/archetypes/annotation_context.rs @@ -90,46 +90,26 @@ impl AnnotationContext { component_type: Some("rerun.components.AnnotationContext".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.AnnotationContextIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [AnnotationContext::descriptor_context()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [AnnotationContext::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - AnnotationContext::descriptor_context(), - AnnotationContext::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [AnnotationContext::descriptor_context()]); impl AnnotationContext { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`AnnotationContext`] [`::re_types_core::Archetype`] -pub type AnnotationContextIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for AnnotationContext { - type Indicator = AnnotationContextIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.AnnotationContext".into() @@ -140,14 +120,6 @@ impl ::re_types_core::Archetype for AnnotationContext { "Annotation context" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - AnnotationContextIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/arrows2d.rs b/crates/store/re_types/src/archetypes/arrows2d.rs index a159603af788..77dce3e44b62 100644 --- a/crates/store/re_types/src/archetypes/arrows2d.rs +++ b/crates/store/re_types/src/archetypes/arrows2d.rs @@ -187,28 +187,13 @@ impl Arrows2D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Arrows2DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Arrows2D::descriptor_vectors()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - Arrows2D::descriptor_origins(), - Arrows2D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [Arrows2D::descriptor_origins()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = once_cell::sync::Lazy::new(|| { @@ -222,12 +207,11 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = once_cell::sync::Lazy::new(|| { [ Arrows2D::descriptor_vectors(), Arrows2D::descriptor_origins(), - Arrows2D::descriptor_indicator(), Arrows2D::descriptor_radii(), Arrows2D::descriptor_colors(), Arrows2D::descriptor_labels(), @@ -238,16 +222,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = }); impl Arrows2D { - /// The total number of components in the archetype: 1 required, 2 recommended, 6 optional - pub const NUM_COMPONENTS: usize = 9usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 6 optional + pub const NUM_COMPONENTS: usize = 8usize; } -/// Indicator component for the [`Arrows2D`] [`::re_types_core::Archetype`] -pub type Arrows2DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Arrows2D { - type Indicator = Arrows2DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Arrows2D".into() @@ -258,14 +237,6 @@ impl ::re_types_core::Archetype for Arrows2D { "Arrows 2D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Arrows2DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/arrows3d.rs b/crates/store/re_types/src/archetypes/arrows3d.rs index 7efec7d366bf..99336f6196b1 100644 --- a/crates/store/re_types/src/archetypes/arrows3d.rs +++ b/crates/store/re_types/src/archetypes/arrows3d.rs @@ -183,28 +183,13 @@ impl Arrows3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Arrows3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Arrows3D::descriptor_vectors()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - Arrows3D::descriptor_origins(), - Arrows3D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [Arrows3D::descriptor_origins()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -217,12 +202,11 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { [ Arrows3D::descriptor_vectors(), Arrows3D::descriptor_origins(), - Arrows3D::descriptor_indicator(), Arrows3D::descriptor_radii(), Arrows3D::descriptor_colors(), Arrows3D::descriptor_labels(), @@ -232,16 +216,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = }); impl Arrows3D { - /// The total number of components in the archetype: 1 required, 2 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 8usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 7usize; } -/// Indicator component for the [`Arrows3D`] [`::re_types_core::Archetype`] -pub type Arrows3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Arrows3D { - type Indicator = Arrows3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Arrows3D".into() @@ -252,14 +231,6 @@ impl ::re_types_core::Archetype for Arrows3D { "Arrows 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Arrows3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/asset3d.rs b/crates/store/re_types/src/archetypes/asset3d.rs index dd26e5fa6b8f..148a68a7f2bc 100644 --- a/crates/store/re_types/src/archetypes/asset3d.rs +++ b/crates/store/re_types/src/archetypes/asset3d.rs @@ -115,53 +115,32 @@ impl Asset3D { component_type: Some("rerun.components.AlbedoFactor".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Asset3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Asset3D::descriptor_blob()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - Asset3D::descriptor_media_type(), - Asset3D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [Asset3D::descriptor_media_type()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Asset3D::descriptor_albedo_factor()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ Asset3D::descriptor_blob(), Asset3D::descriptor_media_type(), - Asset3D::descriptor_indicator(), Asset3D::descriptor_albedo_factor(), ] }); impl Asset3D { - /// The total number of components in the archetype: 1 required, 2 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`Asset3D`] [`::re_types_core::Archetype`] -pub type Asset3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Asset3D { - type Indicator = Asset3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Asset3D".into() @@ -172,14 +151,6 @@ impl ::re_types_core::Archetype for Asset3D { "Asset 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Asset3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/asset_video.rs b/crates/store/re_types/src/archetypes/asset_video.rs index 959be35b855f..01c3f010189a 100644 --- a/crates/store/re_types/src/archetypes/asset_video.rs +++ b/crates/store/re_types/src/archetypes/asset_video.rs @@ -162,52 +162,31 @@ impl AssetVideo { component_type: Some("rerun.components.MediaType".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.AssetVideoIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [AssetVideo::descriptor_blob()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - AssetVideo::descriptor_media_type(), - AssetVideo::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [AssetVideo::descriptor_media_type()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ AssetVideo::descriptor_blob(), AssetVideo::descriptor_media_type(), - AssetVideo::descriptor_indicator(), ] }); impl AssetVideo { - /// The total number of components in the archetype: 1 required, 2 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`AssetVideo`] [`::re_types_core::Archetype`] -pub type AssetVideoIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for AssetVideo { - type Indicator = AssetVideoIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.AssetVideo".into() @@ -218,14 +197,6 @@ impl ::re_types_core::Archetype for AssetVideo { "Asset video" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - AssetVideoIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/bar_chart.rs b/crates/store/re_types/src/archetypes/bar_chart.rs index ed10e66218c5..d432eba6950c 100644 --- a/crates/store/re_types/src/archetypes/bar_chart.rs +++ b/crates/store/re_types/src/archetypes/bar_chart.rs @@ -80,47 +80,26 @@ impl BarChart { component_type: Some("rerun.components.Color".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.BarChartIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [BarChart::descriptor_values()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [BarChart::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [BarChart::descriptor_color()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = - once_cell::sync::Lazy::new(|| { - [ - BarChart::descriptor_values(), - BarChart::descriptor_indicator(), - BarChart::descriptor_color(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = + once_cell::sync::Lazy::new(|| [BarChart::descriptor_values(), BarChart::descriptor_color()]); impl BarChart { - /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`BarChart`] [`::re_types_core::Archetype`] -pub type BarChartIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for BarChart { - type Indicator = BarChartIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.BarChart".into() @@ -131,14 +110,6 @@ impl ::re_types_core::Archetype for BarChart { "Bar chart" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - BarChartIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/boxes2d.rs b/crates/store/re_types/src/archetypes/boxes2d.rs index 27acb3baa594..ab4a01f5a8d8 100644 --- a/crates/store/re_types/src/archetypes/boxes2d.rs +++ b/crates/store/re_types/src/archetypes/boxes2d.rs @@ -179,29 +179,13 @@ impl Boxes2D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Boxes2DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Boxes2D::descriptor_half_sizes()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = - once_cell::sync::Lazy::new(|| { - [ - Boxes2D::descriptor_centers(), - Boxes2D::descriptor_colors(), - Boxes2D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = + once_cell::sync::Lazy::new(|| [Boxes2D::descriptor_centers(), Boxes2D::descriptor_colors()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -214,13 +198,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = once_cell::sync::Lazy::new(|| { [ Boxes2D::descriptor_half_sizes(), Boxes2D::descriptor_centers(), Boxes2D::descriptor_colors(), - Boxes2D::descriptor_indicator(), Boxes2D::descriptor_radii(), Boxes2D::descriptor_labels(), Boxes2D::descriptor_show_labels(), @@ -230,16 +213,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = }); impl Boxes2D { - /// The total number of components in the archetype: 1 required, 3 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 9usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 8usize; } -/// Indicator component for the [`Boxes2D`] [`::re_types_core::Archetype`] -pub type Boxes2DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Boxes2D { - type Indicator = Boxes2DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Boxes2D".into() @@ -250,14 +228,6 @@ impl ::re_types_core::Archetype for Boxes2D { "Boxes 2D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Boxes2DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/boxes3d.rs b/crates/store/re_types/src/archetypes/boxes3d.rs index 1fbae7c84e8f..53da35f21466 100644 --- a/crates/store/re_types/src/archetypes/boxes3d.rs +++ b/crates/store/re_types/src/archetypes/boxes3d.rs @@ -230,29 +230,13 @@ impl Boxes3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Boxes3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Boxes3D::descriptor_half_sizes()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = - once_cell::sync::Lazy::new(|| { - [ - Boxes3D::descriptor_centers(), - Boxes3D::descriptor_colors(), - Boxes3D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = + once_cell::sync::Lazy::new(|| [Boxes3D::descriptor_centers(), Boxes3D::descriptor_colors()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { @@ -267,13 +251,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 11usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 10usize]> = once_cell::sync::Lazy::new(|| { [ Boxes3D::descriptor_half_sizes(), Boxes3D::descriptor_centers(), Boxes3D::descriptor_colors(), - Boxes3D::descriptor_indicator(), Boxes3D::descriptor_rotation_axis_angles(), Boxes3D::descriptor_quaternions(), Boxes3D::descriptor_radii(), @@ -285,16 +268,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 11usize]> = }); impl Boxes3D { - /// The total number of components in the archetype: 1 required, 3 recommended, 7 optional - pub const NUM_COMPONENTS: usize = 11usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 7 optional + pub const NUM_COMPONENTS: usize = 10usize; } -/// Indicator component for the [`Boxes3D`] [`::re_types_core::Archetype`] -pub type Boxes3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Boxes3D { - type Indicator = Boxes3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Boxes3D".into() @@ -305,14 +283,6 @@ impl ::re_types_core::Archetype for Boxes3D { "Boxes 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Boxes3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/capsules3d.rs b/crates/store/re_types/src/archetypes/capsules3d.rs index 6557233f4de6..28635a6cd6f1 100644 --- a/crates/store/re_types/src/archetypes/capsules3d.rs +++ b/crates/store/re_types/src/archetypes/capsules3d.rs @@ -257,16 +257,6 @@ impl Capsules3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Capsules3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = @@ -277,12 +267,11 @@ static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ Capsules3D::descriptor_translations(), Capsules3D::descriptor_colors(), - Capsules3D::descriptor_indicator(), ] }); @@ -299,14 +288,13 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 12usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 11usize]> = once_cell::sync::Lazy::new(|| { [ Capsules3D::descriptor_lengths(), Capsules3D::descriptor_radii(), Capsules3D::descriptor_translations(), Capsules3D::descriptor_colors(), - Capsules3D::descriptor_indicator(), Capsules3D::descriptor_rotation_axis_angles(), Capsules3D::descriptor_quaternions(), Capsules3D::descriptor_line_radii(), @@ -318,16 +306,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 12usize]> = }); impl Capsules3D { - /// The total number of components in the archetype: 2 required, 3 recommended, 7 optional - pub const NUM_COMPONENTS: usize = 12usize; + /// The total number of components in the archetype: 2 required, 2 recommended, 7 optional + pub const NUM_COMPONENTS: usize = 11usize; } -/// Indicator component for the [`Capsules3D`] [`::re_types_core::Archetype`] -pub type Capsules3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Capsules3D { - type Indicator = Capsules3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Capsules3D".into() @@ -338,14 +321,6 @@ impl ::re_types_core::Archetype for Capsules3D { "Capsules 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Capsules3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/cylinders3d.rs b/crates/store/re_types/src/archetypes/cylinders3d.rs index 44b37d14aeeb..6807b8e08c59 100644 --- a/crates/store/re_types/src/archetypes/cylinders3d.rs +++ b/crates/store/re_types/src/archetypes/cylinders3d.rs @@ -254,16 +254,6 @@ impl Cylinders3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Cylinders3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = @@ -274,12 +264,11 @@ static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ Cylinders3D::descriptor_centers(), Cylinders3D::descriptor_colors(), - Cylinders3D::descriptor_indicator(), ] }); @@ -296,14 +285,13 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 12usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 11usize]> = once_cell::sync::Lazy::new(|| { [ Cylinders3D::descriptor_lengths(), Cylinders3D::descriptor_radii(), Cylinders3D::descriptor_centers(), Cylinders3D::descriptor_colors(), - Cylinders3D::descriptor_indicator(), Cylinders3D::descriptor_rotation_axis_angles(), Cylinders3D::descriptor_quaternions(), Cylinders3D::descriptor_line_radii(), @@ -315,16 +303,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 12usize]> = }); impl Cylinders3D { - /// The total number of components in the archetype: 2 required, 3 recommended, 7 optional - pub const NUM_COMPONENTS: usize = 12usize; + /// The total number of components in the archetype: 2 required, 2 recommended, 7 optional + pub const NUM_COMPONENTS: usize = 11usize; } -/// Indicator component for the [`Cylinders3D`] [`::re_types_core::Archetype`] -pub type Cylinders3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Cylinders3D { - type Indicator = Cylinders3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Cylinders3D".into() @@ -335,14 +318,6 @@ impl ::re_types_core::Archetype for Cylinders3D { "Cylinders 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Cylinders3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/depth_image.rs b/crates/store/re_types/src/archetypes/depth_image.rs index 1542b38cb7b0..549e43beee2e 100644 --- a/crates/store/re_types/src/archetypes/depth_image.rs +++ b/crates/store/re_types/src/archetypes/depth_image.rs @@ -200,16 +200,6 @@ impl DepthImage { component_type: Some("rerun.components.DrawOrder".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.DepthImageIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = @@ -220,8 +210,8 @@ static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [DepthImage::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -234,12 +224,11 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { [ DepthImage::descriptor_buffer(), DepthImage::descriptor_format(), - DepthImage::descriptor_indicator(), DepthImage::descriptor_meter(), DepthImage::descriptor_colormap(), DepthImage::descriptor_depth_range(), @@ -249,16 +238,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = }); impl DepthImage { - /// The total number of components in the archetype: 2 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 8usize; + /// The total number of components in the archetype: 2 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 7usize; } -/// Indicator component for the [`DepthImage`] [`::re_types_core::Archetype`] -pub type DepthImageIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for DepthImage { - type Indicator = DepthImageIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.DepthImage".into() @@ -269,14 +253,6 @@ impl ::re_types_core::Archetype for DepthImage { "Depth image" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - DepthImageIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/ellipsoids3d.rs b/crates/store/re_types/src/archetypes/ellipsoids3d.rs index c81e93a701a9..6a7b4374dd75 100644 --- a/crates/store/re_types/src/archetypes/ellipsoids3d.rs +++ b/crates/store/re_types/src/archetypes/ellipsoids3d.rs @@ -245,27 +245,16 @@ impl Ellipsoids3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Ellipsoids3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Ellipsoids3D::descriptor_half_sizes()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ Ellipsoids3D::descriptor_centers(), Ellipsoids3D::descriptor_colors(), - Ellipsoids3D::descriptor_indicator(), ] }); @@ -282,13 +271,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 11usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 10usize]> = once_cell::sync::Lazy::new(|| { [ Ellipsoids3D::descriptor_half_sizes(), Ellipsoids3D::descriptor_centers(), Ellipsoids3D::descriptor_colors(), - Ellipsoids3D::descriptor_indicator(), Ellipsoids3D::descriptor_rotation_axis_angles(), Ellipsoids3D::descriptor_quaternions(), Ellipsoids3D::descriptor_line_radii(), @@ -300,16 +288,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 11usize]> = }); impl Ellipsoids3D { - /// The total number of components in the archetype: 1 required, 3 recommended, 7 optional - pub const NUM_COMPONENTS: usize = 11usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 7 optional + pub const NUM_COMPONENTS: usize = 10usize; } -/// Indicator component for the [`Ellipsoids3D`] [`::re_types_core::Archetype`] -pub type Ellipsoids3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Ellipsoids3D { - type Indicator = Ellipsoids3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Ellipsoids3D".into() @@ -320,14 +303,6 @@ impl ::re_types_core::Archetype for Ellipsoids3D { "Ellipsoids 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Ellipsoids3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/encoded_image.rs b/crates/store/re_types/src/archetypes/encoded_image.rs index 20effffb1b10..29cb875e7b9e 100644 --- a/crates/store/re_types/src/archetypes/encoded_image.rs +++ b/crates/store/re_types/src/archetypes/encoded_image.rs @@ -115,28 +115,13 @@ impl EncodedImage { component_type: Some("rerun.components.DrawOrder".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.EncodedImageIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [EncodedImage::descriptor_blob()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - EncodedImage::descriptor_media_type(), - EncodedImage::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [EncodedImage::descriptor_media_type()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -146,28 +131,22 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ EncodedImage::descriptor_blob(), EncodedImage::descriptor_media_type(), - EncodedImage::descriptor_indicator(), EncodedImage::descriptor_opacity(), EncodedImage::descriptor_draw_order(), ] }); impl EncodedImage { - /// The total number of components in the archetype: 1 required, 2 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`EncodedImage`] [`::re_types_core::Archetype`] -pub type EncodedImageIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for EncodedImage { - type Indicator = EncodedImageIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.EncodedImage".into() @@ -178,14 +157,6 @@ impl ::re_types_core::Archetype for EncodedImage { "Encoded image" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - EncodedImageIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/geo_line_strings.rs b/crates/store/re_types/src/archetypes/geo_line_strings.rs index 8e099e8e406b..4c6d9f3df256 100644 --- a/crates/store/re_types/src/archetypes/geo_line_strings.rs +++ b/crates/store/re_types/src/archetypes/geo_line_strings.rs @@ -106,54 +106,37 @@ impl GeoLineStrings { component_type: Some("rerun.components.Color".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.GeoLineStringsIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [GeoLineStrings::descriptor_line_strings()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ GeoLineStrings::descriptor_radii(), GeoLineStrings::descriptor_colors(), - GeoLineStrings::descriptor_indicator(), ] }); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ GeoLineStrings::descriptor_line_strings(), GeoLineStrings::descriptor_radii(), GeoLineStrings::descriptor_colors(), - GeoLineStrings::descriptor_indicator(), ] }); impl GeoLineStrings { - /// The total number of components in the archetype: 1 required, 3 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`GeoLineStrings`] [`::re_types_core::Archetype`] -pub type GeoLineStringsIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for GeoLineStrings { - type Indicator = GeoLineStringsIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.GeoLineStrings".into() @@ -164,14 +147,6 @@ impl ::re_types_core::Archetype for GeoLineStrings { "Geo line strings" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - GeoLineStringsIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/geo_points.rs b/crates/store/re_types/src/archetypes/geo_points.rs index dc100d34789a..a2e639fb1c6e 100644 --- a/crates/store/re_types/src/archetypes/geo_points.rs +++ b/crates/store/re_types/src/archetypes/geo_points.rs @@ -114,55 +114,38 @@ impl GeoPoints { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.GeoPointsIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [GeoPoints::descriptor_positions()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ GeoPoints::descriptor_radii(), GeoPoints::descriptor_colors(), - GeoPoints::descriptor_indicator(), ] }); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [GeoPoints::descriptor_class_ids()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ GeoPoints::descriptor_positions(), GeoPoints::descriptor_radii(), GeoPoints::descriptor_colors(), - GeoPoints::descriptor_indicator(), GeoPoints::descriptor_class_ids(), ] }); impl GeoPoints { - /// The total number of components in the archetype: 1 required, 3 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`GeoPoints`] [`::re_types_core::Archetype`] -pub type GeoPointsIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for GeoPoints { - type Indicator = GeoPointsIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.GeoPoints".into() @@ -173,14 +156,6 @@ impl ::re_types_core::Archetype for GeoPoints { "Geo points" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - GeoPointsIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/graph_edges.rs b/crates/store/re_types/src/archetypes/graph_edges.rs index ab94d022fff7..d6032cd8a5d2 100644 --- a/crates/store/re_types/src/archetypes/graph_edges.rs +++ b/crates/store/re_types/src/archetypes/graph_edges.rs @@ -87,52 +87,31 @@ impl GraphEdges { component_type: Some("rerun.components.GraphType".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.GraphEdgesIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [GraphEdges::descriptor_edges()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - GraphEdges::descriptor_graph_type(), - GraphEdges::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [GraphEdges::descriptor_graph_type()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ GraphEdges::descriptor_edges(), GraphEdges::descriptor_graph_type(), - GraphEdges::descriptor_indicator(), ] }); impl GraphEdges { - /// The total number of components in the archetype: 1 required, 2 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`GraphEdges`] [`::re_types_core::Archetype`] -pub type GraphEdgesIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for GraphEdges { - type Indicator = GraphEdgesIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.GraphEdges".into() @@ -143,14 +122,6 @@ impl ::re_types_core::Archetype for GraphEdges { "Graph edges" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - GraphEdgesIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/graph_nodes.rs b/crates/store/re_types/src/archetypes/graph_nodes.rs index 540bfd8c376e..2b468e439e2f 100644 --- a/crates/store/re_types/src/archetypes/graph_nodes.rs +++ b/crates/store/re_types/src/archetypes/graph_nodes.rs @@ -146,23 +146,13 @@ impl GraphNodes { component_type: Some("rerun.components.Radius".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.GraphNodesIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [GraphNodes::descriptor_node_ids()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [GraphNodes::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -175,11 +165,10 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = once_cell::sync::Lazy::new(|| { [ GraphNodes::descriptor_node_ids(), - GraphNodes::descriptor_indicator(), GraphNodes::descriptor_positions(), GraphNodes::descriptor_colors(), GraphNodes::descriptor_labels(), @@ -189,16 +178,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = }); impl GraphNodes { - /// The total number of components in the archetype: 1 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 7usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 6usize; } -/// Indicator component for the [`GraphNodes`] [`::re_types_core::Archetype`] -pub type GraphNodesIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for GraphNodes { - type Indicator = GraphNodesIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.GraphNodes".into() @@ -209,14 +193,6 @@ impl ::re_types_core::Archetype for GraphNodes { "Graph nodes" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - GraphNodesIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/image.rs b/crates/store/re_types/src/archetypes/image.rs index db915cc30321..822677f09946 100644 --- a/crates/store/re_types/src/archetypes/image.rs +++ b/crates/store/re_types/src/archetypes/image.rs @@ -199,49 +199,33 @@ impl Image { component_type: Some("rerun.components.DrawOrder".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.ImageIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| [Image::descriptor_buffer(), Image::descriptor_format()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [Image::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| [Image::descriptor_opacity(), Image::descriptor_draw_order()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ Image::descriptor_buffer(), Image::descriptor_format(), - Image::descriptor_indicator(), Image::descriptor_opacity(), Image::descriptor_draw_order(), ] }); impl Image { - /// The total number of components in the archetype: 2 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 2 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`Image`] [`::re_types_core::Archetype`] -pub type ImageIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Image { - type Indicator = ImageIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Image".into() @@ -252,14 +236,6 @@ impl ::re_types_core::Archetype for Image { "Image" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ImageIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/instance_poses3d.rs b/crates/store/re_types/src/archetypes/instance_poses3d.rs index dbb70003a5da..1c87ecf02953 100644 --- a/crates/store/re_types/src/archetypes/instance_poses3d.rs +++ b/crates/store/re_types/src/archetypes/instance_poses3d.rs @@ -169,23 +169,13 @@ impl InstancePoses3D { component_type: Some("rerun.components.PoseTransformMat3x3".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.InstancePoses3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [InstancePoses3D::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -198,10 +188,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { [ - InstancePoses3D::descriptor_indicator(), InstancePoses3D::descriptor_translations(), InstancePoses3D::descriptor_rotation_axis_angles(), InstancePoses3D::descriptor_quaternions(), @@ -211,16 +200,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = }); impl InstancePoses3D { - /// The total number of components in the archetype: 0 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 6usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 5usize; } -/// Indicator component for the [`InstancePoses3D`] [`::re_types_core::Archetype`] -pub type InstancePoses3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for InstancePoses3D { - type Indicator = InstancePoses3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.InstancePoses3D".into() @@ -231,14 +215,6 @@ impl ::re_types_core::Archetype for InstancePoses3D { "Instance poses 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - InstancePoses3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/line_strips2d.rs b/crates/store/re_types/src/archetypes/line_strips2d.rs index 2a812f6e137c..a79a2476537d 100644 --- a/crates/store/re_types/src/archetypes/line_strips2d.rs +++ b/crates/store/re_types/src/archetypes/line_strips2d.rs @@ -205,27 +205,16 @@ impl LineStrips2D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.LineStrips2DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [LineStrips2D::descriptor_strips()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ LineStrips2D::descriptor_radii(), LineStrips2D::descriptor_colors(), - LineStrips2D::descriptor_indicator(), ] }); @@ -239,13 +228,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { [ LineStrips2D::descriptor_strips(), LineStrips2D::descriptor_radii(), LineStrips2D::descriptor_colors(), - LineStrips2D::descriptor_indicator(), LineStrips2D::descriptor_labels(), LineStrips2D::descriptor_show_labels(), LineStrips2D::descriptor_draw_order(), @@ -254,16 +242,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = }); impl LineStrips2D { - /// The total number of components in the archetype: 1 required, 3 recommended, 4 optional - pub const NUM_COMPONENTS: usize = 8usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 4 optional + pub const NUM_COMPONENTS: usize = 7usize; } -/// Indicator component for the [`LineStrips2D`] [`::re_types_core::Archetype`] -pub type LineStrips2DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for LineStrips2D { - type Indicator = LineStrips2DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.LineStrips2D".into() @@ -274,14 +257,6 @@ impl ::re_types_core::Archetype for LineStrips2D { "Line strips 2D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - LineStrips2DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/line_strips3d.rs b/crates/store/re_types/src/archetypes/line_strips3d.rs index d1dcf3045390..59b5d41c8feb 100644 --- a/crates/store/re_types/src/archetypes/line_strips3d.rs +++ b/crates/store/re_types/src/archetypes/line_strips3d.rs @@ -200,27 +200,16 @@ impl LineStrips3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.LineStrips3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [LineStrips3D::descriptor_strips()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ LineStrips3D::descriptor_radii(), LineStrips3D::descriptor_colors(), - LineStrips3D::descriptor_indicator(), ] }); @@ -233,13 +222,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = once_cell::sync::Lazy::new(|| { [ LineStrips3D::descriptor_strips(), LineStrips3D::descriptor_radii(), LineStrips3D::descriptor_colors(), - LineStrips3D::descriptor_indicator(), LineStrips3D::descriptor_labels(), LineStrips3D::descriptor_show_labels(), LineStrips3D::descriptor_class_ids(), @@ -247,16 +235,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = }); impl LineStrips3D { - /// The total number of components in the archetype: 1 required, 3 recommended, 3 optional - pub const NUM_COMPONENTS: usize = 7usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 3 optional + pub const NUM_COMPONENTS: usize = 6usize; } -/// Indicator component for the [`LineStrips3D`] [`::re_types_core::Archetype`] -pub type LineStrips3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for LineStrips3D { - type Indicator = LineStrips3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.LineStrips3D".into() @@ -267,14 +250,6 @@ impl ::re_types_core::Archetype for LineStrips3D { "Line strips 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - LineStrips3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/mesh3d.rs b/crates/store/re_types/src/archetypes/mesh3d.rs index 17c9516f36c1..67d4f67ce06d 100644 --- a/crates/store/re_types/src/archetypes/mesh3d.rs +++ b/crates/store/re_types/src/archetypes/mesh3d.rs @@ -254,27 +254,16 @@ impl Mesh3D { component_type: Some("rerun.components.ClassId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Mesh3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Mesh3D::descriptor_vertex_positions()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ Mesh3D::descriptor_triangle_indices(), Mesh3D::descriptor_vertex_normals(), - Mesh3D::descriptor_indicator(), ] }); @@ -290,13 +279,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 10usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = once_cell::sync::Lazy::new(|| { [ Mesh3D::descriptor_vertex_positions(), Mesh3D::descriptor_triangle_indices(), Mesh3D::descriptor_vertex_normals(), - Mesh3D::descriptor_indicator(), Mesh3D::descriptor_vertex_colors(), Mesh3D::descriptor_vertex_texcoords(), Mesh3D::descriptor_albedo_factor(), @@ -307,16 +295,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 10usize]> = }); impl Mesh3D { - /// The total number of components in the archetype: 1 required, 3 recommended, 6 optional - pub const NUM_COMPONENTS: usize = 10usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 6 optional + pub const NUM_COMPONENTS: usize = 9usize; } -/// Indicator component for the [`Mesh3D`] [`::re_types_core::Archetype`] -pub type Mesh3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Mesh3D { - type Indicator = Mesh3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Mesh3D".into() @@ -327,14 +310,6 @@ impl ::re_types_core::Archetype for Mesh3D { "Mesh 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Mesh3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/pinhole.rs b/crates/store/re_types/src/archetypes/pinhole.rs index 0ba1b11485d5..de5b60092601 100644 --- a/crates/store/re_types/src/archetypes/pinhole.rs +++ b/crates/store/re_types/src/archetypes/pinhole.rs @@ -189,28 +189,13 @@ impl Pinhole { component_type: Some("rerun.components.ImagePlaneDistance".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.PinholeIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Pinhole::descriptor_image_from_camera()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - Pinhole::descriptor_resolution(), - Pinhole::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [Pinhole::descriptor_resolution()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -220,28 +205,22 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ Pinhole::descriptor_image_from_camera(), Pinhole::descriptor_resolution(), - Pinhole::descriptor_indicator(), Pinhole::descriptor_camera_xyz(), Pinhole::descriptor_image_plane_distance(), ] }); impl Pinhole { - /// The total number of components in the archetype: 1 required, 2 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`Pinhole`] [`::re_types_core::Archetype`] -pub type PinholeIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Pinhole { - type Indicator = PinholeIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Pinhole".into() @@ -252,14 +231,6 @@ impl ::re_types_core::Archetype for Pinhole { "Pinhole" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - PinholeIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/points2d.rs b/crates/store/re_types/src/archetypes/points2d.rs index 7a0899b8c264..2e7d7550577d 100644 --- a/crates/store/re_types/src/archetypes/points2d.rs +++ b/crates/store/re_types/src/archetypes/points2d.rs @@ -240,29 +240,13 @@ impl Points2D { component_type: Some("rerun.components.KeypointId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Points2DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Points2D::descriptor_positions()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = - once_cell::sync::Lazy::new(|| { - [ - Points2D::descriptor_radii(), - Points2D::descriptor_colors(), - Points2D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = + once_cell::sync::Lazy::new(|| [Points2D::descriptor_radii(), Points2D::descriptor_colors()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -275,13 +259,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = once_cell::sync::Lazy::new(|| { [ Points2D::descriptor_positions(), Points2D::descriptor_radii(), Points2D::descriptor_colors(), - Points2D::descriptor_indicator(), Points2D::descriptor_labels(), Points2D::descriptor_show_labels(), Points2D::descriptor_draw_order(), @@ -291,16 +274,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = }); impl Points2D { - /// The total number of components in the archetype: 1 required, 3 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 9usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 8usize; } -/// Indicator component for the [`Points2D`] [`::re_types_core::Archetype`] -pub type Points2DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Points2D { - type Indicator = Points2DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Points2D".into() @@ -311,14 +289,6 @@ impl ::re_types_core::Archetype for Points2D { "Points 2D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Points2DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/points3d.rs b/crates/store/re_types/src/archetypes/points3d.rs index 4a1224cb69c5..8dfc0dc4d8b6 100644 --- a/crates/store/re_types/src/archetypes/points3d.rs +++ b/crates/store/re_types/src/archetypes/points3d.rs @@ -309,29 +309,13 @@ impl Points3D { component_type: Some("rerun.components.KeypointId".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Points3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Points3D::descriptor_positions()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = - once_cell::sync::Lazy::new(|| { - [ - Points3D::descriptor_radii(), - Points3D::descriptor_colors(), - Points3D::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = + once_cell::sync::Lazy::new(|| [Points3D::descriptor_radii(), Points3D::descriptor_colors()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { @@ -343,13 +327,12 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { [ Points3D::descriptor_positions(), Points3D::descriptor_radii(), Points3D::descriptor_colors(), - Points3D::descriptor_indicator(), Points3D::descriptor_labels(), Points3D::descriptor_show_labels(), Points3D::descriptor_class_ids(), @@ -358,16 +341,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = }); impl Points3D { - /// The total number of components in the archetype: 1 required, 3 recommended, 4 optional - pub const NUM_COMPONENTS: usize = 8usize; + /// The total number of components in the archetype: 1 required, 2 recommended, 4 optional + pub const NUM_COMPONENTS: usize = 7usize; } -/// Indicator component for the [`Points3D`] [`::re_types_core::Archetype`] -pub type Points3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Points3D { - type Indicator = Points3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Points3D".into() @@ -378,14 +356,6 @@ impl ::re_types_core::Archetype for Points3D { "Points 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Points3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/recording_info.rs b/crates/store/re_types/src/archetypes/recording_info.rs index cd28d19ea124..e49e2f5513d3 100644 --- a/crates/store/re_types/src/archetypes/recording_info.rs +++ b/crates/store/re_types/src/archetypes/recording_info.rs @@ -55,23 +55,13 @@ impl RecordingInfo { component_type: Some("rerun.components.Name".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.RecordingInfoIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [RecordingInfo::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -81,26 +71,20 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ - RecordingInfo::descriptor_indicator(), RecordingInfo::descriptor_start_time(), RecordingInfo::descriptor_name(), ] }); impl RecordingInfo { - /// The total number of components in the archetype: 0 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`RecordingInfo`] [`::re_types_core::Archetype`] -pub type RecordingInfoIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for RecordingInfo { - type Indicator = RecordingInfoIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.RecordingInfo".into() @@ -111,14 +95,6 @@ impl ::re_types_core::Archetype for RecordingInfo { "Recording info" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - RecordingInfoIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/scalars.rs b/crates/store/re_types/src/archetypes/scalars.rs index 275975bc31d1..313cb1c42e6b 100644 --- a/crates/store/re_types/src/archetypes/scalars.rs +++ b/crates/store/re_types/src/archetypes/scalars.rs @@ -104,46 +104,26 @@ impl Scalars { component_type: Some("rerun.components.Scalar".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.ScalarsIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Scalars::descriptor_scalars()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [Scalars::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - Scalars::descriptor_scalars(), - Scalars::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [Scalars::descriptor_scalars()]); impl Scalars { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`Scalars`] [`::re_types_core::Archetype`] -pub type ScalarsIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Scalars { - type Indicator = ScalarsIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Scalars".into() @@ -154,14 +134,6 @@ impl ::re_types_core::Archetype for Scalars { "Scalars" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ScalarsIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/segmentation_image.rs b/crates/store/re_types/src/archetypes/segmentation_image.rs index 0bd775833488..b7e0610bd536 100644 --- a/crates/store/re_types/src/archetypes/segmentation_image.rs +++ b/crates/store/re_types/src/archetypes/segmentation_image.rs @@ -133,16 +133,6 @@ impl SegmentationImage { component_type: Some("rerun.components.DrawOrder".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.SegmentationImageIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = @@ -153,8 +143,8 @@ static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [SegmentationImage::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -164,28 +154,22 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ SegmentationImage::descriptor_buffer(), SegmentationImage::descriptor_format(), - SegmentationImage::descriptor_indicator(), SegmentationImage::descriptor_opacity(), SegmentationImage::descriptor_draw_order(), ] }); impl SegmentationImage { - /// The total number of components in the archetype: 2 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 2 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`SegmentationImage`] [`::re_types_core::Archetype`] -pub type SegmentationImageIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for SegmentationImage { - type Indicator = SegmentationImageIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.SegmentationImage".into() @@ -196,14 +180,6 @@ impl ::re_types_core::Archetype for SegmentationImage { "Segmentation image" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - SegmentationImageIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/series_lines.rs b/crates/store/re_types/src/archetypes/series_lines.rs index 3efe8180ae17..a324a618ab5a 100644 --- a/crates/store/re_types/src/archetypes/series_lines.rs +++ b/crates/store/re_types/src/archetypes/series_lines.rs @@ -175,23 +175,13 @@ impl SeriesLines { component_type: Some("rerun.components.AggregationPolicy".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.SeriesLinesIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [SeriesLines::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -204,10 +194,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { [ - SeriesLines::descriptor_indicator(), SeriesLines::descriptor_colors(), SeriesLines::descriptor_widths(), SeriesLines::descriptor_names(), @@ -217,16 +206,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = }); impl SeriesLines { - /// The total number of components in the archetype: 0 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 6usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 5usize; } -/// Indicator component for the [`SeriesLines`] [`::re_types_core::Archetype`] -pub type SeriesLinesIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for SeriesLines { - type Indicator = SeriesLinesIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.SeriesLines".into() @@ -237,14 +221,6 @@ impl ::re_types_core::Archetype for SeriesLines { "Series lines" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - SeriesLinesIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/series_points.rs b/crates/store/re_types/src/archetypes/series_points.rs index 246eca969b87..d96e50613991 100644 --- a/crates/store/re_types/src/archetypes/series_points.rs +++ b/crates/store/re_types/src/archetypes/series_points.rs @@ -167,23 +167,13 @@ impl SeriesPoints { component_type: Some("rerun.components.MarkerSize".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.SeriesPointsIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [SeriesPoints::descriptor_markers()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [SeriesPoints::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { @@ -195,11 +185,10 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { [ SeriesPoints::descriptor_markers(), - SeriesPoints::descriptor_indicator(), SeriesPoints::descriptor_colors(), SeriesPoints::descriptor_names(), SeriesPoints::descriptor_visible_series(), @@ -208,16 +197,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = }); impl SeriesPoints { - /// The total number of components in the archetype: 1 required, 1 recommended, 4 optional - pub const NUM_COMPONENTS: usize = 6usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 4 optional + pub const NUM_COMPONENTS: usize = 5usize; } -/// Indicator component for the [`SeriesPoints`] [`::re_types_core::Archetype`] -pub type SeriesPointsIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for SeriesPoints { - type Indicator = SeriesPointsIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.SeriesPoints".into() @@ -228,14 +212,6 @@ impl ::re_types_core::Archetype for SeriesPoints { "Series points" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - SeriesPointsIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/tensor.rs b/crates/store/re_types/src/archetypes/tensor.rs index aa652a803c8a..bd9a08b84810 100644 --- a/crates/store/re_types/src/archetypes/tensor.rs +++ b/crates/store/re_types/src/archetypes/tensor.rs @@ -94,47 +94,26 @@ impl Tensor { component_type: Some("rerun.components.ValueRange".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.TensorIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Tensor::descriptor_data()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [Tensor::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Tensor::descriptor_value_range()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = - once_cell::sync::Lazy::new(|| { - [ - Tensor::descriptor_data(), - Tensor::descriptor_indicator(), - Tensor::descriptor_value_range(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = + once_cell::sync::Lazy::new(|| [Tensor::descriptor_data(), Tensor::descriptor_value_range()]); impl Tensor { - /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`Tensor`] [`::re_types_core::Archetype`] -pub type TensorIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Tensor { - type Indicator = TensorIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Tensor".into() @@ -145,14 +124,6 @@ impl ::re_types_core::Archetype for Tensor { "Tensor" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TensorIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/text_document.rs b/crates/store/re_types/src/archetypes/text_document.rs index 3bf61ae75a71..fda803968be0 100644 --- a/crates/store/re_types/src/archetypes/text_document.rs +++ b/crates/store/re_types/src/archetypes/text_document.rs @@ -127,47 +127,31 @@ impl TextDocument { component_type: Some("rerun.components.MediaType".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.TextDocumentIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [TextDocument::descriptor_text()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [TextDocument::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [TextDocument::descriptor_media_type()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ TextDocument::descriptor_text(), - TextDocument::descriptor_indicator(), TextDocument::descriptor_media_type(), ] }); impl TextDocument { - /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`TextDocument`] [`::re_types_core::Archetype`] -pub type TextDocumentIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for TextDocument { - type Indicator = TextDocumentIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.TextDocument".into() @@ -178,14 +162,6 @@ impl ::re_types_core::Archetype for TextDocument { "Text document" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TextDocumentIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/text_log.rs b/crates/store/re_types/src/archetypes/text_log.rs index 1f9a8d2b69f5..a006ffac3d0f 100644 --- a/crates/store/re_types/src/archetypes/text_log.rs +++ b/crates/store/re_types/src/archetypes/text_log.rs @@ -109,48 +109,32 @@ impl TextLog { component_type: Some("rerun.components.Color".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.TextLogIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [TextLog::descriptor_text()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| [TextLog::descriptor_level(), TextLog::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [TextLog::descriptor_level()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [TextLog::descriptor_color()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ TextLog::descriptor_text(), TextLog::descriptor_level(), - TextLog::descriptor_indicator(), TextLog::descriptor_color(), ] }); impl TextLog { - /// The total number of components in the archetype: 1 required, 2 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`TextLog`] [`::re_types_core::Archetype`] -pub type TextLogIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for TextLog { - type Indicator = TextLogIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.TextLog".into() @@ -161,14 +145,6 @@ impl ::re_types_core::Archetype for TextLog { "Text log" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TextLogIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/transform3d.rs b/crates/store/re_types/src/archetypes/transform3d.rs index ce29ff81e98b..10544aac2dee 100644 --- a/crates/store/re_types/src/archetypes/transform3d.rs +++ b/crates/store/re_types/src/archetypes/transform3d.rs @@ -443,23 +443,13 @@ impl Transform3D { component_type: Some("rerun.components.AxisLength".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.Transform3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [Transform3D::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { @@ -474,10 +464,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { [ - Transform3D::descriptor_indicator(), Transform3D::descriptor_translation(), Transform3D::descriptor_rotation_axis_angle(), Transform3D::descriptor_quaternion(), @@ -489,16 +478,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = }); impl Transform3D { - /// The total number of components in the archetype: 0 required, 1 recommended, 7 optional - pub const NUM_COMPONENTS: usize = 8usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 7 optional + pub const NUM_COMPONENTS: usize = 7usize; } -/// Indicator component for the [`Transform3D`] [`::re_types_core::Archetype`] -pub type Transform3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Transform3D { - type Indicator = Transform3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.Transform3D".into() @@ -509,14 +493,6 @@ impl ::re_types_core::Archetype for Transform3D { "Transform 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - Transform3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/video_frame_reference.rs b/crates/store/re_types/src/archetypes/video_frame_reference.rs index abdfe0e62516..38e713486a2c 100644 --- a/crates/store/re_types/src/archetypes/video_frame_reference.rs +++ b/crates/store/re_types/src/archetypes/video_frame_reference.rs @@ -190,23 +190,13 @@ impl VideoFrameReference { component_type: Some("rerun.components.DrawOrder".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.VideoFrameReferenceIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [VideoFrameReference::descriptor_timestamp()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [VideoFrameReference::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -216,28 +206,21 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ VideoFrameReference::descriptor_timestamp(), - VideoFrameReference::descriptor_indicator(), VideoFrameReference::descriptor_video_reference(), VideoFrameReference::descriptor_draw_order(), ] }); impl VideoFrameReference { - /// The total number of components in the archetype: 1 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`VideoFrameReference`] [`::re_types_core::Archetype`] -pub type VideoFrameReferenceIndicator = - ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for VideoFrameReference { - type Indicator = VideoFrameReferenceIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.VideoFrameReference".into() @@ -248,14 +231,6 @@ impl ::re_types_core::Archetype for VideoFrameReference { "Video frame reference" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - VideoFrameReferenceIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/video_stream.rs b/crates/store/re_types/src/archetypes/video_stream.rs index 4b04f2c8672e..b417b9f210dd 100644 --- a/crates/store/re_types/src/archetypes/video_stream.rs +++ b/crates/store/re_types/src/archetypes/video_stream.rs @@ -102,53 +102,32 @@ impl VideoStream { component_type: Some("rerun.components.DrawOrder".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.VideoStreamIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [VideoStream::descriptor_codec()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - VideoStream::descriptor_sample(), - VideoStream::descriptor_indicator(), - ] - }); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [VideoStream::descriptor_sample()]); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [VideoStream::descriptor_draw_order()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ VideoStream::descriptor_codec(), VideoStream::descriptor_sample(), - VideoStream::descriptor_indicator(), VideoStream::descriptor_draw_order(), ] }); impl VideoStream { - /// The total number of components in the archetype: 1 required, 2 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`VideoStream`] [`::re_types_core::Archetype`] -pub type VideoStreamIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for VideoStream { - type Indicator = VideoStreamIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.VideoStream".into() @@ -159,14 +138,6 @@ impl ::re_types_core::Archetype for VideoStream { "Video stream" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - VideoStreamIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/archetypes/view_coordinates.rs b/crates/store/re_types/src/archetypes/view_coordinates.rs index 98894d60122f..6c0a18e06bda 100644 --- a/crates/store/re_types/src/archetypes/view_coordinates.rs +++ b/crates/store/re_types/src/archetypes/view_coordinates.rs @@ -81,46 +81,26 @@ impl ViewCoordinates { component_type: Some("rerun.components.ViewCoordinates".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.ViewCoordinatesIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [ViewCoordinates::descriptor_xyz()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ViewCoordinates::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - ViewCoordinates::descriptor_xyz(), - ViewCoordinates::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [ViewCoordinates::descriptor_xyz()]); impl ViewCoordinates { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`ViewCoordinates`] [`::re_types_core::Archetype`] -pub type ViewCoordinatesIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ViewCoordinates { - type Indicator = ViewCoordinatesIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.archetypes.ViewCoordinates".into() @@ -131,14 +111,6 @@ impl ::re_types_core::Archetype for ViewCoordinates { "View coordinates" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ViewCoordinatesIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/background.rs b/crates/store/re_types/src/blueprint/archetypes/background.rs index c3b53b0daade..89eaf9bd435a 100644 --- a/crates/store/re_types/src/blueprint/archetypes/background.rs +++ b/crates/store/re_types/src/blueprint/archetypes/background.rs @@ -55,47 +55,31 @@ impl Background { component_type: Some("rerun.components.Color".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.BackgroundIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Background::descriptor_kind()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [Background::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Background::descriptor_color()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ Background::descriptor_kind(), - Background::descriptor_indicator(), Background::descriptor_color(), ] }); impl Background { - /// The total number of components in the archetype: 1 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`Background`] [`::re_types_core::Archetype`] -pub type BackgroundIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for Background { - type Indicator = BackgroundIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.Background".into() @@ -106,14 +90,6 @@ impl ::re_types_core::Archetype for Background { "Background" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - BackgroundIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/container_blueprint.rs b/crates/store/re_types/src/blueprint/archetypes/container_blueprint.rs index 001ba76bd84a..bb1d160c8e23 100644 --- a/crates/store/re_types/src/blueprint/archetypes/container_blueprint.rs +++ b/crates/store/re_types/src/blueprint/archetypes/container_blueprint.rs @@ -161,23 +161,13 @@ impl ContainerBlueprint { component_type: Some("rerun.blueprint.components.GridColumns".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ContainerBlueprintIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [ContainerBlueprint::descriptor_container_kind()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ContainerBlueprint::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> = once_cell::sync::Lazy::new(|| { @@ -192,11 +182,10 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 7usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 8usize]> = once_cell::sync::Lazy::new(|| { [ ContainerBlueprint::descriptor_container_kind(), - ContainerBlueprint::descriptor_indicator(), ContainerBlueprint::descriptor_display_name(), ContainerBlueprint::descriptor_contents(), ContainerBlueprint::descriptor_col_shares(), @@ -208,17 +197,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 9usize]> = }); impl ContainerBlueprint { - /// The total number of components in the archetype: 1 required, 1 recommended, 7 optional - pub const NUM_COMPONENTS: usize = 9usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 7 optional + pub const NUM_COMPONENTS: usize = 8usize; } -/// Indicator component for the [`ContainerBlueprint`] [`::re_types_core::Archetype`] -pub type ContainerBlueprintIndicator = - ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ContainerBlueprint { - type Indicator = ContainerBlueprintIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ContainerBlueprint".into() @@ -229,14 +212,6 @@ impl ::re_types_core::Archetype for ContainerBlueprint { "Container blueprint" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ContainerBlueprintIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/dataframe_query.rs b/crates/store/re_types/src/blueprint/archetypes/dataframe_query.rs index 24935c404298..f16253081204 100644 --- a/crates/store/re_types/src/blueprint/archetypes/dataframe_query.rs +++ b/crates/store/re_types/src/blueprint/archetypes/dataframe_query.rs @@ -104,23 +104,13 @@ impl DataframeQuery { component_type: Some("rerun.blueprint.components.SelectedColumns".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.DataframeQueryIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [DataframeQuery::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -133,10 +123,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { [ - DataframeQuery::descriptor_indicator(), DataframeQuery::descriptor_timeline(), DataframeQuery::descriptor_filter_by_range(), DataframeQuery::descriptor_filter_is_not_null(), @@ -146,16 +135,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = }); impl DataframeQuery { - /// The total number of components in the archetype: 0 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 6usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 5usize; } -/// Indicator component for the [`DataframeQuery`] [`::re_types_core::Archetype`] -pub type DataframeQueryIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for DataframeQuery { - type Indicator = DataframeQueryIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.DataframeQuery".into() @@ -166,14 +150,6 @@ impl ::re_types_core::Archetype for DataframeQuery { "Dataframe query" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - DataframeQueryIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/entity_behavior.rs b/crates/store/re_types/src/blueprint/archetypes/entity_behavior.rs index 2cf31dc736ea..50e4c48384a5 100644 --- a/crates/store/re_types/src/blueprint/archetypes/entity_behavior.rs +++ b/crates/store/re_types/src/blueprint/archetypes/entity_behavior.rs @@ -65,23 +65,13 @@ impl EntityBehavior { component_type: Some("rerun.components.Visible".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.EntityBehaviorIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [EntityBehavior::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -91,26 +81,20 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ - EntityBehavior::descriptor_indicator(), EntityBehavior::descriptor_interactive(), EntityBehavior::descriptor_visible(), ] }); impl EntityBehavior { - /// The total number of components in the archetype: 0 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`EntityBehavior`] [`::re_types_core::Archetype`] -pub type EntityBehaviorIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for EntityBehavior { - type Indicator = EntityBehaviorIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.EntityBehavior".into() @@ -121,14 +105,6 @@ impl ::re_types_core::Archetype for EntityBehavior { "Entity behavior" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - EntityBehaviorIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/force_center.rs b/crates/store/re_types/src/blueprint/archetypes/force_center.rs index aa5a9245f494..d6e8ef7b08fe 100644 --- a/crates/store/re_types/src/blueprint/archetypes/force_center.rs +++ b/crates/store/re_types/src/blueprint/archetypes/force_center.rs @@ -57,23 +57,13 @@ impl ForceCenter { component_type: Some("rerun.blueprint.components.ForceStrength".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ForceCenterIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ForceCenter::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -83,26 +73,20 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ - ForceCenter::descriptor_indicator(), ForceCenter::descriptor_enabled(), ForceCenter::descriptor_strength(), ] }); impl ForceCenter { - /// The total number of components in the archetype: 0 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`ForceCenter`] [`::re_types_core::Archetype`] -pub type ForceCenterIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ForceCenter { - type Indicator = ForceCenterIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ForceCenter".into() @@ -113,14 +97,6 @@ impl ::re_types_core::Archetype for ForceCenter { "Force center" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ForceCenterIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/force_collision_radius.rs b/crates/store/re_types/src/blueprint/archetypes/force_collision_radius.rs index 19803e35ee30..420d9b7914ff 100644 --- a/crates/store/re_types/src/blueprint/archetypes/force_collision_radius.rs +++ b/crates/store/re_types/src/blueprint/archetypes/force_collision_radius.rs @@ -74,23 +74,13 @@ impl ForceCollisionRadius { component_type: Some("rerun.blueprint.components.ForceIterations".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ForceCollisionRadiusIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ForceCollisionRadius::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { @@ -101,10 +91,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ - ForceCollisionRadius::descriptor_indicator(), ForceCollisionRadius::descriptor_enabled(), ForceCollisionRadius::descriptor_strength(), ForceCollisionRadius::descriptor_iterations(), @@ -112,17 +101,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = }); impl ForceCollisionRadius { - /// The total number of components in the archetype: 0 required, 1 recommended, 3 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 3 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`ForceCollisionRadius`] [`::re_types_core::Archetype`] -pub type ForceCollisionRadiusIndicator = - ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ForceCollisionRadius { - type Indicator = ForceCollisionRadiusIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ForceCollisionRadius".into() @@ -133,14 +116,6 @@ impl ::re_types_core::Archetype for ForceCollisionRadius { "Force collision radius" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ForceCollisionRadiusIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/force_link.rs b/crates/store/re_types/src/blueprint/archetypes/force_link.rs index 5f0c79f57205..c625db69e343 100644 --- a/crates/store/re_types/src/blueprint/archetypes/force_link.rs +++ b/crates/store/re_types/src/blueprint/archetypes/force_link.rs @@ -74,23 +74,13 @@ impl ForceLink { component_type: Some("rerun.blueprint.components.ForceIterations".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ForceLinkIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ForceLink::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { @@ -101,10 +91,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ - ForceLink::descriptor_indicator(), ForceLink::descriptor_enabled(), ForceLink::descriptor_distance(), ForceLink::descriptor_iterations(), @@ -112,16 +101,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = }); impl ForceLink { - /// The total number of components in the archetype: 0 required, 1 recommended, 3 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 3 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`ForceLink`] [`::re_types_core::Archetype`] -pub type ForceLinkIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ForceLink { - type Indicator = ForceLinkIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ForceLink".into() @@ -132,14 +116,6 @@ impl ::re_types_core::Archetype for ForceLink { "Force link" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ForceLinkIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/force_many_body.rs b/crates/store/re_types/src/blueprint/archetypes/force_many_body.rs index 0b7f58b61a5d..ef1cbd6833b4 100644 --- a/crates/store/re_types/src/blueprint/archetypes/force_many_body.rs +++ b/crates/store/re_types/src/blueprint/archetypes/force_many_body.rs @@ -62,23 +62,13 @@ impl ForceManyBody { component_type: Some("rerun.blueprint.components.ForceStrength".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ForceManyBodyIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ForceManyBody::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -88,26 +78,20 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ - ForceManyBody::descriptor_indicator(), ForceManyBody::descriptor_enabled(), ForceManyBody::descriptor_strength(), ] }); impl ForceManyBody { - /// The total number of components in the archetype: 0 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`ForceManyBody`] [`::re_types_core::Archetype`] -pub type ForceManyBodyIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ForceManyBody { - type Indicator = ForceManyBodyIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ForceManyBody".into() @@ -118,14 +102,6 @@ impl ::re_types_core::Archetype for ForceManyBody { "Force many body" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ForceManyBodyIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/force_position.rs b/crates/store/re_types/src/blueprint/archetypes/force_position.rs index e4b9d85a2931..839735aab03c 100644 --- a/crates/store/re_types/src/blueprint/archetypes/force_position.rs +++ b/crates/store/re_types/src/blueprint/archetypes/force_position.rs @@ -72,23 +72,13 @@ impl ForcePosition { component_type: Some("rerun.components.Position2D".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ForcePositionIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ForcePosition::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { @@ -99,10 +89,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ - ForcePosition::descriptor_indicator(), ForcePosition::descriptor_enabled(), ForcePosition::descriptor_strength(), ForcePosition::descriptor_position(), @@ -110,16 +99,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = }); impl ForcePosition { - /// The total number of components in the archetype: 0 required, 1 recommended, 3 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 3 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`ForcePosition`] [`::re_types_core::Archetype`] -pub type ForcePositionIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ForcePosition { - type Indicator = ForcePositionIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ForcePosition".into() @@ -130,14 +114,6 @@ impl ::re_types_core::Archetype for ForcePosition { "Force position" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ForcePositionIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/line_grid3d.rs b/crates/store/re_types/src/blueprint/archetypes/line_grid3d.rs index cb41a14f66f8..4f1723b4f88b 100644 --- a/crates/store/re_types/src/blueprint/archetypes/line_grid3d.rs +++ b/crates/store/re_types/src/blueprint/archetypes/line_grid3d.rs @@ -112,23 +112,13 @@ impl LineGrid3D { component_type: Some("rerun.components.Color".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.LineGrid3DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [LineGrid3D::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -141,10 +131,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { [ - LineGrid3D::descriptor_indicator(), LineGrid3D::descriptor_visible(), LineGrid3D::descriptor_spacing(), LineGrid3D::descriptor_plane(), @@ -154,16 +143,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = }); impl LineGrid3D { - /// The total number of components in the archetype: 0 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 6usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 5usize; } -/// Indicator component for the [`LineGrid3D`] [`::re_types_core::Archetype`] -pub type LineGrid3DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for LineGrid3D { - type Indicator = LineGrid3DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.LineGrid3D".into() @@ -174,14 +158,6 @@ impl ::re_types_core::Archetype for LineGrid3D { "Line grid 3D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - LineGrid3DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/map_background.rs b/crates/store/re_types/src/blueprint/archetypes/map_background.rs index 985fdbaf6c89..a2d8ce3e75da 100644 --- a/crates/store/re_types/src/blueprint/archetypes/map_background.rs +++ b/crates/store/re_types/src/blueprint/archetypes/map_background.rs @@ -42,46 +42,26 @@ impl MapBackground { component_type: Some("rerun.blueprint.components.MapProvider".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.MapBackgroundIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [MapBackground::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [MapBackground::descriptor_provider()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - MapBackground::descriptor_indicator(), - MapBackground::descriptor_provider(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [MapBackground::descriptor_provider()]); impl MapBackground { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`MapBackground`] [`::re_types_core::Archetype`] -pub type MapBackgroundIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for MapBackground { - type Indicator = MapBackgroundIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.MapBackground".into() @@ -92,14 +72,6 @@ impl ::re_types_core::Archetype for MapBackground { "Map background" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - MapBackgroundIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/map_zoom.rs b/crates/store/re_types/src/blueprint/archetypes/map_zoom.rs index 23a07d507282..b8ad0e2f8568 100644 --- a/crates/store/re_types/src/blueprint/archetypes/map_zoom.rs +++ b/crates/store/re_types/src/blueprint/archetypes/map_zoom.rs @@ -42,41 +42,26 @@ impl MapZoom { component_type: Some("rerun.blueprint.components.ZoomLevel".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.MapZoomIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [MapZoom::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [MapZoom::descriptor_zoom()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| [MapZoom::descriptor_indicator(), MapZoom::descriptor_zoom()]); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [MapZoom::descriptor_zoom()]); impl MapZoom { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`MapZoom`] [`::re_types_core::Archetype`] -pub type MapZoomIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for MapZoom { - type Indicator = MapZoomIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.MapZoom".into() @@ -87,14 +72,6 @@ impl ::re_types_core::Archetype for MapZoom { "Map zoom" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - MapZoomIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/near_clip_plane.rs b/crates/store/re_types/src/blueprint/archetypes/near_clip_plane.rs index 05a8a992fba5..ac07d425642f 100644 --- a/crates/store/re_types/src/blueprint/archetypes/near_clip_plane.rs +++ b/crates/store/re_types/src/blueprint/archetypes/near_clip_plane.rs @@ -42,46 +42,26 @@ impl NearClipPlane { component_type: Some("rerun.blueprint.components.NearClipPlane".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.NearClipPlaneIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [NearClipPlane::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [NearClipPlane::descriptor_near_clip_plane()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - NearClipPlane::descriptor_indicator(), - NearClipPlane::descriptor_near_clip_plane(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [NearClipPlane::descriptor_near_clip_plane()]); impl NearClipPlane { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`NearClipPlane`] [`::re_types_core::Archetype`] -pub type NearClipPlaneIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for NearClipPlane { - type Indicator = NearClipPlaneIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.NearClipPlane".into() @@ -92,14 +72,6 @@ impl ::re_types_core::Archetype for NearClipPlane { "Near clip plane" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - NearClipPlaneIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/panel_blueprint.rs b/crates/store/re_types/src/blueprint/archetypes/panel_blueprint.rs index 783eb885bdaa..884a68e086e2 100644 --- a/crates/store/re_types/src/blueprint/archetypes/panel_blueprint.rs +++ b/crates/store/re_types/src/blueprint/archetypes/panel_blueprint.rs @@ -40,46 +40,26 @@ impl PanelBlueprint { component_type: Some("rerun.blueprint.components.PanelState".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.PanelBlueprintIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [PanelBlueprint::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [PanelBlueprint::descriptor_state()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - PanelBlueprint::descriptor_indicator(), - PanelBlueprint::descriptor_state(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [PanelBlueprint::descriptor_state()]); impl PanelBlueprint { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`PanelBlueprint`] [`::re_types_core::Archetype`] -pub type PanelBlueprintIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for PanelBlueprint { - type Indicator = PanelBlueprintIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.PanelBlueprint".into() @@ -90,14 +70,6 @@ impl ::re_types_core::Archetype for PanelBlueprint { "Panel blueprint" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - PanelBlueprintIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/plot_legend.rs b/crates/store/re_types/src/blueprint/archetypes/plot_legend.rs index 7f7c13d3a9d8..ade613d8d430 100644 --- a/crates/store/re_types/src/blueprint/archetypes/plot_legend.rs +++ b/crates/store/re_types/src/blueprint/archetypes/plot_legend.rs @@ -59,23 +59,13 @@ impl PlotLegend { component_type: Some("rerun.components.Visible".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.PlotLegendIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [PlotLegend::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -85,26 +75,20 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ - PlotLegend::descriptor_indicator(), PlotLegend::descriptor_corner(), PlotLegend::descriptor_visible(), ] }); impl PlotLegend { - /// The total number of components in the archetype: 0 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`PlotLegend`] [`::re_types_core::Archetype`] -pub type PlotLegendIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for PlotLegend { - type Indicator = PlotLegendIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.PlotLegend".into() @@ -115,14 +99,6 @@ impl ::re_types_core::Archetype for PlotLegend { "Plot legend" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - PlotLegendIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/scalar_axis.rs b/crates/store/re_types/src/blueprint/archetypes/scalar_axis.rs index f6b6756d86d4..3b12d6f35de9 100644 --- a/crates/store/re_types/src/blueprint/archetypes/scalar_axis.rs +++ b/crates/store/re_types/src/blueprint/archetypes/scalar_axis.rs @@ -57,23 +57,13 @@ impl ScalarAxis { component_type: Some("rerun.blueprint.components.LockRangeDuringZoom".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ScalarAxisIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ScalarAxis::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { @@ -83,26 +73,20 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = once_cell::sync::Lazy::new(|| { [ - ScalarAxis::descriptor_indicator(), ScalarAxis::descriptor_range(), ScalarAxis::descriptor_zoom_lock(), ] }); impl ScalarAxis { - /// The total number of components in the archetype: 0 required, 1 recommended, 2 optional - pub const NUM_COMPONENTS: usize = 3usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 2 optional + pub const NUM_COMPONENTS: usize = 2usize; } -/// Indicator component for the [`ScalarAxis`] [`::re_types_core::Archetype`] -pub type ScalarAxisIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ScalarAxis { - type Indicator = ScalarAxisIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ScalarAxis".into() @@ -113,14 +97,6 @@ impl ::re_types_core::Archetype for ScalarAxis { "Scalar axis" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ScalarAxisIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/tensor_scalar_mapping.rs b/crates/store/re_types/src/blueprint/archetypes/tensor_scalar_mapping.rs index b9b9fbe6cd2e..fbab18e0ef12 100644 --- a/crates/store/re_types/src/blueprint/archetypes/tensor_scalar_mapping.rs +++ b/crates/store/re_types/src/blueprint/archetypes/tensor_scalar_mapping.rs @@ -78,23 +78,13 @@ impl TensorScalarMapping { component_type: Some("rerun.components.GammaCorrection".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.TensorScalarMappingIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [TensorScalarMapping::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { @@ -105,10 +95,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { [ - TensorScalarMapping::descriptor_indicator(), TensorScalarMapping::descriptor_mag_filter(), TensorScalarMapping::descriptor_colormap(), TensorScalarMapping::descriptor_gamma(), @@ -116,17 +105,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = }); impl TensorScalarMapping { - /// The total number of components in the archetype: 0 required, 1 recommended, 3 optional - pub const NUM_COMPONENTS: usize = 4usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 3 optional + pub const NUM_COMPONENTS: usize = 3usize; } -/// Indicator component for the [`TensorScalarMapping`] [`::re_types_core::Archetype`] -pub type TensorScalarMappingIndicator = - ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for TensorScalarMapping { - type Indicator = TensorScalarMappingIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.TensorScalarMapping".into() @@ -137,14 +120,6 @@ impl ::re_types_core::Archetype for TensorScalarMapping { "Tensor scalar mapping" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TensorScalarMappingIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/tensor_slice_selection.rs b/crates/store/re_types/src/blueprint/archetypes/tensor_slice_selection.rs index f689211ac4ad..04455b953365 100644 --- a/crates/store/re_types/src/blueprint/archetypes/tensor_slice_selection.rs +++ b/crates/store/re_types/src/blueprint/archetypes/tensor_slice_selection.rs @@ -95,23 +95,13 @@ impl TensorSliceSelection { component_type: Some("rerun.blueprint.components.TensorDimensionIndexSlider".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.TensorSliceSelectionIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [TensorSliceSelection::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { @@ -123,10 +113,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ - TensorSliceSelection::descriptor_indicator(), TensorSliceSelection::descriptor_width(), TensorSliceSelection::descriptor_height(), TensorSliceSelection::descriptor_indices(), @@ -135,17 +124,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = }); impl TensorSliceSelection { - /// The total number of components in the archetype: 0 required, 1 recommended, 4 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 4 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`TensorSliceSelection`] [`::re_types_core::Archetype`] -pub type TensorSliceSelectionIndicator = - ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for TensorSliceSelection { - type Indicator = TensorSliceSelectionIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.TensorSliceSelection".into() @@ -156,14 +139,6 @@ impl ::re_types_core::Archetype for TensorSliceSelection { "Tensor slice selection" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TensorSliceSelectionIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/tensor_view_fit.rs b/crates/store/re_types/src/blueprint/archetypes/tensor_view_fit.rs index 81e3b9c4b638..4d2b2a2d1439 100644 --- a/crates/store/re_types/src/blueprint/archetypes/tensor_view_fit.rs +++ b/crates/store/re_types/src/blueprint/archetypes/tensor_view_fit.rs @@ -40,46 +40,26 @@ impl TensorViewFit { component_type: Some("rerun.blueprint.components.ViewFit".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.TensorViewFitIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [TensorViewFit::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [TensorViewFit::descriptor_scaling()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - TensorViewFit::descriptor_indicator(), - TensorViewFit::descriptor_scaling(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [TensorViewFit::descriptor_scaling()]); impl TensorViewFit { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`TensorViewFit`] [`::re_types_core::Archetype`] -pub type TensorViewFitIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for TensorViewFit { - type Indicator = TensorViewFitIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.TensorViewFit".into() @@ -90,14 +70,6 @@ impl ::re_types_core::Archetype for TensorViewFit { "Tensor view fit" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TensorViewFitIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/time_axis.rs b/crates/store/re_types/src/blueprint/archetypes/time_axis.rs index d7a21a353b98..1ad48b1bb025 100644 --- a/crates/store/re_types/src/blueprint/archetypes/time_axis.rs +++ b/crates/store/re_types/src/blueprint/archetypes/time_axis.rs @@ -40,46 +40,26 @@ impl TimeAxis { component_type: Some("rerun.blueprint.components.LinkAxis".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.TimeAxisIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [TimeAxis::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [TimeAxis::descriptor_link()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - TimeAxis::descriptor_indicator(), - TimeAxis::descriptor_link(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [TimeAxis::descriptor_link()]); impl TimeAxis { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`TimeAxis`] [`::re_types_core::Archetype`] -pub type TimeAxisIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for TimeAxis { - type Indicator = TimeAxisIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.TimeAxis".into() @@ -90,14 +70,6 @@ impl ::re_types_core::Archetype for TimeAxis { "Time axis" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - TimeAxisIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/view_blueprint.rs b/crates/store/re_types/src/blueprint/archetypes/view_blueprint.rs index 45a7651faea1..6f811fab5028 100644 --- a/crates/store/re_types/src/blueprint/archetypes/view_blueprint.rs +++ b/crates/store/re_types/src/blueprint/archetypes/view_blueprint.rs @@ -93,23 +93,13 @@ impl ViewBlueprint { component_type: Some("rerun.components.Visible".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ViewBlueprintIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [ViewBlueprint::descriptor_class_identifier()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ViewBlueprint::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> = once_cell::sync::Lazy::new(|| { @@ -120,11 +110,10 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 3usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 4usize]> = once_cell::sync::Lazy::new(|| { [ ViewBlueprint::descriptor_class_identifier(), - ViewBlueprint::descriptor_indicator(), ViewBlueprint::descriptor_display_name(), ViewBlueprint::descriptor_space_origin(), ViewBlueprint::descriptor_visible(), @@ -132,16 +121,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = }); impl ViewBlueprint { - /// The total number of components in the archetype: 1 required, 1 recommended, 3 optional - pub const NUM_COMPONENTS: usize = 5usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 3 optional + pub const NUM_COMPONENTS: usize = 4usize; } -/// Indicator component for the [`ViewBlueprint`] [`::re_types_core::Archetype`] -pub type ViewBlueprintIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ViewBlueprint { - type Indicator = ViewBlueprintIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ViewBlueprint".into() @@ -152,14 +136,6 @@ impl ::re_types_core::Archetype for ViewBlueprint { "View blueprint" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ViewBlueprintIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/view_contents.rs b/crates/store/re_types/src/blueprint/archetypes/view_contents.rs index 27a61ad37372..a6b6c85103c1 100644 --- a/crates/store/re_types/src/blueprint/archetypes/view_contents.rs +++ b/crates/store/re_types/src/blueprint/archetypes/view_contents.rs @@ -79,46 +79,26 @@ impl ViewContents { component_type: Some("rerun.blueprint.components.QueryExpression".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ViewContentsIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ViewContents::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [ViewContents::descriptor_query()]); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - ViewContents::descriptor_indicator(), - ViewContents::descriptor_query(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [ViewContents::descriptor_query()]); impl ViewContents { - /// The total number of components in the archetype: 0 required, 1 recommended, 1 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 1 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`ViewContents`] [`::re_types_core::Archetype`] -pub type ViewContentsIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ViewContents { - type Indicator = ViewContentsIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ViewContents".into() @@ -129,14 +109,6 @@ impl ::re_types_core::Archetype for ViewContents { "View contents" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ViewContentsIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/viewport_blueprint.rs b/crates/store/re_types/src/blueprint/archetypes/viewport_blueprint.rs index ae01a96a427a..71b33321ee3b 100644 --- a/crates/store/re_types/src/blueprint/archetypes/viewport_blueprint.rs +++ b/crates/store/re_types/src/blueprint/archetypes/viewport_blueprint.rs @@ -112,23 +112,13 @@ impl ViewportBlueprint { component_type: Some("rerun.blueprint.components.ViewerRecommendationHash".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.ViewportBlueprintIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [ViewportBlueprint::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { @@ -141,10 +131,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 5usize]> = once_cell::sync::Lazy::new(|| { [ - ViewportBlueprint::descriptor_indicator(), ViewportBlueprint::descriptor_root_container(), ViewportBlueprint::descriptor_maximized(), ViewportBlueprint::descriptor_auto_layout(), @@ -154,16 +143,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 6usize]> = }); impl ViewportBlueprint { - /// The total number of components in the archetype: 0 required, 1 recommended, 5 optional - pub const NUM_COMPONENTS: usize = 6usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 5 optional + pub const NUM_COMPONENTS: usize = 5usize; } -/// Indicator component for the [`ViewportBlueprint`] [`::re_types_core::Archetype`] -pub type ViewportBlueprintIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for ViewportBlueprint { - type Indicator = ViewportBlueprintIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.ViewportBlueprint".into() @@ -174,14 +158,6 @@ impl ::re_types_core::Archetype for ViewportBlueprint { "Viewport blueprint" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ViewportBlueprintIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/visible_time_ranges.rs b/crates/store/re_types/src/blueprint/archetypes/visible_time_ranges.rs index 96eeb7ed79be..e4641c94e26d 100644 --- a/crates/store/re_types/src/blueprint/archetypes/visible_time_ranges.rs +++ b/crates/store/re_types/src/blueprint/archetypes/visible_time_ranges.rs @@ -50,46 +50,26 @@ impl VisibleTimeRanges { component_type: Some("rerun.blueprint.components.VisibleTimeRange".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.VisibleTimeRangesIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [VisibleTimeRanges::descriptor_ranges()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [VisibleTimeRanges::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - VisibleTimeRanges::descriptor_ranges(), - VisibleTimeRanges::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [VisibleTimeRanges::descriptor_ranges()]); impl VisibleTimeRanges { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`VisibleTimeRanges`] [`::re_types_core::Archetype`] -pub type VisibleTimeRangesIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for VisibleTimeRanges { - type Indicator = VisibleTimeRangesIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.VisibleTimeRanges".into() @@ -100,14 +80,6 @@ impl ::re_types_core::Archetype for VisibleTimeRanges { "Visible time ranges" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - VisibleTimeRangesIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/visual_bounds2d.rs b/crates/store/re_types/src/blueprint/archetypes/visual_bounds2d.rs index 5ac9537af34c..4a47b57d912b 100644 --- a/crates/store/re_types/src/blueprint/archetypes/visual_bounds2d.rs +++ b/crates/store/re_types/src/blueprint/archetypes/visual_bounds2d.rs @@ -48,46 +48,26 @@ impl VisualBounds2D { component_type: Some("rerun.blueprint.components.VisualBounds2D".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.VisualBounds2DIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [VisualBounds2D::descriptor_range()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [VisualBounds2D::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - VisualBounds2D::descriptor_range(), - VisualBounds2D::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [VisualBounds2D::descriptor_range()]); impl VisualBounds2D { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`VisualBounds2D`] [`::re_types_core::Archetype`] -pub type VisualBounds2DIndicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for VisualBounds2D { - type Indicator = VisualBounds2DIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.VisualBounds2D".into() @@ -98,14 +78,6 @@ impl ::re_types_core::Archetype for VisualBounds2D { "Visual bounds 2D" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - VisualBounds2DIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/blueprint/archetypes/visualizer_overrides.rs b/crates/store/re_types/src/blueprint/archetypes/visualizer_overrides.rs index 4c5c45e07634..e72c6d35d4a0 100644 --- a/crates/store/re_types/src/blueprint/archetypes/visualizer_overrides.rs +++ b/crates/store/re_types/src/blueprint/archetypes/visualizer_overrides.rs @@ -50,47 +50,26 @@ impl VisualizerOverrides { component_type: Some("rerun.blueprint.components.VisualizerOverride".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.blueprint.components.VisualizerOverridesIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [VisualizerOverrides::descriptor_ranges()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [VisualizerOverrides::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - VisualizerOverrides::descriptor_ranges(), - VisualizerOverrides::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [VisualizerOverrides::descriptor_ranges()]); impl VisualizerOverrides { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`VisualizerOverrides`] [`::re_types_core::Archetype`] -pub type VisualizerOverridesIndicator = - ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for VisualizerOverrides { - type Indicator = VisualizerOverridesIndicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.blueprint.archetypes.VisualizerOverrides".into() @@ -101,14 +80,6 @@ impl ::re_types_core::Archetype for VisualizerOverrides { "Visualizer overrides" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - VisualizerOverridesIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/testing/archetypes/affix_fuzzer1.rs b/crates/store/re_types/src/testing/archetypes/affix_fuzzer1.rs index 85c1b9babafd..484e3209a025 100644 --- a/crates/store/re_types/src/testing/archetypes/affix_fuzzer1.rs +++ b/crates/store/re_types/src/testing/archetypes/affix_fuzzer1.rs @@ -309,16 +309,6 @@ impl AffixFuzzer1 { component_type: Some("rerun.testing.components.AffixFuzzer22".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.testing.components.AffixFuzzer1Indicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 22usize]> = @@ -349,13 +339,13 @@ static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 22usize] ] }); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [AffixFuzzer1::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 23usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 22usize]> = once_cell::sync::Lazy::new(|| { [ AffixFuzzer1::descriptor_fuzz1001(), @@ -380,21 +370,15 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 23usize]> = AffixFuzzer1::descriptor_fuzz1020(), AffixFuzzer1::descriptor_fuzz1021(), AffixFuzzer1::descriptor_fuzz1022(), - AffixFuzzer1::descriptor_indicator(), ] }); impl AffixFuzzer1 { - /// The total number of components in the archetype: 22 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 23usize; + /// The total number of components in the archetype: 22 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 22usize; } -/// Indicator component for the [`AffixFuzzer1`] [`::re_types_core::Archetype`] -pub type AffixFuzzer1Indicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for AffixFuzzer1 { - type Indicator = AffixFuzzer1Indicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.testing.archetypes.AffixFuzzer1".into() @@ -405,14 +389,6 @@ impl ::re_types_core::Archetype for AffixFuzzer1 { "Affix fuzzer 1" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - AffixFuzzer1Indicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/testing/archetypes/affix_fuzzer2.rs b/crates/store/re_types/src/testing/archetypes/affix_fuzzer2.rs index 68ef49971365..62106ea8b0cd 100644 --- a/crates/store/re_types/src/testing/archetypes/affix_fuzzer2.rs +++ b/crates/store/re_types/src/testing/archetypes/affix_fuzzer2.rs @@ -270,16 +270,6 @@ impl AffixFuzzer2 { component_type: Some("rerun.testing.components.AffixFuzzer22".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.testing.components.AffixFuzzer2Indicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize]> = @@ -307,13 +297,13 @@ static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize] ] }); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [AffixFuzzer2::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 20usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize]> = once_cell::sync::Lazy::new(|| { [ AffixFuzzer2::descriptor_fuzz1101(), @@ -335,21 +325,15 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 20usize]> = AffixFuzzer2::descriptor_fuzz1117(), AffixFuzzer2::descriptor_fuzz1118(), AffixFuzzer2::descriptor_fuzz1122(), - AffixFuzzer2::descriptor_indicator(), ] }); impl AffixFuzzer2 { - /// The total number of components in the archetype: 19 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 20usize; + /// The total number of components in the archetype: 19 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 19usize; } -/// Indicator component for the [`AffixFuzzer2`] [`::re_types_core::Archetype`] -pub type AffixFuzzer2Indicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for AffixFuzzer2 { - type Indicator = AffixFuzzer2Indicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.testing.archetypes.AffixFuzzer2".into() @@ -360,14 +344,6 @@ impl ::re_types_core::Archetype for AffixFuzzer2 { "Affix fuzzer 2" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - AffixFuzzer2Indicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/testing/archetypes/affix_fuzzer3.rs b/crates/store/re_types/src/testing/archetypes/affix_fuzzer3.rs index 6e2108112ed5..785aa5c6332a 100644 --- a/crates/store/re_types/src/testing/archetypes/affix_fuzzer3.rs +++ b/crates/store/re_types/src/testing/archetypes/affix_fuzzer3.rs @@ -257,23 +257,13 @@ impl AffixFuzzer3 { component_type: Some("rerun.testing.components.AffixFuzzer18".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.testing.components.AffixFuzzer3Indicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [AffixFuzzer3::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 18usize]> = once_cell::sync::Lazy::new(|| { @@ -299,10 +289,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 18usize] ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 18usize]> = once_cell::sync::Lazy::new(|| { [ - AffixFuzzer3::descriptor_indicator(), AffixFuzzer3::descriptor_fuzz2001(), AffixFuzzer3::descriptor_fuzz2002(), AffixFuzzer3::descriptor_fuzz2003(), @@ -325,16 +314,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize]> = }); impl AffixFuzzer3 { - /// The total number of components in the archetype: 0 required, 1 recommended, 18 optional - pub const NUM_COMPONENTS: usize = 19usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 18 optional + pub const NUM_COMPONENTS: usize = 18usize; } -/// Indicator component for the [`AffixFuzzer3`] [`::re_types_core::Archetype`] -pub type AffixFuzzer3Indicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for AffixFuzzer3 { - type Indicator = AffixFuzzer3Indicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.testing.archetypes.AffixFuzzer3".into() @@ -345,14 +329,6 @@ impl ::re_types_core::Archetype for AffixFuzzer3 { "Affix fuzzer 3" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - AffixFuzzer3Indicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types/src/testing/archetypes/affix_fuzzer4.rs b/crates/store/re_types/src/testing/archetypes/affix_fuzzer4.rs index 54d7c9ca7d12..6f9cd234b87b 100644 --- a/crates/store/re_types/src/testing/archetypes/affix_fuzzer4.rs +++ b/crates/store/re_types/src/testing/archetypes/affix_fuzzer4.rs @@ -257,23 +257,13 @@ impl AffixFuzzer4 { component_type: Some("rerun.testing.components.AffixFuzzer18".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.testing.components.AffixFuzzer4Indicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [AffixFuzzer4::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 18usize]> = once_cell::sync::Lazy::new(|| { @@ -299,10 +289,9 @@ static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 18usize] ] }); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize]> = +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 18usize]> = once_cell::sync::Lazy::new(|| { [ - AffixFuzzer4::descriptor_indicator(), AffixFuzzer4::descriptor_fuzz2101(), AffixFuzzer4::descriptor_fuzz2102(), AffixFuzzer4::descriptor_fuzz2103(), @@ -325,16 +314,11 @@ static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 19usize]> = }); impl AffixFuzzer4 { - /// The total number of components in the archetype: 0 required, 1 recommended, 18 optional - pub const NUM_COMPONENTS: usize = 19usize; + /// The total number of components in the archetype: 0 required, 0 recommended, 18 optional + pub const NUM_COMPONENTS: usize = 18usize; } -/// Indicator component for the [`AffixFuzzer4`] [`::re_types_core::Archetype`] -pub type AffixFuzzer4Indicator = ::re_types_core::GenericIndicatorComponent; - impl ::re_types_core::Archetype for AffixFuzzer4 { - type Indicator = AffixFuzzer4Indicator; - #[inline] fn name() -> ::re_types_core::ArchetypeName { "rerun.testing.archetypes.AffixFuzzer4".into() @@ -345,14 +329,6 @@ impl ::re_types_core::Archetype for AffixFuzzer4 { "Affix fuzzer 4" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - AffixFuzzer4Indicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types_core/src/archetype.rs b/crates/store/re_types_core/src/archetype.rs index e76a0ed417d0..1adc96ac06c0 100644 --- a/crates/store/re_types_core/src/archetype.rs +++ b/crates/store/re_types_core/src/archetype.rs @@ -1,9 +1,4 @@ -use std::sync::Arc; - -use crate::{ - ComponentBatch, ComponentDescriptor, ComponentType, DeserializationResult, SerializationResult, - SerializedComponentBatch, -}; +use crate::{ComponentDescriptor, DeserializationResult}; #[expect(unused_imports, clippy::unused_trait_names)] // used in docstrings use crate::{Component, Loggable}; @@ -20,25 +15,6 @@ use crate::{Component, Loggable}; /// E.g. consider the `crate::archetypes::Points3D` archetype, which represents the set of /// components to consider when working with a 3D point cloud within Rerun. pub trait Archetype { - /// The associated indicator component, whose presence indicates that the high-level - /// archetype-based APIs were used to log the data. - /// - /// ## Internal representation - /// - /// Indicator components are always unit-length null arrays. - /// Their names follow the pattern `rerun.components.{ArchetypeName}Indicator`, e.g. - /// `rerun.components.Points3DIndicator`. - /// - /// Since null arrays aren't actually arrays and we don't actually have any data to shuffle - /// around per-se, we can't implement the usual [`Loggable`] traits. - /// For this reason, indicator components directly implement [`ComponentBatch`] instead, and - /// bypass the entire iterator machinery. - // - // TODO(rust-lang/rust#29661): We'd like to just default this to the right thing which is - // pretty much always `A::Indicator`, but defaults are unstable. - // type Indicator: ComponentBatch = A::Indicator; - type Indicator: 'static + ComponentBatch + Default; - /// The fully-qualified name of this archetype, e.g. `rerun.archetypes.Points2D`. fn name() -> ArchetypeName; @@ -47,11 +23,6 @@ pub trait Archetype { // --- - /// Creates a [`ComponentBatch`] out of the associated [`Self::Indicator`] component. - /// - /// This allows for associating arbitrary indicator components with arbitrary data. - fn indicator() -> SerializedComponentBatch; - /// Returns all component descriptors that _must_ be provided by the user when constructing this archetype. fn required_components() -> std::borrow::Cow<'static, [ComponentDescriptor]>; @@ -216,84 +187,3 @@ impl re_byte_size::SizeBytes for ComponentIdentifier { 0 } } - -// --- - -/// A generic [indicator component] that can be specialized for any [`Archetype`]. -/// -/// ```ignore -/// type MyArchetypeIndicator = GenericIndicatorComponent; -/// ``` -/// -/// [indicator component]: [`Archetype::Indicator`] -#[derive(Debug, Clone, Copy)] -pub struct GenericIndicatorComponent { - _phantom: std::marker::PhantomData, -} - -impl GenericIndicatorComponent { - pub const DEFAULT: Self = Self { - _phantom: std::marker::PhantomData::, - }; - - /// Create an array of indicator components of this type with the given length. - /// - /// This can be useful when sending columns of indicators with - /// `rerun::RecordingStream::send_columns`. - #[inline] - pub fn new_array(len: usize) -> GenericIndicatorComponentArray { - GenericIndicatorComponentArray { - len, - _phantom: std::marker::PhantomData::, - } - } -} - -impl Default for GenericIndicatorComponent { - fn default() -> Self { - Self::DEFAULT - } -} - -impl crate::ComponentBatch for GenericIndicatorComponent { - #[inline] - fn to_arrow(&self) -> SerializationResult { - Ok(Arc::new(arrow::array::NullArray::new(1))) - } -} - -/// A generic [indicator component] array of a given length. -/// -/// This can be useful when sending columns of indicators with -/// `rerun::RecordingStream::send_columns`. -/// -/// To create this type, call [`GenericIndicatorComponent::new_array`]. -/// -/// [indicator component]: [`Archetype::Indicator`] -#[derive(Debug, Clone, Copy)] -pub struct GenericIndicatorComponentArray { - len: usize, - _phantom: std::marker::PhantomData, -} - -impl crate::ComponentBatch for GenericIndicatorComponentArray { - #[inline] - fn to_arrow(&self) -> SerializationResult { - Ok(Arc::new(arrow::array::NullArray::new(self.len))) - } -} - -// --- - -/// An arbitrary named [indicator component]. -/// -/// [indicator component]: [`Archetype::Indicator`] -#[derive(Debug, Clone, Copy)] -pub struct NamedIndicatorComponent(pub ComponentType); - -impl crate::ComponentBatch for NamedIndicatorComponent { - #[inline] - fn to_arrow(&self) -> SerializationResult { - Ok(Arc::new(arrow::array::NullArray::new(1))) - } -} diff --git a/crates/store/re_types_core/src/archetypes/clear.rs b/crates/store/re_types_core/src/archetypes/clear.rs index 7446eac608d6..8c17ebe40c70 100644 --- a/crates/store/re_types_core/src/archetypes/clear.rs +++ b/crates/store/re_types_core/src/archetypes/clear.rs @@ -91,46 +91,26 @@ impl Clear { component_type: Some("rerun.components.ClearIsRecursive".into()), } } - - /// Returns the [`ComponentDescriptor`] for the associated indicator component. - #[inline] - pub fn descriptor_indicator() -> ComponentDescriptor { - ComponentDescriptor { - archetype: None, - component: "rerun.components.ClearIndicator".into(), - component_type: None, - } - } } static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = once_cell::sync::Lazy::new(|| [Clear::descriptor_is_recursive()]); -static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = - once_cell::sync::Lazy::new(|| [Clear::descriptor_indicator()]); +static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = + once_cell::sync::Lazy::new(|| []); static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 0usize]> = once_cell::sync::Lazy::new(|| []); -static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 2usize]> = - once_cell::sync::Lazy::new(|| { - [ - Clear::descriptor_is_recursive(), - Clear::descriptor_indicator(), - ] - }); +static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentDescriptor; 1usize]> = + once_cell::sync::Lazy::new(|| [Clear::descriptor_is_recursive()]); impl Clear { - /// The total number of components in the archetype: 1 required, 1 recommended, 0 optional - pub const NUM_COMPONENTS: usize = 2usize; + /// The total number of components in the archetype: 1 required, 0 recommended, 0 optional + pub const NUM_COMPONENTS: usize = 1usize; } -/// Indicator component for the [`Clear`] [`crate::Archetype`] -pub type ClearIndicator = crate::GenericIndicatorComponent; - impl crate::Archetype for Clear { - type Indicator = ClearIndicator; - #[inline] fn name() -> crate::ArchetypeName { "rerun.archetypes.Clear".into() @@ -141,14 +121,6 @@ impl crate::Archetype for Clear { "Clear" } - #[inline] - fn indicator() -> SerializedComponentBatch { - #[allow(clippy::unwrap_used)] - ClearIndicator::DEFAULT - .serialized(Self::descriptor_indicator()) - .unwrap() - } - #[inline] fn required_components() -> ::std::borrow::Cow<'static, [ComponentDescriptor]> { REQUIRED_COMPONENTS.as_slice().into() diff --git a/crates/store/re_types_core/src/lib.rs b/crates/store/re_types_core/src/lib.rs index 077ae01ef341..fb26f2db4814 100644 --- a/crates/store/re_types_core/src/lib.rs +++ b/crates/store/re_types_core/src/lib.rs @@ -35,10 +35,7 @@ mod tuid; mod view; pub use self::{ - archetype::{ - Archetype, ArchetypeName, ArchetypeReflectionMarker, ComponentIdentifier, - GenericIndicatorComponent, NamedIndicatorComponent, - }, + archetype::{Archetype, ArchetypeName, ArchetypeReflectionMarker, ComponentIdentifier}, arrow_string::ArrowString, as_components::AsComponents, component_batch::{ComponentBatch, SerializedComponentBatch, SerializedComponentColumn}, diff --git a/crates/top/re_sdk/src/lib.rs b/crates/top/re_sdk/src/lib.rs index 944b7d2ed69b..f873119aa276 100644 --- a/crates/top/re_sdk/src/lib.rs +++ b/crates/top/re_sdk/src/lib.rs @@ -114,9 +114,8 @@ pub use time::{TimeCell, TimePoint, Timeline}; pub use re_types::{ Archetype, ArchetypeName, AsComponents, Component, ComponentBatch, ComponentDescriptor, - ComponentType, DatatypeName, DeserializationError, DeserializationResult, - GenericIndicatorComponent, Loggable, NamedIndicatorComponent, SerializationError, - SerializationResult, SerializedComponentBatch, SerializedComponentColumn, + ComponentType, DatatypeName, DeserializationError, DeserializationResult, Loggable, + SerializationError, SerializationResult, SerializedComponentBatch, SerializedComponentColumn, }; pub use re_byte_size::SizeBytes; diff --git a/docs/content/reference/migration/migration-0-24.md b/docs/content/reference/migration/migration-0-24.md index 423a3f0c437d..347470134794 100644 --- a/docs/content/reference/migration/migration-0-24.md +++ b/docs/content/reference/migration/migration-0-24.md @@ -93,6 +93,7 @@ These changes are reflected in various parts of the Rerun viewer: * The selection panel UI comes with a revamped display of archetypes that uses the new syntax to show the `ComponentDescriptor` for each component. * The new `:`-based syntax needs to be used when referring to components in the dataframe API and in the dataframe view. * Changed the interpretation of `blueprint.datatypes.ComponentColumnSelector` to use the new component identifier. +* Indicator components have been removed entirely. The viewer now instead decides which views & visualizers to activate based on archetype information of components. ### Limitations & breaking changes diff --git a/docs/snippets/all/archetypes/video_auto_frames.cpp b/docs/snippets/all/archetypes/video_auto_frames.cpp index 79951a5f1a38..a2a1cf499bfd 100644 --- a/docs/snippets/all/archetypes/video_auto_frames.cpp +++ b/docs/snippets/all/archetypes/video_auto_frames.cpp @@ -33,10 +33,6 @@ int main(int argc, char* argv[]) { for (size_t i = 0; i < frame_timestamps_ns.size(); i++) { video_timestamps[i] = rerun::components::VideoTimestamp(frame_timestamps_ns[i]); } - auto video_frame_reference_indicators = - rerun::ComponentColumn::from_indicators( - static_cast(video_timestamps.size()) - ); rec.send_columns( "video", diff --git a/rerun_cpp/src/rerun/archetypes/annotation_context.hpp b/rerun_cpp/src/rerun/archetypes/annotation_context.hpp index 385962bb3973..160b7baacaed 100644 --- a/rerun_cpp/src/rerun/archetypes/annotation_context.hpp +++ b/rerun_cpp/src/rerun/archetypes/annotation_context.hpp @@ -7,7 +7,6 @@ #include "../component_batch.hpp" #include "../component_column.hpp" #include "../components/annotation_context.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -72,11 +71,6 @@ namespace rerun::archetypes { std::optional context; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.AnnotationContextIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.AnnotationContext"; diff --git a/rerun_cpp/src/rerun/archetypes/arrows2d.hpp b/rerun_cpp/src/rerun/archetypes/arrows2d.hpp index 5d09852b477f..c343862a4490 100644 --- a/rerun_cpp/src/rerun/archetypes/arrows2d.hpp +++ b/rerun_cpp/src/rerun/archetypes/arrows2d.hpp @@ -14,7 +14,6 @@ #include "../components/show_labels.hpp" #include "../components/text.hpp" #include "../components/vector2d.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -88,10 +87,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Arrows2DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Arrows2D"; diff --git a/rerun_cpp/src/rerun/archetypes/arrows3d.hpp b/rerun_cpp/src/rerun/archetypes/arrows3d.hpp index 0a6ea23f2f61..71dc13ab81b2 100644 --- a/rerun_cpp/src/rerun/archetypes/arrows3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/arrows3d.hpp @@ -13,7 +13,6 @@ #include "../components/show_labels.hpp" #include "../components/text.hpp" #include "../components/vector3d.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -98,10 +97,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Arrows3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Arrows3D"; diff --git a/rerun_cpp/src/rerun/archetypes/asset3d.hpp b/rerun_cpp/src/rerun/archetypes/asset3d.hpp index ed9a00f9ee56..864a7c614832 100644 --- a/rerun_cpp/src/rerun/archetypes/asset3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/asset3d.hpp @@ -9,7 +9,6 @@ #include "../components/albedo_factor.hpp" #include "../components/blob.hpp" #include "../components/media_type.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -74,10 +73,6 @@ namespace rerun::archetypes { std::optional albedo_factor; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Asset3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Asset3D"; diff --git a/rerun_cpp/src/rerun/archetypes/asset_video.hpp b/rerun_cpp/src/rerun/archetypes/asset_video.hpp index 036b5cfcdb6f..f009a7dce71c 100644 --- a/rerun_cpp/src/rerun/archetypes/asset_video.hpp +++ b/rerun_cpp/src/rerun/archetypes/asset_video.hpp @@ -8,7 +8,6 @@ #include "../component_column.hpp" #include "../components/blob.hpp" #include "../components/media_type.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -66,10 +65,6 @@ namespace rerun::archetypes { /// for (size_t i = 0; i ( - /// static_cast(video_timestamps.size()) - /// ); /// /// rec.send_columns( /// "video", @@ -125,11 +120,6 @@ namespace rerun::archetypes { std::optional media_type; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.AssetVideoIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.AssetVideo"; diff --git a/rerun_cpp/src/rerun/archetypes/bar_chart.hpp b/rerun_cpp/src/rerun/archetypes/bar_chart.hpp index e6917d0a2e35..1064afc3cab6 100644 --- a/rerun_cpp/src/rerun/archetypes/bar_chart.hpp +++ b/rerun_cpp/src/rerun/archetypes/bar_chart.hpp @@ -8,7 +8,6 @@ #include "../component_column.hpp" #include "../components/color.hpp" #include "../components/tensor_data.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -44,10 +43,6 @@ namespace rerun::archetypes { std::optional color; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.BarChartIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.BarChart"; diff --git a/rerun_cpp/src/rerun/archetypes/boxes2d.hpp b/rerun_cpp/src/rerun/archetypes/boxes2d.hpp index a5df7b639cf3..c9ac18dcfd3e 100644 --- a/rerun_cpp/src/rerun/archetypes/boxes2d.hpp +++ b/rerun_cpp/src/rerun/archetypes/boxes2d.hpp @@ -14,7 +14,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -77,10 +76,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Boxes2DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Boxes2D"; diff --git a/rerun_cpp/src/rerun/archetypes/boxes3d.hpp b/rerun_cpp/src/rerun/archetypes/boxes3d.hpp index 312defa08973..ceda50215de6 100644 --- a/rerun_cpp/src/rerun/archetypes/boxes3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/boxes3d.hpp @@ -16,7 +16,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -110,10 +109,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Boxes3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Boxes3D"; diff --git a/rerun_cpp/src/rerun/archetypes/capsules3d.hpp b/rerun_cpp/src/rerun/archetypes/capsules3d.hpp index 319b89273a38..03bdead6c11f 100644 --- a/rerun_cpp/src/rerun/archetypes/capsules3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/capsules3d.hpp @@ -16,7 +16,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -123,11 +122,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.Capsules3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Capsules3D"; diff --git a/rerun_cpp/src/rerun/archetypes/clear.hpp b/rerun_cpp/src/rerun/archetypes/clear.hpp index 31be6d9f88d9..5bef2b921432 100644 --- a/rerun_cpp/src/rerun/archetypes/clear.hpp +++ b/rerun_cpp/src/rerun/archetypes/clear.hpp @@ -7,7 +7,6 @@ #include "../component_batch.hpp" #include "../component_column.hpp" #include "../components/clear_is_recursive.hpp" -#include "../indicator_component.hpp" #include "../rerun_sdk_export.hpp" #include "../result.hpp" @@ -87,10 +86,6 @@ namespace rerun::archetypes { std::optional is_recursive; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.ClearIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Clear"; diff --git a/rerun_cpp/src/rerun/archetypes/cylinders3d.hpp b/rerun_cpp/src/rerun/archetypes/cylinders3d.hpp index 7a9594cc2643..217b77ca8098 100644 --- a/rerun_cpp/src/rerun/archetypes/cylinders3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/cylinders3d.hpp @@ -16,7 +16,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -120,11 +119,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.Cylinders3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Cylinders3D"; diff --git a/rerun_cpp/src/rerun/archetypes/depth_image.hpp b/rerun_cpp/src/rerun/archetypes/depth_image.hpp index 1a9ec7243335..56bee1f2f4b2 100644 --- a/rerun_cpp/src/rerun/archetypes/depth_image.hpp +++ b/rerun_cpp/src/rerun/archetypes/depth_image.hpp @@ -14,7 +14,6 @@ #include "../components/image_format.hpp" #include "../components/value_range.hpp" #include "../image_utils.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -124,11 +123,6 @@ namespace rerun::archetypes { std::optional draw_order; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.DepthImageIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.DepthImage"; diff --git a/rerun_cpp/src/rerun/archetypes/ellipsoids3d.hpp b/rerun_cpp/src/rerun/archetypes/ellipsoids3d.hpp index 3de0d1e07b86..56cf1a68ddf3 100644 --- a/rerun_cpp/src/rerun/archetypes/ellipsoids3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/ellipsoids3d.hpp @@ -16,7 +16,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -133,11 +132,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.Ellipsoids3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Ellipsoids3D"; diff --git a/rerun_cpp/src/rerun/archetypes/encoded_image.hpp b/rerun_cpp/src/rerun/archetypes/encoded_image.hpp index ec15b73320e1..d552cbb64c51 100644 --- a/rerun_cpp/src/rerun/archetypes/encoded_image.hpp +++ b/rerun_cpp/src/rerun/archetypes/encoded_image.hpp @@ -10,7 +10,6 @@ #include "../components/draw_order.hpp" #include "../components/media_type.hpp" #include "../components/opacity.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -72,11 +71,6 @@ namespace rerun::archetypes { std::optional draw_order; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.EncodedImageIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.EncodedImage"; diff --git a/rerun_cpp/src/rerun/archetypes/geo_line_strings.hpp b/rerun_cpp/src/rerun/archetypes/geo_line_strings.hpp index e9cea8e4e659..2754a6a99119 100644 --- a/rerun_cpp/src/rerun/archetypes/geo_line_strings.hpp +++ b/rerun_cpp/src/rerun/archetypes/geo_line_strings.hpp @@ -9,7 +9,6 @@ #include "../components/color.hpp" #include "../components/geo_line_string.hpp" #include "../components/radius.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -64,11 +63,6 @@ namespace rerun::archetypes { std::optional colors; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.GeoLineStringsIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.GeoLineStrings"; diff --git a/rerun_cpp/src/rerun/archetypes/geo_points.hpp b/rerun_cpp/src/rerun/archetypes/geo_points.hpp index cb36f5c4177a..f175f9b0bb82 100644 --- a/rerun_cpp/src/rerun/archetypes/geo_points.hpp +++ b/rerun_cpp/src/rerun/archetypes/geo_points.hpp @@ -10,7 +10,6 @@ #include "../components/color.hpp" #include "../components/lat_lon.hpp" #include "../components/radius.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -59,11 +58,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.GeoPointsIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.GeoPoints"; diff --git a/rerun_cpp/src/rerun/archetypes/graph_edges.hpp b/rerun_cpp/src/rerun/archetypes/graph_edges.hpp index a7648dc1158a..d00ab8f57516 100644 --- a/rerun_cpp/src/rerun/archetypes/graph_edges.hpp +++ b/rerun_cpp/src/rerun/archetypes/graph_edges.hpp @@ -8,7 +8,6 @@ #include "../component_column.hpp" #include "../components/graph_edge.hpp" #include "../components/graph_type.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -54,11 +53,6 @@ namespace rerun::archetypes { std::optional graph_type; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.GraphEdgesIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.GraphEdges"; diff --git a/rerun_cpp/src/rerun/archetypes/graph_nodes.hpp b/rerun_cpp/src/rerun/archetypes/graph_nodes.hpp index 06b62b4a7e58..55bbbfde676f 100644 --- a/rerun_cpp/src/rerun/archetypes/graph_nodes.hpp +++ b/rerun_cpp/src/rerun/archetypes/graph_nodes.hpp @@ -12,7 +12,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -69,11 +68,6 @@ namespace rerun::archetypes { std::optional radii; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.GraphNodesIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.GraphNodes"; diff --git a/rerun_cpp/src/rerun/archetypes/image.hpp b/rerun_cpp/src/rerun/archetypes/image.hpp index 23b96254d788..009a2f842b49 100644 --- a/rerun_cpp/src/rerun/archetypes/image.hpp +++ b/rerun_cpp/src/rerun/archetypes/image.hpp @@ -11,7 +11,6 @@ #include "../components/image_format.hpp" #include "../components/opacity.hpp" #include "../image_utils.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -160,10 +159,6 @@ namespace rerun::archetypes { std::optional draw_order; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.ImageIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Image"; diff --git a/rerun_cpp/src/rerun/archetypes/instance_poses3d.hpp b/rerun_cpp/src/rerun/archetypes/instance_poses3d.hpp index 8db27e21091a..767bf03a1146 100644 --- a/rerun_cpp/src/rerun/archetypes/instance_poses3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/instance_poses3d.hpp @@ -11,7 +11,6 @@ #include "../components/pose_scale3d.hpp" #include "../components/pose_transform_mat3x3.hpp" #include "../components/pose_translation3d.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -93,11 +92,6 @@ namespace rerun::archetypes { std::optional mat3x3; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.InstancePoses3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.InstancePoses3D"; diff --git a/rerun_cpp/src/rerun/archetypes/line_strips2d.hpp b/rerun_cpp/src/rerun/archetypes/line_strips2d.hpp index 09273f5cc62c..dd6a11886647 100644 --- a/rerun_cpp/src/rerun/archetypes/line_strips2d.hpp +++ b/rerun_cpp/src/rerun/archetypes/line_strips2d.hpp @@ -13,7 +13,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -120,11 +119,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.LineStrips2DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.LineStrips2D"; diff --git a/rerun_cpp/src/rerun/archetypes/line_strips3d.hpp b/rerun_cpp/src/rerun/archetypes/line_strips3d.hpp index e3493e2768ce..8c1911e052da 100644 --- a/rerun_cpp/src/rerun/archetypes/line_strips3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/line_strips3d.hpp @@ -12,7 +12,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -128,11 +127,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.LineStrips3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.LineStrips3D"; diff --git a/rerun_cpp/src/rerun/archetypes/mesh3d.hpp b/rerun_cpp/src/rerun/archetypes/mesh3d.hpp index 53f8cb9f2e3a..0c053d09758f 100644 --- a/rerun_cpp/src/rerun/archetypes/mesh3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/mesh3d.hpp @@ -15,7 +15,6 @@ #include "../components/texcoord2d.hpp" #include "../components/triangle_indices.hpp" #include "../components/vector3d.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -145,10 +144,6 @@ namespace rerun::archetypes { std::optional class_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Mesh3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Mesh3D"; diff --git a/rerun_cpp/src/rerun/archetypes/pinhole.hpp b/rerun_cpp/src/rerun/archetypes/pinhole.hpp index bdb6ef13ff26..7057c19acbbe 100644 --- a/rerun_cpp/src/rerun/archetypes/pinhole.hpp +++ b/rerun_cpp/src/rerun/archetypes/pinhole.hpp @@ -10,7 +10,6 @@ #include "../components/pinhole_projection.hpp" #include "../components/resolution.hpp" #include "../components/view_coordinates.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -128,10 +127,6 @@ namespace rerun::archetypes { std::optional image_plane_distance; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.PinholeIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Pinhole"; diff --git a/rerun_cpp/src/rerun/archetypes/points2d.hpp b/rerun_cpp/src/rerun/archetypes/points2d.hpp index 49b9247bfa7c..28cb6f1de16c 100644 --- a/rerun_cpp/src/rerun/archetypes/points2d.hpp +++ b/rerun_cpp/src/rerun/archetypes/points2d.hpp @@ -14,7 +14,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -148,10 +147,6 @@ namespace rerun::archetypes { std::optional keypoint_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Points2DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Points2D"; diff --git a/rerun_cpp/src/rerun/archetypes/points3d.hpp b/rerun_cpp/src/rerun/archetypes/points3d.hpp index fb6d65edd5bb..7575c554ed34 100644 --- a/rerun_cpp/src/rerun/archetypes/points3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/points3d.hpp @@ -13,7 +13,6 @@ #include "../components/radius.hpp" #include "../components/show_labels.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -210,10 +209,6 @@ namespace rerun::archetypes { std::optional keypoint_ids; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.Points3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Points3D"; diff --git a/rerun_cpp/src/rerun/archetypes/recording_info.hpp b/rerun_cpp/src/rerun/archetypes/recording_info.hpp index 857cfb47804d..f77d695e0672 100644 --- a/rerun_cpp/src/rerun/archetypes/recording_info.hpp +++ b/rerun_cpp/src/rerun/archetypes/recording_info.hpp @@ -8,7 +8,6 @@ #include "../component_column.hpp" #include "../components/name.hpp" #include "../components/timestamp.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -28,11 +27,6 @@ namespace rerun::archetypes { std::optional name; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.RecordingInfoIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.RecordingInfo"; diff --git a/rerun_cpp/src/rerun/archetypes/scalars.hpp b/rerun_cpp/src/rerun/archetypes/scalars.hpp index 46a2c6492346..424d95e314bc 100644 --- a/rerun_cpp/src/rerun/archetypes/scalars.hpp +++ b/rerun_cpp/src/rerun/archetypes/scalars.hpp @@ -7,7 +7,6 @@ #include "../component_batch.hpp" #include "../component_column.hpp" #include "../components/scalar.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -83,10 +82,6 @@ namespace rerun::archetypes { std::optional scalars; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.ScalarsIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Scalars"; diff --git a/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp b/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp index 49737f5cdab2..771a90a8e25b 100644 --- a/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp +++ b/rerun_cpp/src/rerun/archetypes/segmentation_image.hpp @@ -11,7 +11,6 @@ #include "../components/image_format.hpp" #include "../components/opacity.hpp" #include "../image_utils.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -90,11 +89,6 @@ namespace rerun::archetypes { std::optional draw_order; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.SegmentationImageIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.SegmentationImage"; diff --git a/rerun_cpp/src/rerun/archetypes/series_lines.hpp b/rerun_cpp/src/rerun/archetypes/series_lines.hpp index d3ed955b2f53..83e50465c1b7 100644 --- a/rerun_cpp/src/rerun/archetypes/series_lines.hpp +++ b/rerun_cpp/src/rerun/archetypes/series_lines.hpp @@ -11,7 +11,6 @@ #include "../components/name.hpp" #include "../components/series_visible.hpp" #include "../components/stroke_width.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -107,11 +106,6 @@ namespace rerun::archetypes { std::optional aggregation_policy; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.SeriesLinesIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.SeriesLines"; diff --git a/rerun_cpp/src/rerun/archetypes/series_points.hpp b/rerun_cpp/src/rerun/archetypes/series_points.hpp index d4dd575dbba5..2edd84bc4733 100644 --- a/rerun_cpp/src/rerun/archetypes/series_points.hpp +++ b/rerun_cpp/src/rerun/archetypes/series_points.hpp @@ -11,7 +11,6 @@ #include "../components/marker_size.hpp" #include "../components/name.hpp" #include "../components/series_visible.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -105,11 +104,6 @@ namespace rerun::archetypes { std::optional marker_sizes; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.SeriesPointsIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.SeriesPoints"; diff --git a/rerun_cpp/src/rerun/archetypes/tensor.hpp b/rerun_cpp/src/rerun/archetypes/tensor.hpp index 4858e7c40ef6..1ab02c7d6060 100644 --- a/rerun_cpp/src/rerun/archetypes/tensor.hpp +++ b/rerun_cpp/src/rerun/archetypes/tensor.hpp @@ -8,7 +8,6 @@ #include "../component_column.hpp" #include "../components/tensor_data.hpp" #include "../components/value_range.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -70,10 +69,6 @@ namespace rerun::archetypes { std::optional value_range; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.TensorIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Tensor"; diff --git a/rerun_cpp/src/rerun/archetypes/text_document.hpp b/rerun_cpp/src/rerun/archetypes/text_document.hpp index b619e3d54ce6..1597fcf0c356 100644 --- a/rerun_cpp/src/rerun/archetypes/text_document.hpp +++ b/rerun_cpp/src/rerun/archetypes/text_document.hpp @@ -8,7 +8,6 @@ #include "../component_column.hpp" #include "../components/media_type.hpp" #include "../components/text.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -88,11 +87,6 @@ namespace rerun::archetypes { std::optional media_type; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.TextDocumentIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.TextDocument"; diff --git a/rerun_cpp/src/rerun/archetypes/text_log.hpp b/rerun_cpp/src/rerun/archetypes/text_log.hpp index 428719b38a49..6524f045cac4 100644 --- a/rerun_cpp/src/rerun/archetypes/text_log.hpp +++ b/rerun_cpp/src/rerun/archetypes/text_log.hpp @@ -9,7 +9,6 @@ #include "../components/color.hpp" #include "../components/text.hpp" #include "../components/text_log_level.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -91,10 +90,6 @@ namespace rerun::archetypes { std::optional color; public: - static constexpr const char IndicatorComponentType[] = "rerun.components.TextLogIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.TextLog"; diff --git a/rerun_cpp/src/rerun/archetypes/transform3d.hpp b/rerun_cpp/src/rerun/archetypes/transform3d.hpp index f6a234bcf8c5..e120a517084b 100644 --- a/rerun_cpp/src/rerun/archetypes/transform3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/transform3d.hpp @@ -14,7 +14,6 @@ #include "../components/transform_mat3x3.hpp" #include "../components/transform_relation.hpp" #include "../components/translation3d.hpp" -#include "../indicator_component.hpp" #include "../rerun_sdk_export.hpp" #include "../result.hpp" #include "../rotation3d.hpp" @@ -326,11 +325,6 @@ namespace rerun::archetypes { std::optional axis_length; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.Transform3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.Transform3D"; diff --git a/rerun_cpp/src/rerun/archetypes/video_frame_reference.hpp b/rerun_cpp/src/rerun/archetypes/video_frame_reference.hpp index 26da17f41e0c..76272aa33ee1 100644 --- a/rerun_cpp/src/rerun/archetypes/video_frame_reference.hpp +++ b/rerun_cpp/src/rerun/archetypes/video_frame_reference.hpp @@ -9,7 +9,6 @@ #include "../components/draw_order.hpp" #include "../components/entity_path.hpp" #include "../components/video_timestamp.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -66,10 +65,6 @@ namespace rerun::archetypes { /// for (size_t i = 0; i ( - /// static_cast(video_timestamps.size()) - /// ); /// /// rec.send_columns( /// "video", @@ -140,11 +135,6 @@ namespace rerun::archetypes { std::optional draw_order; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.VideoFrameReferenceIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.VideoFrameReference"; diff --git a/rerun_cpp/src/rerun/archetypes/video_stream.hpp b/rerun_cpp/src/rerun/archetypes/video_stream.hpp index dffbf82e81a0..e1921d6555c2 100644 --- a/rerun_cpp/src/rerun/archetypes/video_stream.hpp +++ b/rerun_cpp/src/rerun/archetypes/video_stream.hpp @@ -9,7 +9,6 @@ #include "../components/draw_order.hpp" #include "../components/video_codec.hpp" #include "../components/video_sample.hpp" -#include "../indicator_component.hpp" #include "../result.hpp" #include @@ -65,11 +64,6 @@ namespace rerun::archetypes { std::optional draw_order; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.VideoStreamIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.VideoStream"; diff --git a/rerun_cpp/src/rerun/archetypes/view_coordinates.hpp b/rerun_cpp/src/rerun/archetypes/view_coordinates.hpp index d636542eec92..9ca04d2d3810 100644 --- a/rerun_cpp/src/rerun/archetypes/view_coordinates.hpp +++ b/rerun_cpp/src/rerun/archetypes/view_coordinates.hpp @@ -7,7 +7,6 @@ #include "../component_batch.hpp" #include "../component_column.hpp" #include "../components/view_coordinates.hpp" -#include "../indicator_component.hpp" #include "../rerun_sdk_export.hpp" #include "../result.hpp" @@ -58,11 +57,6 @@ namespace rerun::archetypes { std::optional xyz; public: - static constexpr const char IndicatorComponentType[] = - "rerun.components.ViewCoordinatesIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.archetypes.ViewCoordinates"; diff --git a/rerun_cpp/src/rerun/as_components.hpp b/rerun_cpp/src/rerun/as_components.hpp index f1dee1313092..dcd95af83b60 100644 --- a/rerun_cpp/src/rerun/as_components.hpp +++ b/rerun_cpp/src/rerun/as_components.hpp @@ -2,7 +2,6 @@ #include "collection.hpp" #include "component_batch.hpp" -#include "indicator_component.hpp" #include "loggable.hpp" namespace rerun { diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/background.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/background.hpp index 3704602bd830..641003cf945d 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/background.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/background.hpp @@ -8,7 +8,6 @@ #include "../../component_batch.hpp" #include "../../component_column.hpp" #include "../../components/color.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -29,11 +28,6 @@ namespace rerun::blueprint::archetypes { std::optional color; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.BackgroundIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.Background"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/container_blueprint.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/container_blueprint.hpp index 677638fc4764..46de2374a45b 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/container_blueprint.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/container_blueprint.hpp @@ -14,7 +14,6 @@ #include "../../component_column.hpp" #include "../../components/name.hpp" #include "../../components/visible.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -69,11 +68,6 @@ namespace rerun::blueprint::archetypes { std::optional grid_columns; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ContainerBlueprintIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ContainerBlueprint"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/dataframe_query.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/dataframe_query.hpp index 58bee48f0088..a8d3f7aa1eec 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/dataframe_query.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/dataframe_query.hpp @@ -11,7 +11,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -45,11 +44,6 @@ namespace rerun::blueprint::archetypes { std::optional select; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.DataframeQueryIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.DataframeQuery"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/entity_behavior.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/entity_behavior.hpp index 1a38648063fe..1a7bc84c35e0 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/entity_behavior.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/entity_behavior.hpp @@ -8,7 +8,6 @@ #include "../../component_column.hpp" #include "../../components/interactive.hpp" #include "../../components/visible.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -38,11 +37,6 @@ namespace rerun::blueprint::archetypes { std::optional visible; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.EntityBehaviorIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.EntityBehavior"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/force_center.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/force_center.hpp index 00f24ee198d7..0bd53572a617 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/force_center.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/force_center.hpp @@ -8,7 +8,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -31,11 +30,6 @@ namespace rerun::blueprint::archetypes { std::optional strength; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ForceCenterIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ForceCenter"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/force_collision_radius.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/force_collision_radius.hpp index cd8513e3c447..fd08f3e95094 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/force_collision_radius.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/force_collision_radius.hpp @@ -9,7 +9,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -37,11 +36,6 @@ namespace rerun::blueprint::archetypes { std::optional iterations; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ForceCollisionRadiusIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ForceCollisionRadius"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/force_link.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/force_link.hpp index a90e4e6cb7f0..8046674ddae5 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/force_link.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/force_link.hpp @@ -9,7 +9,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -37,11 +36,6 @@ namespace rerun::blueprint::archetypes { std::optional iterations; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ForceLinkIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ForceLink"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/force_many_body.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/force_many_body.hpp index 72efa760bd16..8ee2fcea7ecb 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/force_many_body.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/force_many_body.hpp @@ -8,7 +8,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -36,11 +35,6 @@ namespace rerun::blueprint::archetypes { std::optional strength; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ForceManyBodyIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ForceManyBody"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/force_position.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/force_position.hpp index 8f88552f74c7..3f8290695862 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/force_position.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/force_position.hpp @@ -9,7 +9,6 @@ #include "../../component_batch.hpp" #include "../../component_column.hpp" #include "../../components/position2d.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -35,11 +34,6 @@ namespace rerun::blueprint::archetypes { std::optional position; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ForcePositionIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ForcePosition"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/line_grid3d.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/line_grid3d.hpp index c5af8d9609b6..8506b349b8f7 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/line_grid3d.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/line_grid3d.hpp @@ -11,7 +11,6 @@ #include "../../components/plane3d.hpp" #include "../../components/stroke_width.hpp" #include "../../components/visible.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -53,11 +52,6 @@ namespace rerun::blueprint::archetypes { std::optional color; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.LineGrid3DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.LineGrid3D"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/map_background.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/map_background.hpp index 0663636f4c6a..5968a744c722 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/map_background.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/map_background.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -27,11 +26,6 @@ namespace rerun::blueprint::archetypes { std::optional provider; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.MapBackgroundIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.MapBackground"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/map_zoom.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/map_zoom.hpp index 55f7752e641b..99446eb72ae0 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/map_zoom.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/map_zoom.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -27,11 +26,6 @@ namespace rerun::blueprint::archetypes { std::optional zoom; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.MapZoomIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.MapZoom"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/near_clip_plane.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/near_clip_plane.hpp index 16d3bc027ec5..db999e2f6ad7 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/near_clip_plane.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/near_clip_plane.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -27,11 +26,6 @@ namespace rerun::blueprint::archetypes { std::optional near_clip_plane; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.NearClipPlaneIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.NearClipPlane"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp index a28a1821de36..bacb5754ecbf 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -25,11 +24,6 @@ namespace rerun::blueprint::archetypes { std::optional state; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.PanelBlueprintIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.PanelBlueprint"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/plot_legend.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/plot_legend.hpp index 63e6a0430778..ed5bbf09af97 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/plot_legend.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/plot_legend.hpp @@ -8,7 +8,6 @@ #include "../../component_batch.hpp" #include "../../component_column.hpp" #include "../../components/visible.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -33,11 +32,6 @@ namespace rerun::blueprint::archetypes { std::optional visible; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.PlotLegendIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.PlotLegend"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/scalar_axis.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/scalar_axis.hpp index 59a22d019e49..f36237f2a7d0 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/scalar_axis.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/scalar_axis.hpp @@ -8,7 +8,6 @@ #include "../../component_batch.hpp" #include "../../component_column.hpp" #include "../../components/range1d.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -31,11 +30,6 @@ namespace rerun::blueprint::archetypes { std::optional zoom_lock; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ScalarAxisIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ScalarAxis"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/tensor_scalar_mapping.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/tensor_scalar_mapping.hpp index 0492fa9ac7f5..3b38354e57ea 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/tensor_scalar_mapping.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/tensor_scalar_mapping.hpp @@ -9,7 +9,6 @@ #include "../../components/colormap.hpp" #include "../../components/gamma_correction.hpp" #include "../../components/magnification_filter.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -41,11 +40,6 @@ namespace rerun::blueprint::archetypes { std::optional gamma; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.TensorScalarMappingIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.TensorScalarMapping"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/tensor_slice_selection.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/tensor_slice_selection.hpp index f20491b3b9e3..78631a603847 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/tensor_slice_selection.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/tensor_slice_selection.hpp @@ -10,7 +10,6 @@ #include "../../components/tensor_dimension_index_selection.hpp" #include "../../components/tensor_height_dimension.hpp" #include "../../components/tensor_width_dimension.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -47,11 +46,6 @@ namespace rerun::blueprint::archetypes { std::optional slider; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.TensorSliceSelectionIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.TensorSliceSelection"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/tensor_view_fit.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/tensor_view_fit.hpp index cb611b5d2bc1..f1c3ce811bae 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/tensor_view_fit.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/tensor_view_fit.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -25,11 +24,6 @@ namespace rerun::blueprint::archetypes { std::optional scaling; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.TensorViewFitIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.TensorViewFit"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/time_axis.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/time_axis.hpp index cb699f55f5f6..474a27f19a1a 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/time_axis.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/time_axis.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -25,11 +24,6 @@ namespace rerun::blueprint::archetypes { std::optional link; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.TimeAxisIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.TimeAxis"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/view_blueprint.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/view_blueprint.hpp index 895c22f6b7fe..cb360238f5e2 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/view_blueprint.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/view_blueprint.hpp @@ -10,7 +10,6 @@ #include "../../component_column.hpp" #include "../../components/name.hpp" #include "../../components/visible.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -45,11 +44,6 @@ namespace rerun::blueprint::archetypes { std::optional visible; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ViewBlueprintIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ViewBlueprint"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/view_contents.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/view_contents.hpp index 6ed8093ff5c0..48a32af59a65 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/view_contents.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/view_contents.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -64,11 +63,6 @@ namespace rerun::blueprint::archetypes { std::optional query; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ViewContentsIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ViewContents"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/viewport_blueprint.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/viewport_blueprint.hpp index 489ff9128228..92733037d913 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/viewport_blueprint.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/viewport_blueprint.hpp @@ -11,7 +11,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -53,11 +52,6 @@ namespace rerun::blueprint::archetypes { std::optional past_viewer_recommendations; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.ViewportBlueprintIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.ViewportBlueprint"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/visible_time_ranges.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/visible_time_ranges.hpp index 03b872eb1392..37e6911a4e32 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/visible_time_ranges.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/visible_time_ranges.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -35,11 +34,6 @@ namespace rerun::blueprint::archetypes { std::optional ranges; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.VisibleTimeRangesIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.VisibleTimeRanges"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/visual_bounds2d.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/visual_bounds2d.hpp index 876165293d0b..3ddaf533ac5f 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/visual_bounds2d.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/visual_bounds2d.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -33,11 +32,6 @@ namespace rerun::blueprint::archetypes { std::optional range; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.VisualBounds2DIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.VisualBounds2D"; diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/visualizer_overrides.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/visualizer_overrides.hpp index 4c76ea279388..cbdeb47a3e03 100644 --- a/rerun_cpp/src/rerun/blueprint/archetypes/visualizer_overrides.hpp +++ b/rerun_cpp/src/rerun/blueprint/archetypes/visualizer_overrides.hpp @@ -7,7 +7,6 @@ #include "../../collection.hpp" #include "../../component_batch.hpp" #include "../../component_column.hpp" -#include "../../indicator_component.hpp" #include "../../result.hpp" #include @@ -35,11 +34,6 @@ namespace rerun::blueprint::archetypes { std::optional ranges; public: - static constexpr const char IndicatorComponentType[] = - "rerun.blueprint.components.VisualizerOverridesIndicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.blueprint.archetypes.VisualizerOverrides"; diff --git a/rerun_cpp/src/rerun/component_batch.hpp b/rerun_cpp/src/rerun/component_batch.hpp index c674779e993d..42b68e2a03ef 100644 --- a/rerun_cpp/src/rerun/component_batch.hpp +++ b/rerun_cpp/src/rerun/component_batch.hpp @@ -103,15 +103,6 @@ namespace rerun { } } - /// Creates a new component batch for an archetype indicator. - template - static Result from_indicator() { - return ComponentBatch::from_loggable( - typename Archetype::IndicatorComponent(), - Loggable::Descriptor - ); - } - /// Creates a new component batch from an already existing arrow array. /// /// Automatically registers the descriptor the first time it is encountered. diff --git a/rerun_cpp/src/rerun/component_column.hpp b/rerun_cpp/src/rerun/component_column.hpp index 307c66f3adfb..a6758c1d81b1 100644 --- a/rerun_cpp/src/rerun/component_column.hpp +++ b/rerun_cpp/src/rerun/component_column.hpp @@ -67,19 +67,6 @@ namespace rerun { ); } - /// Creates a new component column with a given number of archetype indicators for a given archetype type. - template - static Result from_indicators(uint32_t num_indicators) { - auto component_batch_result = ComponentBatch::from_indicator(); - if (component_batch_result.is_err()) { - return component_batch_result.error; - } - return ComponentColumn::from_batch_with_lengths( - component_batch_result.value, - Collection::take_ownership(std::vector(num_indicators, 0)) - ); - } - /// Creates a new component batch partition from a batch and a collection of run lengths. /// /// \param batch A batch of components which is about to be partitioned. diff --git a/rerun_cpp/src/rerun/indicator_component.cpp b/rerun_cpp/src/rerun/indicator_component.cpp deleted file mode 100644 index bccaafeae4e6..000000000000 --- a/rerun_cpp/src/rerun/indicator_component.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "indicator_component.hpp" -#include "compiler_utils.hpp" - -#include - -namespace rerun::components { - const std::shared_ptr& indicator_arrow_datatype() { - return arrow::null(); // Note that this already returns a shared_ptr reference. - } - - const std::shared_ptr& indicator_arrow_array() { - static const std::shared_ptr single_indicator_array = - std::make_shared(1); - return single_indicator_array; - } - - std::shared_ptr indicator_arrow_array(size_t num_instances) { - return std::make_shared(num_instances); - } -} // namespace rerun::components diff --git a/rerun_cpp/src/rerun/indicator_component.hpp b/rerun_cpp/src/rerun/indicator_component.hpp deleted file mode 100644 index cc7ae11bcbd4..000000000000 --- a/rerun_cpp/src/rerun/indicator_component.hpp +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#include // std::shared_ptr -#include -#include "component_descriptor.hpp" -#include "loggable.hpp" -#include "result.hpp" - -namespace arrow { - class DataType; - class Array; -} // namespace arrow - -namespace rerun::components { - /// Arrow data type shared by all instances of IndicatorComponent. - const std::shared_ptr& indicator_arrow_datatype(); - - /// Returns an arrow array for a single indicator component. - /// - /// This allocates a shared pointer only on the first call and returns references to the static object afterwards. - const std::shared_ptr& indicator_arrow_array(); - - /// Returns an arrow array for a several indicator component. - /// - /// Unlike the parameterless version this allocates a new data type on every call. - std::shared_ptr indicator_arrow_array(size_t num_instances); - - /// Indicator component used by archetypes when converting them to component lists. - /// - /// This is done in order to track how a collection of component was logged. - template - struct IndicatorComponent {}; -} // namespace rerun::components - -namespace rerun { - /// \private - template - struct Loggable> { - /// Returns the name of this type. - static constexpr ComponentDescriptor Descriptor = ComponentDescriptor(ComponentType_); - - /// Returns the arrow data type this type corresponds to. - static const std::shared_ptr& arrow_datatype() { - return components::indicator_arrow_datatype(); - } - - /// Creates an arrow ComponentBatch from an array of IndicatorComponent components. - static Result> to_arrow( - const components::IndicatorComponent*, size_t num_instances - ) { - // If possible, use the statically allocated shared pointer returned by the parameterless version. - if (num_instances == 1) { - return components::indicator_arrow_array(); - } else { - return components::indicator_arrow_array(num_instances); - } - } - }; -} // namespace rerun diff --git a/rerun_cpp/tests/generated/archetypes/affix_fuzzer1.hpp b/rerun_cpp/tests/generated/archetypes/affix_fuzzer1.hpp index 96194eb804e0..48b0898643b3 100644 --- a/rerun_cpp/tests/generated/archetypes/affix_fuzzer1.hpp +++ b/rerun_cpp/tests/generated/archetypes/affix_fuzzer1.hpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -83,11 +82,6 @@ namespace rerun::archetypes { std::optional fuzz1022; public: - static constexpr const char IndicatorComponentType[] = - "rerun.testing.components.AffixFuzzer1Indicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.testing.archetypes.AffixFuzzer1"; diff --git a/rerun_cpp/tests/generated/archetypes/affix_fuzzer2.hpp b/rerun_cpp/tests/generated/archetypes/affix_fuzzer2.hpp index 88683458ec69..48f7db4ece9b 100644 --- a/rerun_cpp/tests/generated/archetypes/affix_fuzzer2.hpp +++ b/rerun_cpp/tests/generated/archetypes/affix_fuzzer2.hpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -74,11 +73,6 @@ namespace rerun::archetypes { std::optional fuzz1122; public: - static constexpr const char IndicatorComponentType[] = - "rerun.testing.components.AffixFuzzer2Indicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.testing.archetypes.AffixFuzzer2"; diff --git a/rerun_cpp/tests/generated/archetypes/affix_fuzzer3.hpp b/rerun_cpp/tests/generated/archetypes/affix_fuzzer3.hpp index cbd34d4ad2c5..d030351f5f9c 100644 --- a/rerun_cpp/tests/generated/archetypes/affix_fuzzer3.hpp +++ b/rerun_cpp/tests/generated/archetypes/affix_fuzzer3.hpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -71,11 +70,6 @@ namespace rerun::archetypes { std::optional fuzz2018; public: - static constexpr const char IndicatorComponentType[] = - "rerun.testing.components.AffixFuzzer3Indicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.testing.archetypes.AffixFuzzer3"; diff --git a/rerun_cpp/tests/generated/archetypes/affix_fuzzer4.hpp b/rerun_cpp/tests/generated/archetypes/affix_fuzzer4.hpp index ecdb9bf6fdb5..05f8bb408079 100644 --- a/rerun_cpp/tests/generated/archetypes/affix_fuzzer4.hpp +++ b/rerun_cpp/tests/generated/archetypes/affix_fuzzer4.hpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -71,11 +70,6 @@ namespace rerun::archetypes { std::optional fuzz2118; public: - static constexpr const char IndicatorComponentType[] = - "rerun.testing.components.AffixFuzzer4Indicator"; - - /// Indicator component, used to identify the archetype when converting to a list of components. - using IndicatorComponent = rerun::components::IndicatorComponent; /// The name of the archetype as used in `ComponentDescriptor`s. static constexpr const char ArchetypeName[] = "rerun.testing.archetypes.AffixFuzzer4"; diff --git a/rerun_cpp/tests/recording_stream.cpp b/rerun_cpp/tests/recording_stream.cpp index 10fc04bf78cf..e2b182565f81 100644 --- a/rerun_cpp/tests/recording_stream.cpp +++ b/rerun_cpp/tests/recording_stream.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -18,6 +19,14 @@ namespace fs = std::filesystem; struct BadComponent {}; +// Not making this static makes lsan_suppressions.supp miss this. +// Output of use counter for this shared_ptr indicates that we're not leaking the shared ptr itself. +// If we do leak it, it's very unclear how that would be happening - somewhere in the FFI transition? +// But then why would it not show up for anything else? More likely a false positive. +static std::shared_ptr null_arrow_array() { + return std::make_shared(1); +} + template <> struct rerun::Loggable { static constexpr rerun::ComponentDescriptor Descriptor = "bad!"; @@ -439,7 +448,7 @@ SCENARIO("Recording stream handles invalid logging gracefully", TEST_TAG) { AND_GIVEN("a cell with an invalid component type") { rerun::ComponentBatch cell = {}; cell.component_type = RR_COMPONENT_TYPE_HANDLE_INVALID; - cell.array = rerun::components::indicator_arrow_array(); + cell.array = null_arrow_array(); THEN("try_log_data_row fails with InvalidComponentTypeHandle") { CHECK( diff --git a/rerun_py/mkdocs.yml b/rerun_py/mkdocs.yml index 530b4618bd55..4b51b192d5f3 100644 --- a/rerun_py/mkdocs.yml +++ b/rerun_py/mkdocs.yml @@ -36,7 +36,6 @@ plugins: "!__attrs_clear__", # For internal use "!^_[^_]", # Hide things starting with a single underscore "!as_component_batches", # Inherited from AsComponents - "!indicator", # Inherited from Archetype "!num_instances", # Inherited from AsComponents ] inherited_members: true diff --git a/rerun_py/rerun_sdk/rerun/__init__.py b/rerun_py/rerun_sdk/rerun/__init__.py index a66c49ca67f2..406ead7cc441 100644 --- a/rerun_py/rerun_sdk/rerun/__init__.py +++ b/rerun_py/rerun_sdk/rerun/__init__.py @@ -43,7 +43,6 @@ ) from ._log import ( AsComponents as AsComponents, - IndicatorComponentBatch as IndicatorComponentBatch, escape_entity_path_part as escape_entity_path_part, log as log, log_file_from_contents as log_file_from_contents, diff --git a/rerun_py/rerun_sdk/rerun/_baseclasses.py b/rerun_py/rerun_sdk/rerun/_baseclasses.py index d8b8dfe589e0..8e340dc030d1 100644 --- a/rerun_py/rerun_sdk/rerun/_baseclasses.py +++ b/rerun_py/rerun_sdk/rerun/_baseclasses.py @@ -311,23 +311,15 @@ def __init__( self.descriptor = descriptor self.component_batch = component_batch - if "Indicator" in descriptor.component: - if lengths is None: - # Indicator component, no lengths -> zero-sized batches by default - self.lengths = np.zeros(len(component_batch.as_arrow_array()), dtype=np.int32) - else: - # Normal component, lengths specified -> respect outer length, but enforce zero-sized batches still - self.lengths = np.zeros(len(np.array(lengths)), dtype=np.int32) + if lengths is None: + # Normal component, no lengths -> unit-sized batches by default + self.lengths = np.ones(len(component_batch.as_arrow_array()), dtype=np.int32) else: - if lengths is None: - # Normal component, no lengths -> unit-sized batches by default - self.lengths = np.ones(len(component_batch.as_arrow_array()), dtype=np.int32) - else: - # Normal component, lengths specified -> follow instructions - lengths = np.array(lengths) - if lengths.ndim != 1: - raise ValueError("Lengths must be a 1D array.") - self.lengths = lengths.flatten().astype(np.int32) + # Normal component, lengths specified -> follow instructions + lengths = np.array(lengths) + if lengths.ndim != 1: + raise ValueError("Lengths must be a 1D array.") + self.lengths = lengths.flatten().astype(np.int32) def component_descriptor(self) -> ComponentDescriptor: """ diff --git a/rerun_py/rerun_sdk/rerun/_log.py b/rerun_py/rerun_sdk/rerun/_log.py index 21a1f65ee276..ea26f61bb09b 100644 --- a/rerun_py/rerun_sdk/rerun/_log.py +++ b/rerun_py/rerun_sdk/rerun/_log.py @@ -12,45 +12,6 @@ from .recording_stream import RecordingStream -class IndicatorComponentBatch: - """ - A batch of Indicator Components that can be included in a Bundle. - - Indicator Components signal that a given Bundle should prefer to be interpreted as a - given archetype. This helps the view heuristics choose the correct view in situations - where multiple archetypes would otherwise be overlapping. - - This implements the `ComponentBatchLike` interface. - """ - - data: pa.Array - - def __init__(self, archetype: str) -> None: - """ - Creates a new indicator component based on a given `archetype`. - - Parameters - ---------- - archetype: - The fully qualified name of the Archetype. - - """ - self.data = pa.nulls(1, type=pa.null()) - assert not archetype.startswith("rerun.archetypes.rerun.archetypes."), ( - f"Bad archetype name '{archetype}' in IndicatorComponentBatch" - ) - self._archetype = archetype - - def component(self) -> str: - return self._archetype.replace("archetypes", "components") + "Indicator" - - def as_arrow_array(self) -> pa.Array: - return self.data - - def component_descriptor(self) -> ComponentDescriptor: - return ComponentDescriptor(self.component()) - - @catch_and_log_exceptions() def log( entity_path: str | list[object], diff --git a/rerun_py/rerun_sdk/rerun/dataframe.py b/rerun_py/rerun_sdk/rerun/dataframe.py index 1ed0c8b1ead7..3d6387b1226a 100644 --- a/rerun_py/rerun_sdk/rerun/dataframe.py +++ b/rerun_py/rerun_sdk/rerun/dataframe.py @@ -23,7 +23,6 @@ ) from ._baseclasses import ComponentColumn, ComponentDescriptor -from ._log import IndicatorComponentBatch from ._send_columns import TimeColumnLike, send_columns from .recording_stream import RecordingStream @@ -76,13 +75,7 @@ def as_arrow_array(self) -> pa.Array: def send_record_batch(batch: pa.RecordBatch, rec: Optional[RecordingStream] = None) -> None: - """ - Coerce a single pyarrow `RecordBatch` to Rerun structure. - - If this `RecordBatch` came from a call to [`RecordingView.view`][rerun.dataframe.RecordingView.view], you - will want to make sure the `view` call includes `include_indicator_columns = True` or else the - viewer will not know about the archetypes in the data. - """ + """Coerce a single pyarrow `RecordBatch` to Rerun structure.""" indexes = [] data: defaultdict[str, list[Any]] = defaultdict(list) @@ -102,9 +95,6 @@ def send_record_batch(batch: pa.RecordBatch, rec: Optional[RecordingStream] = No data[entity_path].append(RawComponentBatchLike(metadata, batch.column(col.name))) if SORBET_ARCHETYPE_NAME in metadata: archetypes[entity_path].add(metadata[SORBET_ARCHETYPE_NAME].decode("utf-8")) - for entity_path, archetype_set in archetypes.items(): - for archetype in archetype_set: - data[entity_path].append(IndicatorComponentBatch(archetype)) for entity_path, columns in data.items(): send_columns(