Replace MarkerShape with code-generated enum type

.vscode/launch.json

@@ -4,6 +4,15 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        // Python
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        },
+        // Rust:
         {
             "name": "Lauch C++ minimal example",
             "type": "cppdbg",

crates/re_data_ui/src/editors.rs

@@ -257,7 +257,7 @@ fn edit_marker_shape_ui(
 
     let mut edit_marker = current_marker;
 
-    let marker_text = edit_marker.as_str();
+    let marker_text = edit_marker.to_string();
 
     egui::ComboBox::from_id_source("marker_shape")
         .selected_text(marker_text) // TODO(emilk): Show marker shape in the selected text
@@ -270,8 +270,8 @@ fn edit_marker_shape_ui(
                     .with_max_x(ui.max_rect().max.x + ui.spacing().menu_margin.right),
             );
 
-            for marker in MarkerShape::all_markers() {
-                let list_item = re_ui::list_item::ListItem::new(ctx.re_ui, marker.as_str())
+            for marker in MarkerShape::ALL {
+                let list_item = re_ui::list_item::ListItem::new(ctx.re_ui, marker.to_string())
                     .with_icon_fn(|_re_ui, ui, rect, visuals| {
                         paint_marker(ui, marker.into(), rect, visuals.text_color());
                     })

crates/re_types/definitions/fbs/attributes.fbs

@@ -1,5 +1,12 @@
 namespace fbs.attributes;
 
+/// The default variant of an `enum`.
+attribute "default";
+
+/// This attribute is mandatory for all struct fields that have an `enum` type.
+/// This is because flatbuffers report enums as integers.
+attribute "enum_type";
+
 /// Mandatory attribute that applies to all kinds of objects: structs, enums, unions and even the
 /// fields within.
 ///

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

@@ -28,7 +28,12 @@ table SeriesPoint {
     color: rerun.components.Color ("attr.rerun.component_optional", nullable, order: 1000);
 
     /// What shape to use to represent the point
-    marker: rerun.components.MarkerShape ("attr.rerun.component_optional", nullable, order: 2000);
+    marker: rerun.components.MarkerShape (
+        enum_type: "rerun.components.MarkerShape",
+        "attr.rerun.component_optional",
+        nullable,
+        order: 2000
+    );
 
     /// Display name of the series.
     ///

crates/re_types/definitions/rerun/blueprint/archetypes/container_blueprint.fbs

@@ -10,13 +10,16 @@ namespace rerun.blueprint.archetypes;
 /// The top-level description of the Viewport.
 table ContainerBlueprint (
     "attr.rerun.scope": "blueprint",
-    "attr.rust.derive": "Default",
     "attr.rust.override_crate": "re_viewport"
 ) {
     // --- Required ---
 
     /// The class of the view.
-    container_kind: rerun.blueprint.components.ContainerKind ("attr.rerun.component_required", order: 100);
+    container_kind: rerun.blueprint.components.ContainerKind (
+        enum_type: "rerun.blueprint.components.ContainerKind",
+        "attr.rerun.component_required",
+        order: 100
+    );
 
     // --- Optional ---
 

crates/re_types/definitions/rerun/blueprint/archetypes/plot_legend.fbs

@@ -20,7 +20,12 @@ table PlotLegend (
     /// To what corner the legend is aligned.
     ///
     /// Defaults to the right bottom corner.
-    corner: rerun.blueprint.components.Corner2D ("attr.rerun.component_optional", nullable, order: 2100);
+    corner: rerun.blueprint.components.Corner2D (
+        enum_type: "rerun.blueprint.components.Corner2D",
+        "attr.rerun.component_optional",
+        nullable,
+        order: 2100
+    );
 
     /// Whether the legend is shown at all.
     ///

crates/re_types/definitions/rerun/blueprint/components/container_kind.fbs

@@ -8,30 +8,14 @@ include "rerun/attributes.fbs";
 namespace rerun.blueprint.components;
 
 
-// TODO(#3384)
-/*
-enum ContainerKind: byte {
-    Tabs = 1
-    Horizontal = 2,
-    Vertical = 3,
-    Grid = 4
-}
-*/
-
-// ---
-
-/// The kind of a blueprint container.
-table ContainerKind (
+/// The kind of a blueprint container (tabs, grid, …).
+enum ContainerKind: byte (
     "attr.rerun.scope": "blueprint",
-    "attr.rust.derive": "Default, PartialEq, Eq, PartialOrd, Ord",
-    "attr.rust.override_crate": "re_viewport"
+    "attr.rust.override_crate": "re_viewport",
+    "attr.docs.unreleased"
 ) {
-    /// Which kind of container this is.
-    ///
-    /// Allowed values:
-    ///  - Tabs = 1
-    ///  - Horizontal = 2
-    ///  - Vertical = 3
-    ///  - Grid = 4
-    kind: ubyte (order: 100);
+    Tabs,
+    Horizontal,
+    Vertical,
+    Grid,
 }

crates/re_types/definitions/rerun/blueprint/components/corner_2d.fbs

@@ -4,29 +4,13 @@ include "rust/attributes.fbs";
 
 namespace rerun.blueprint.components;
 
-// TODO(#3384)
-/*
-enum LegendPosition: byte {
-    LeftTop = 1,
-    RightTop = 2,
-    LeftBottom = 3,
-    RightBottom = 4
-}
-*/
-
 /// One of four 2D corners, typically used to align objects.
-table Corner2D (
-    "attr.arrow.transparent",
+enum Corner2D: byte (
     "attr.rerun.scope": "blueprint",
-    "attr.rust.derive": "Copy, PartialEq, Eq, PartialOrd, Ord",
-    "attr.rust.tuple_struct"
+    "attr.rust.derive": "Copy, PartialEq, Eq"
 ) {
-    /// Where should the legend be located.
-    ///
-    /// Allowed values:
-    ///  - LeftTop = 1,
-    ///  - RightTop = 2,
-    ///  - LeftBottom = 3,
-    ///  - RightBottom = 4
-    location: ubyte (order: 200);
+    LeftTop,
+    RightTop,
+    LeftBottom,
+    RightBottom (default),
 }

crates/re_types/definitions/rerun/components.fbs

@@ -38,3 +38,5 @@ include "./components/vector2d.fbs";
 include "./components/vector3d.fbs";
 include "./components/view_coordinates.fbs";
 include "./components/visualizer_overrides.fbs";
+
+include "./testing/components/enum_test.fbs";

crates/re_types/definitions/rerun/components/marker_shape.fbs

@@ -7,28 +7,18 @@ include "rerun/attributes.fbs";
 
 namespace rerun.components;
 
-// TODO(#3384)
-/*
-enum MarkerShape: byte {
-    Circle = 1,
-    Diamond = 2,
-    Square = 3,
-    Cross = 4,
-    Plus = 5,
-    Up = 6,
-    Down = 7,
-    Left = 8,
-    Right = 9,
-    Asterisk = 10,
-}
-*/
-
 /// Shape of a marker.
-struct MarkerShape (
-    "attr.python.aliases": "int, str",
-    "attr.python.array_aliases": "int, str",
-    "attr.rust.derive": "PartialEq, Eq, PartialOrd, Copy",
-    "attr.rust.repr": "transparent"
+enum MarkerShape: byte (
+    "attr.docs.unreleased"
 ) {
-    shape: ubyte (order: 100);
+    Circle (default),
+    Diamond,
+    Square,
+    Cross,
+    Plus,
+    Up,
+    Down,
+    Left,
+    Right,
+    Asterisk,
 }

crates/re_types/definitions/rerun/datatypes.fbs

@@ -32,6 +32,4 @@ include "./datatypes/vec2d.fbs";
 include "./datatypes/vec3d.fbs";
 include "./datatypes/vec4d.fbs";
 
-include "./testing/datatypes/enum.fbs";
-
 namespace rerun.datatypes;

crates/re_types/definitions/rerun/testing/datatypes/enum.fbs → crates/re_types/definitions/rerun/testing/components/enum_test.fbs

@@ -1,4 +1,4 @@
-namespace rerun.testing.datatypes;
+namespace rerun.testing.components;
 
 /// A test of the enum type.
 enum EnumTest: byte {
@@ -9,7 +9,7 @@ enum EnumTest: byte {
     Down,
 
     /// Correct.
-    Right,
+    Right (default),
 
     /// It's what's remaining.
     Left,