make sure secondary plot components check out default values

rerun-io · Aug 28, 2024 · 72d56c2 · 72d56c2
1 parent 68360ee
commit 72d56c2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/crates/viewer/re_space_view_time_series/src/line_visualizer_system.rs b/crates/viewer/re_space_view_time_series/src/line_visualizer_system.rs
@@ -297,9 +297,10 @@ impl SeriesLineSystem {
                     })
                 }
 
-                if let Some(all_color_chunks) = results.get_required_chunks(&Color::name()) {
+                {
+                    let all_color_chunks = results.get_optional_chunks(&Color::name());
                     if all_color_chunks.len() == 1 && all_color_chunks[0].is_static() {
-                        re_tracing::profile_scope!("override fast path");
+                        re_tracing::profile_scope!("override/default fast path");
 
                         let color = all_color_chunks[0]
                             .iter_primitive::<u32>(&Color::name())
@@ -337,12 +338,12 @@ impl SeriesLineSystem {
 
                 debug_assert_eq!(StrokeWidth::arrow_datatype(), ArrowDatatype::Float32);
 
-                if let Some(all_stroke_width_chunks) =
-                    results.get_required_chunks(&StrokeWidth::name())
                 {
+                    let all_stroke_width_chunks = results.get_optional_chunks(&StrokeWidth::name());
+
                     if all_stroke_width_chunks.len() == 1 && all_stroke_width_chunks[0].is_static()
                     {
-                        re_tracing::profile_scope!("override fast path");
+                        re_tracing::profile_scope!("override/default fast path");
 
                         let stroke_width = all_stroke_width_chunks[0]
                             .iter_primitive::<f32>(&StrokeWidth::name())

diff --git a/crates/viewer/re_space_view_time_series/src/point_visualizer_system.rs b/crates/viewer/re_space_view_time_series/src/point_visualizer_system.rs
@@ -313,9 +313,11 @@ impl SeriesPointSystem {
                     })
                 }
 
-                if let Some(all_color_chunks) = results.get_required_chunks(&Color::name()) {
+                {
+                    let all_color_chunks = results.get_optional_chunks(&Color::name());
+
                     if all_color_chunks.len() == 1 && all_color_chunks[0].is_static() {
-                        re_tracing::profile_scope!("override fast path");
+                        re_tracing::profile_scope!("override/default fast path");
 
                         let color = all_color_chunks[0]
                             .iter_primitive::<u32>(&Color::name())
@@ -353,11 +355,11 @@ impl SeriesPointSystem {
 
                 debug_assert_eq!(MarkerSize::arrow_datatype(), ArrowDatatype::Float32);
 
-                if let Some(all_marker_size_chunks) =
-                    results.get_required_chunks(&MarkerSize::name())
                 {
+                    let all_marker_size_chunks = results.get_optional_chunks(&MarkerSize::name());
+
                     if all_marker_size_chunks.len() == 1 && all_marker_size_chunks[0].is_static() {
-                        re_tracing::profile_scope!("override fast path");
+                        re_tracing::profile_scope!("override/default fast path");
 
                         let marker_size = all_marker_size_chunks[0]
                             .iter_primitive::<f32>(&MarkerSize::name())
@@ -401,13 +403,14 @@ impl SeriesPointSystem {
             {
                 re_tracing::profile_scope!("fill marker shapes");
 
-                if let Some(all_marker_shapes_chunks) =
-                    results.get_required_chunks(&MarkerShape::name())
                 {
+                    let all_marker_shapes_chunks =
+                        results.get_optional_chunks(&MarkerShape::name());
+
                     if all_marker_shapes_chunks.len() == 1
                         && all_marker_shapes_chunks[0].is_static()
                     {
-                        re_tracing::profile_scope!("override fast path");
+                        re_tracing::profile_scope!("override/default fast path");
 
                         let marker_shape = all_marker_shapes_chunks[0]
                             .iter_component::<MarkerShape>()