Skip to content

Commit

Permalink
Key-less datamodel 1: scrap InstanceKey from public logging APIs (#…
Browse files Browse the repository at this point in the history
…5395)

This just removes `InstanceKey`s from the archetypes where they were
exposed, and updates all tests/examples/APIs/etc accordingly.

Nothing else changes. Internally, everything is still driven by
autogenerated instance keys.

The `num_instances` field and the associated log-time check ("0, 1, or
N?") are still there.

---

Part of a series of PR to migrate to a key-less, PoV-less,
component-based (as opposed to archetype-based) query model:
-  #5395
  • Loading branch information
teh-cmc authored Mar 5, 2024
1 parent 9b149ef commit a79bcf8
Show file tree
Hide file tree
Showing 116 changed files with 64 additions and 861 deletions.
1 change: 0 additions & 1 deletion crates/re_space_view_spatial/src/mesh_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ impl LoadedMesh {
vertex_texcoords,
mesh_material,
class_ids: _,
instance_keys: _,
albedo_texture,
} = mesh3d;

Expand Down
1 change: 0 additions & 1 deletion crates/re_space_view_spatial/src/visualizers/meshes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ impl Mesh3DVisualizer {
mesh_material: arch_view.raw_optional_mono_component::<Material>()?,
albedo_texture: arch_view.raw_optional_mono_component::<TensorData>()?,
class_ids: None,
instance_keys: None,
}
};

Expand Down
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/arrows2d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,4 @@ table Arrows2D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3300);

/// Unique identifiers for each individual point in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/arrows3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,4 @@ table Arrows3D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3300);

/// Unique identifiers for each individual point in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/boxes2d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,4 @@ table Boxes2D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3200);

/// Unique identifiers for each individual boxes in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/boxes3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,4 @@ table Boxes3D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3200);

/// Unique identifiers for each individual boxes in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3300);
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,4 @@ table LineStrips2D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3200);

/// Unique identifiers for each individual line strip in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,4 @@ table LineStrips3D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3200);

/// Unique identifiers for each individual line strip in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/mesh3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,4 @@ table Mesh3D (
///
/// The class ID provides colors and labels if not specified explicitly.
class_ids: [rerun.components.ClassId] ("attr.rerun.component_optional", nullable, order: 3500);

/// Unique identifiers for each individual vertex in the mesh.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3600);
}
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/points2d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,4 @@ table Points2D (
/// E.g. the classification might be 'Person' and the keypoints refer to joints on a
/// detected skeleton.
keypoint_ids: [rerun.components.KeypointId] ("attr.rerun.component_optional", nullable, order: 3300);

/// Unique identifiers for each individual point in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
3 changes: 0 additions & 3 deletions crates/re_types/definitions/rerun/archetypes/points3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,4 @@ table Points3D (
/// E.g. the classification might be 'Person' and the keypoints refer to joints on a
/// detected skeleton.
keypoint_ids: [rerun.components.KeypointId] ("attr.rerun.component_optional", nullable, order: 3300);

/// Unique identifiers for each individual point in the batch.
instance_keys: [rerun.components.InstanceKey] ("attr.rerun.component_optional", nullable, order: 3400);
}
32 changes: 0 additions & 32 deletions crates/re_types/src/archetypes/arrows2d.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 0 additions & 32 deletions crates/re_types/src/archetypes/arrows3d.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 0 additions & 32 deletions crates/re_types/src/archetypes/boxes2d.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a79bcf8

Please sign in to comment.