Skip to content

Commit 90de052

Browse files
committed
Merge branch 'main' into grtlr/hybrid-latest-at-tagged
2 parents 3537130 + 738bfd7 commit 90de052

File tree

90 files changed

+318
-3849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+318
-3849
lines changed

crates/store/re_protos/proto/rerun/v1alpha1/manifest_registry.proto

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,9 @@ message QueryLatestAt {
388388
//
389389
// This will perform a basic fuzzy match on the available columns' descriptors.
390390
// The fuzzy logic is a simple case-sensitive `contains()` query.
391-
// For example, given a `log_tick__SeriesLine:StrokeWidth#width` index, all of the following
392-
// would match: `SeriesLine:StrokeWidth#width`, `StrokeWidth`, `Stroke`, `Width`, `width`,
393-
// `SeriesLine`, etc.
391+
// For example, given a `log_tick__SeriesLines:StrokeWidth#width` index, all of the following
392+
// would match: `SeriesLines:StrokeWidth#width`, `StrokeWidth`, `Stroke`, `Width`, `width`,
393+
// `SeriesLines`, etc.
394394
repeated string fuzzy_descriptors = 3;
395395
// TODO(cmc): I shall bring that back into a more structured form later.
396396
// repeated rerun.common.v1alpha1.ComponentDescriptor fuzzy_descriptors = 3;
@@ -412,9 +412,9 @@ message QueryRange {
412412
//
413413
// This will perform a basic fuzzy match on the available columns' descriptors.
414414
// The fuzzy logic is a simple case-sensitive `contains()` query.
415-
// For example, given a `log_tick__SeriesLine:StrokeWidth#width` index, all of the following
416-
// would match: `SeriesLine:StrokeWidth#width`, `StrokeWidth`, `Stroke`, `Width`, `width`,
417-
// `SeriesLine`, etc.
415+
// For example, given a `log_tick__SeriesLines:StrokeWidth#width` index, all of the following
416+
// would match: `SeriesLines:StrokeWidth#width`, `StrokeWidth`, `Stroke`, `Width`, `width`,
417+
// `SeriesLines`, etc.
418418
repeated string fuzzy_descriptors = 3;
419419
// TODO(cmc): I shall bring that back into a more structured form later.
420420
// repeated rerun.common.v1alpha1.ComponentDescriptor fuzzy_descriptors = 3;

crates/store/re_protos/src/v1alpha1/rerun.manifest_registry.v1alpha1.rs

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_sorbet/src/migration.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ pub fn migrate_record_batch(batch: &ArrowRecordBatch) -> ArrowRecordBatch {
101101
}
102102

103103
let archetype_renames = BTreeMap::from([
104+
// Deprecated in 0.23, removed in 0.24:
104105
(
105106
"rerun.archetypes.Scalar",
106107
ArchetypeRename {

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

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ table Boxes2D (
4747
/// An optional floating point value that specifies the 2D drawing order.
4848
///
4949
/// Objects with higher values are drawn on top of those with lower values.
50-
///
51-
/// The default for 2D boxes is 10.0.
50+
/// Defaults to `10.0`.
5251
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 3100);
5352

5453
/// Optional [components.ClassId]s for the boxes.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ table DepthImage (
6767
/// An optional floating point value that specifies the 2D drawing order, used only if the depth image is shown as a 2D image.
6868
///
6969
/// Objects with higher values are drawn on top of those with lower values.
70+
/// Defaults to `-20.0`.
7071
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 3500);
7172
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@ table Image (
5050
/// An optional floating point value that specifies the 2D drawing order.
5151
///
5252
/// Objects with higher values are drawn on top of those with lower values.
53+
/// Defaults to `-10.0`.
5354
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 3100);
5455
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ table LineStrips2D (
4141
/// An optional floating point value that specifies the 2D drawing order of each line strip.
4242
///
4343
/// Objects with higher values are drawn on top of those with lower values.
44+
/// Defaults to `20.0`.
4445
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 3100);
4546

4647
/// Optional [components.ClassId]s for the lines.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace rerun.archetypes;
77
/// \example archetypes/pinhole_perspective title="Perspective pinhole camera" image="https://static.rerun.io/pinhole_perspective/317e2de6d212b238dcdad5b67037e9e2a2afafa0/1200w.png"
88
table Pinhole (
99
"attr.docs.category": "Spatial 3D",
10-
"attr.docs.view_types": "Spatial2DView, Spatial2DView",
10+
"attr.docs.view_types": "Spatial2DView, Spatial3DView",
1111
"attr.rerun.state": "unstable",
1212
"attr.rust.derive": "PartialEq"
1313
) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ table Points2D (
4545
/// An optional floating point value that specifies the 2D drawing order.
4646
///
4747
/// Objects with higher values are drawn on top of those with lower values.
48+
/// Defaults to `30.0`.
4849
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 3100);
4950

5051
/// Optional class Ids for the points.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ table SegmentationImage (
3939
/// An optional floating point value that specifies the 2D drawing order.
4040
///
4141
/// Objects with higher values are drawn on top of those with lower values.
42+
/// Defaults to `0.0`.
4243
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 3100);
4344
}

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

Lines changed: 0 additions & 47 deletions
This file was deleted.

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

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,10 @@ table VideoFrameReference (
3838
/// at the beginning of the series and then rely on latest-at query semantics to
3939
/// keep the video reference active.
4040
video_reference: rerun.components.EntityPath ("attr.rerun.component_optional", nullable, order: 2000);
41+
42+
/// An optional floating point value that specifies the 2D drawing order.
43+
///
44+
/// Objects with higher values are drawn on top of those with lower values.
45+
/// Defaults to `-15.0`.
46+
draw_order: rerun.components.DrawOrder ("attr.rerun.component_optional", nullable, order: 2100);
4147
}

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

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/archetypes/boxes2d.rs

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/archetypes/depth_image.rs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/archetypes/image.rs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/archetypes/line_strips2d.rs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/archetypes/mod.rs

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/archetypes/points2d.rs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)