More comments and renames

Author: jleibs

crates/re_viewport/src/space_view_heuristics.rs

@@ -69,7 +69,10 @@ pub fn all_possible_space_views(
 
     let empty_entities_per_system = EntitiesPerSystem::default();
 
-    // Filter out entities that are not used in any of the part (!) systems of this class.
+    // Find all the entities that are used by the part (!) systems for each class.
+    // Note that entities_per_system_per_class includes both part-systems *and* context-systems
+    // so we filter out the context systems before aggregating the entities since context systems
+    // should not influence the heuristics.
     let entities_used_by_any_part_system_of_class: IntMap<_, _> = ctx
         .space_view_class_registry
         .iter_system_registries()
@@ -434,12 +437,13 @@ fn is_entity_processed_by_part_collection(
     false
 }
 
-pub fn default_entities_per_system_per_class(
+pub fn identify_entities_per_system_per_class(
     ctx: &mut ViewerContext<'_>,
 ) -> EntitiesPerSystemPerClass {
     re_tracing::profile_function!();
 
     // TODO(andreas): Handle several primary components.
+    // This code currently assumes the first component for each archetype is the primary.
     let system_collections_per_class: IntMap<
         SpaceViewClassName,
         (ViewContextCollection, ViewPartCollection),

crates/re_viewport/src/viewport.rs

@@ -16,7 +16,7 @@ use re_viewer_context::{
 
 use crate::{
     space_view_entity_picker::SpaceViewEntityPicker,
-    space_view_heuristics::{default_created_space_views, default_entities_per_system_per_class},
+    space_view_heuristics::{default_created_space_views, identify_entities_per_system_per_class},
     space_view_highlights::highlights_for_space_view,
     viewport_blueprint::load_viewport_blueprint,
     SpaceInfoCollection, SpaceViewBlueprint, ViewportBlueprint,
@@ -153,7 +153,7 @@ impl<'a, 'b> Viewport<'a, 'b> {
     ) {
         re_tracing::profile_function!();
 
-        let entities_per_system_per_class = default_entities_per_system_per_class(ctx);
+        let entities_per_system_per_class = identify_entities_per_system_per_class(ctx);
 
         for space_view in self.blueprint.space_views.values_mut() {
             let space_view_state = self.state.space_view_state_mut(

crates/re_viewport/src/viewport_blueprint.rs

@@ -16,7 +16,7 @@ use crate::{
     },
     space_info::SpaceInfoCollection,
     space_view::SpaceViewBlueprint,
-    space_view_heuristics::{default_created_space_views, default_entities_per_system_per_class},
+    space_view_heuristics::{default_created_space_views, identify_entities_per_system_per_class},
 };
 
 // ----------------------------------------------------------------------------
@@ -65,7 +65,7 @@ impl<'a> ViewportBlueprint<'a> {
         *has_been_user_edited = Default::default();
         *auto_space_views = Default::default();
 
-        let entities_per_system_per_class = default_entities_per_system_per_class(ctx);
+        let entities_per_system_per_class = identify_entities_per_system_per_class(ctx);
         for space_view in
             default_created_space_views(ctx, spaces_info, &entities_per_system_per_class)
         {

crates/re_viewport/src/viewport_blueprint_ui.rs

@@ -5,7 +5,7 @@ use re_space_view::DataBlueprintGroup;
 use re_viewer_context::{DataBlueprintGroupHandle, Item, SpaceViewId, ViewerContext};
 
 use crate::{
-    space_view_heuristics::{all_possible_space_views, default_entities_per_system_per_class},
+    space_view_heuristics::{all_possible_space_views, identify_entities_per_system_per_class},
     SpaceInfoCollection, SpaceViewBlueprint, ViewportBlueprint,
 };
 
@@ -369,7 +369,7 @@ impl ViewportBlueprint<'_> {
         ui.menu_image_button(texture_id, re_ui::ReUi::small_icon_size(), |ui| {
             ui.style_mut().wrap = Some(false);
 
-            let entities_per_system_per_class = default_entities_per_system_per_class(ctx);
+            let entities_per_system_per_class = identify_entities_per_system_per_class(ctx);
             for space_view in
                 all_possible_space_views(ctx, spaces_info, &entities_per_system_per_class)
                     .into_iter()