Skip to content

Commit

Permalink
Remove the need for an order of objects (#3519)
Browse files Browse the repository at this point in the history
It was originally added when we would output several type definitions to
the same file, but we don't do that anymore.

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/3519) (if
applicable)

- [PR Build Summary](https://build.rerun.io/pr/3519)
- [Docs
preview](https://rerun.io/preview/5f1bc465c92da9bf098f3d5bea731dd8b6553584/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/5f1bc465c92da9bf098f3d5bea731dd8b6553584/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://ref.rerun.io/dev/bench/)
- [Wasm size tracking](https://ref.rerun.io/dev/sizes/)
  • Loading branch information
emilk authored Sep 28, 2023
1 parent 29ab0e3 commit 1bbedce
Show file tree
Hide file tree
Showing 117 changed files with 128 additions and 316 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ namespace rerun.archetypes;
/// \example annotation_context_segmentation title="Segmentation" image="https://static.rerun.io/annotation_context_segmentation/0e21c0a04e456fec41d16b0deaa12c00cddf2d9b/1200w.png"
/// \example annotation_context_connections title="Connections" image="https://static.rerun.io/annotation_context_connections/4a8422bc154699c5334f574ff01b55c5cd1748e3/1200w.png"
table AnnotationContext (
"attr.rust.derive": "Eq, PartialEq",
order: 100
"attr.rust.derive": "Eq, PartialEq"
) {
context: rerun.components.AnnotationContext ("attr.rerun.component_required", order: 1000);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/arrows3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ namespace rerun.archetypes;
table Arrows3D (
"attr.rust.derive": "PartialEq",
"attr.rust.new_pub_crate",
"attr.cpp.no_field_ctors",
order: 100
"attr.cpp.no_field_ctors"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/asset3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ namespace rerun.archetypes;
/// \example asset3d_simple "Simple 3D asset"
/// \example asset3d_out_of_tree "3D asset with out-of-tree transform"
table Asset3D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/bar_chart.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ namespace rerun.archetypes;
///
/// \example bar_chart
table BarChart (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/boxes2d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ namespace rerun.archetypes;
table Boxes2D (
"attr.rust.derive": "PartialEq",
"attr.rust.new_pub_crate",
"attr.cpp.no_field_ctors",
order: 100
"attr.cpp.no_field_ctors"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/boxes3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ namespace rerun.archetypes;
table Boxes3D (
"attr.rust.derive": "PartialEq",
"attr.rust.new_pub_crate",
"attr.cpp.no_field_ctors",
order: 100
"attr.cpp.no_field_ctors"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/clear.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ namespace rerun.archetypes;
/// \example clear_simple "Flat"
/// \example clear_recursive "Recursive"
table Clear (
"attr.rust.derive": "PartialEq, Eq",
order: 100
"attr.rust.derive": "PartialEq, Eq"
) {
recursive: rerun.components.ClearIsRecursive ("attr.rerun.component_required", order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/depth_image.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ namespace rerun.archetypes;
/// \example depth_image_simple title="Simple example" image="https://static.rerun.io/depth_image_simple/9598554977873ace2577bddd79184ac120ceb0b0/1200w.png"
/// \example depth_image_3d title="Depth to 3D example" image="https://static.rerun.io/depth_image_3d/f78674bdae0eb25786c6173307693c5338f38b87/1200w.png"
table DepthImage (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ namespace rerun.archetypes;
///
/// \example disconnected_space
table DisconnectedSpace (
"attr.rust.derive": "Copy, PartialEq, Eq",
order: 100
"attr.rust.derive": "Copy, PartialEq, Eq"
) {
disconnected_space: rerun.components.DisconnectedSpace ("attr.rerun.component_required", order: 1000);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/image.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ namespace rerun.archetypes;
///
/// \example image_simple image="https://static.rerun.io/image_simple/06ba7f8582acc1ffb42a7fd0006fad7816f3e4e4/1200w.png"
table Image (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ namespace rerun.archetypes;
/// \example line_segments2d_simple image="https://static.rerun.io/line_segment2d_simple/53df596662dd9ffaaea5d09d091ef95220346c83/1200w.png"
/// \example line_strip2d_batch image="https://static.rerun.io/line_strip2d_batch/d8aae7ca3d6c3b0e3b636de60b8067fa2f0b6db9/1200w.png"
table LineStrips2D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ namespace rerun.archetypes;
/// \example line_segments3d_simple title="Many individual segments" image="https://static.rerun.io/line_segment3d_simple/aa800b2a6e6a7b8e32e762b42861bae36f5014bb/1200w.png"
/// \example line_strip3d_batch title="Many strips" image="https://static.rerun.io/line_strip3d_batch/102e5ec5271475657fbc76b469267e4ec8e84337/1200w.png"
table LineStrips3D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/mesh3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ namespace rerun.archetypes;
/// \example mesh3d_indexed "Simple indexed 3D mesh"
/// \example mesh3d_partial_updates "3D mesh with partial updates"
table Mesh3D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/pinhole.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ namespace rerun.archetypes;
///
/// \example pinhole_simple image="https://static.rerun.io/pinhole_simple/9af9441a94bcd9fd54e1fea44fb0c59ff381a7f2/1200w.png"
table Pinhole (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/points2d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ namespace rerun.archetypes;
/// \example point2d_simple image="https://static.rerun.io/point2d_simple/a8e801958bce5aa4e080659c033630f86ce95f71/1200w.png"
/// \example point2d_random image="https://static.rerun.io/point2d_random/8e8ac75373677bd72bd3f56a15e44fcab309a168/1200w.png"
table Points2D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/points3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ namespace rerun.archetypes;
/// \example point3d_simple image="https://static.rerun.io/point3d_simple/32fb3e9b65bea8bd7ffff95ad839f2f8a157a933/1200w.png"
/// \example point3d_random image="https://static.rerun.io/point3d_random/7e94e1806d2c381943748abbb3bedb68d564de24/1200w.png"
table Points3D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ namespace rerun.archetypes;
///
/// \example segmentation_image_simple image="https://static.rerun.io/segmentation_image_simple/eb49e0b8cb870c75a69e2a47a2d202e5353115f6/1200w.png"
table SegmentationImage (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/tensor.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ namespace rerun.archetypes;
/// \example tensor_simple image="https://static.rerun.io/tensor_simple/1aead2554496737e9267a5ab5220dbc89da851ee/1200w.png"
/// \example tensor_one_dim image="https://static.rerun.io/tensor_one_dim/cbf24b466fe9d9639777aefb34f1a00c3f30d7ab/1200w.png"
table Tensor (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
/// The tensor data
data: rerun.components.TensorData ("attr.rerun.component_required", order: 1000);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ namespace rerun.archetypes;

/// A text element intended to be displayed in its own text-box.
table TextDocument (
"attr.rust.derive": "PartialEq, Eq",
order: 100
"attr.rust.derive": "PartialEq, Eq"
) {
/// Contents of the text document.
text: rerun.components.Text ("attr.rerun.component_required", order: 100);
Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/text_log.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ namespace rerun.archetypes;

/// A log entry in a text log, comprised of a text body and its log level.
table TextLog (
"attr.rust.derive": "PartialEq, Eq",
order: 100
"attr.rust.derive": "PartialEq, Eq"
) {
text: rerun.components.Text ("attr.rerun.component_required", order: 100);
level: rerun.components.TextLogLevel ("attr.rerun.component_recommended", nullable, order: 200);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ namespace rerun.archetypes;
/// \example scalar_simple
/// \example scalar_multiple_plots
table TimeSeriesScalar (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
// --- Required ---

Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/archetypes/transform3d.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ namespace rerun.archetypes;
///
/// \example transform3d_simple image="https://static.rerun.io/transform3d_simple/141368b07360ce3fcb1553079258ae3f42bdb9ac/1200w.png"
table Transform3D (
"attr.rust.derive": "PartialEq",
order: 100
"attr.rust.derive": "PartialEq"
) {
/// The transform
transform: rerun.components.Transform3D ("attr.rerun.component_required", order: 1000);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ namespace rerun.archetypes;
///
/// \example view_coordinates_simple
table ViewCoordinates (
"attr.rust.derive": "Copy, PartialEq, Eq",
order: 100
"attr.rust.derive": "Copy, PartialEq, Eq"
) {
xyz: rerun.components.ViewCoordinates ("attr.rerun.component_required", required, order: 1000);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ namespace rerun.components;
/// path.
table AnnotationContext (
"attr.python.aliases": "datatypes.ClassDescriptionArrayLike, Sequence[datatypes.ClassDescriptionMapElemLike]",
"attr.rust.derive": "Default, Eq, PartialEq",
order: 100
"attr.rust.derive": "Default, Eq, PartialEq"
) {
class_map: [rerun.datatypes.ClassDescriptionMapElem] (order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/blob.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ table Blob (
"attr.python.aliases": "bytes, npt.NDArray[np.uint8]",
"attr.python.array_aliases": "bytes, npt.NDArray[np.uint8]",
"attr.rust.derive": "PartialEq, Eq",
"attr.rust.repr": "transparent",
order: 100
"attr.rust.repr": "transparent"
) {
data: [ubyte] (order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/class_id.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ table ClassId (
"attr.rust.derive": "Copy, PartialEq, Eq, PartialOrd, Ord, Hash",
"attr.rust.repr": "transparent",
"attr.rust.custom_clause":
'cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))',
order: 100
'cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))'
) {
id: rerun.datatypes.ClassId (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ struct ClearIsRecursive (
"attr.python.aliases": "bool",
"attr.python.array_aliases": "bool, npt.NDArray[np.bool_]",
"attr.rust.derive": "Copy, PartialEq, Eq",
"attr.rust.tuple_struct",
order: 100
"attr.rust.tuple_struct"
) {
/// If true, also clears all recursive children entities.
recursive: bool (order: 100);
Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/color.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ table Color (
"attr.python.aliases": "int, Sequence[int], npt.NDArray[Union[np.uint8, np.float32, np.float64]]",
"attr.python.array_aliases": "int, Sequence[Sequence[int]], npt.NDArray[Union[np.uint8, np.uint32, np.float32, np.float64]]",
"attr.rust.derive": "Copy, PartialEq, Eq, PartialOrd, Ord, bytemuck::Pod, bytemuck::Zeroable",
"attr.rust.repr": "transparent",
order: 100
"attr.rust.repr": "transparent"
) {
rgba: rerun.datatypes.Color (order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/depth_meter.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ namespace rerun.components;
struct DepthMeter (
"attr.python.aliases": "float",
"attr.python.array_aliases": "float, npt.NDArray[np.float32]",
"attr.rust.derive": "Copy, PartialEq, PartialOrd",
order: 100
"attr.rust.derive": "Copy, PartialEq, PartialOrd"
) {
value: float (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ namespace rerun.components;
struct DisconnectedSpace (
"attr.python.aliases": "bool",
"attr.python.array_aliases": "bool, npt.NDArray[np.bool_]",
"attr.rust.derive": "Copy, PartialEq, Eq",
order: 100
"attr.rust.derive": "Copy, PartialEq, Eq"
) {
is_disconnected: bool (order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/draw_order.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ struct DrawOrder (
"attr.python.aliases": "float",
"attr.python.array_aliases": "float, npt.NDArray[np.float32]",
"attr.rust.derive": "Copy",
"attr.rust.repr": "transparent",
order: 100
"attr.rust.repr": "transparent"
) {
value: float (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ namespace rerun.components;
/// The box extends both in negative and positive direction along each axis.
/// Negative sizes indicate that the box is flipped along the respective axis, but this has no effect on how it is displayed.
struct HalfSizes2D (
"attr.rust.derive": "Copy, PartialEq",
order: 100
"attr.rust.derive": "Copy, PartialEq"
) {
xy: rerun.datatypes.Vec2D (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ namespace rerun.components;
/// The box extends both in negative and positive direction along each axis.
/// Negative sizes indicate that the box is flipped along the respective axis, but this has no effect on how it is displayed.
struct HalfSizes3D (
"attr.rust.derive": "Default, Copy, PartialEq",
order: 100
"attr.rust.derive": "Default, Copy, PartialEq"
) {
xyz: rerun.datatypes.Vec3D (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ struct InstanceKey (
"attr.python.array_aliases": "int, npt.NDArray[np.uint64]",
"attr.rust.derive": "Copy, Hash, PartialEq, Eq, PartialOrd, Ord",
"attr.rust.custom_clause":
'cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))',
order: 100
'cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))'
) {
value: uint64 (order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/keypoint_id.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ struct KeypointId (
"attr.python.array_aliases": "int, npt.NDArray[np.uint8], npt.NDArray[np.uint16], npt.NDArray[np.uint32], npt.NDArray[np.uint64]",
"attr.rust.derive": "Copy, PartialEq, Eq, PartialOrd, Ord, Hash",
"attr.rust.custom_clause":
'cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))',
order: 200
'cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))'
) {
id: rerun.datatypes.KeypointId (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ namespace rerun.components;
table LineStrip2D (
"attr.python.aliases": "datatypes.Vec2DArrayLike, npt.NDArray[np.float32]",
"attr.python.array_aliases": "npt.NDArray[np.float32]",
"attr.rust.derive": "Default, PartialEq",
order: 100
"attr.rust.derive": "Default, PartialEq"
) {
points: [rerun.datatypes.Vec2D] (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ namespace rerun.components;
table LineStrip3D (
"attr.python.aliases": "datatypes.Vec3DArrayLike, npt.NDArray[np.float32]",
"attr.python.array_aliases": "npt.NDArray[np.float32]",
"attr.rust.derive": "Default, PartialEq",
order: 100
"attr.rust.derive": "Default, PartialEq"
) {
points: [rerun.datatypes.Vec3D] (order: 100);
}
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/material.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ namespace rerun.components;

// Material properties of a mesh.
table Material (
"attr.rust.derive": "PartialEq, Eq",
order: 100
"attr.rust.derive": "PartialEq, Eq"
) {
material: rerun.datatypes.Material (order: 100);
}
Expand Down
3 changes: 1 addition & 2 deletions crates/re_types/definitions/rerun/components/media_type.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ table MediaType (
"attr.python.aliases": "str",
"attr.python.array_aliases": "str, Sequence[str]",
"attr.rust.derive": "PartialEq, Eq, PartialOrd, Ord, Hash",
"attr.rust.repr": "transparent",
order: 100
"attr.rust.repr": "transparent"
) {
value: rerun.datatypes.Utf8 (order: 100);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ namespace rerun.components;

// Global properties of a mesh.
table MeshProperties (
"attr.rust.derive": "PartialEq, Eq",
order: 100
"attr.rust.derive": "PartialEq, Eq"
) {
props: rerun.datatypes.MeshProperties (order: 100);
}
Loading

0 comments on commit 1bbedce

Please sign in to comment.