Dynamic configuration of graph layout forces through blueprints

Cargo.lock

@@ -2455,9 +2455,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "fjadra"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc0416b27f53bba6c9bd564260f27d4784c5f430926eb16a519356be7d66bbc"
+checksum = "d8d17b174735bd1464bc491c49570fc824466e9140617c371de9a6d86ebd33ec"
 
 [[package]]
 name = "flatbuffers"
@@ -5999,7 +5999,6 @@ dependencies = [
  "bytemuck",
  "clean-path",
  "criterion",
- "crossbeam",
  "document-features",
  "fixed",
  "half",
@@ -6393,6 +6392,7 @@ dependencies = [
  "re_data_ui",
  "re_entity_db",
  "re_format",
+ "re_log",
  "re_log_types",
  "re_query",
  "re_renderer",

Cargo.toml

@@ -190,7 +190,7 @@ enumset = "1.0.12"
 env_logger = { version = "0.10", default-features = false }
 ffmpeg-sidecar = { version = "2.0.2", default-features = false }
 fixed = { version = "1.28", default-features = false }
-fjadra = "0.1"
+fjadra = "0.2"
 flatbuffers = "23.0"
 futures-channel = "0.3"
 futures-util = { version = "0.3", default-features = false }

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

@@ -0,0 +1,12 @@
+namespace rerun.blueprint.archetypes;
+
+/// Tries to move the center of mass of the graph to the origin.
+struct ForceCenter (
+    "attr.rerun.scope": "blueprint"
+) {
+    /// Whether the force is enabled.
+    enabled: rerun.blueprint.components.Enabled ("attr.rerun.component_optional", nullable, order: 100);
+
+    /// The strength of the force.
+    strength: rerun.blueprint.components.ForceStrength ("attr.rerun.component_optional", nullable, order: 200);
+}

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

@@ -0,0 +1,17 @@
+namespace rerun.blueprint.archetypes;
+
+/// Resolves collisions between the bounding spheres, according to the radius of the nodes.
+struct ForceCollisionRadius (
+    "attr.rerun.scope": "blueprint"
+) {
+    /// Whether the force is enabled.
+    enabled: rerun.blueprint.components.Enabled ("attr.rerun.component_optional", nullable, order: 100);
+
+    /// The strength of the force.
+    strength: rerun.blueprint.components.ForceStrength ("attr.rerun.component_optional", nullable, order: 200);
+
+    /// Specifies how often this force should be applied per iteration.
+    ///
+    /// Increasing this parameter can lead to better results at the cost of longer computation time.
+    iterations: rerun.blueprint.components.ForceIterations ("attr.rerun.component_optional", nullable, order: 300);
+}

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

@@ -0,0 +1,17 @@
+namespace rerun.blueprint.archetypes;
+
+/// Aims to achieve a target distance between two nodes that are connected by an edge.
+struct ForceLink (
+    "attr.rerun.scope": "blueprint"
+) {
+    /// Whether the force is enabled.
+    enabled: rerun.blueprint.components.Enabled ("attr.rerun.component_optional", nullable, order: 100);
+
+    /// The target distance between two nodes.
+    distance: rerun.blueprint.components.ForceDistance ("attr.rerun.component_optional", nullable, order: 200);
+
+    /// Specifies how often this force should be applied per iteration.
+    ///
+    /// Increasing this parameter can lead to better results at the cost of longer computation time.
+    iterations: rerun.blueprint.components.ForceIterations ("attr.rerun.component_optional", nullable, order: 300);
+}

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

@@ -0,0 +1,16 @@
+namespace rerun.blueprint.archetypes;
+
+/// A force between each pair of nodes that ressembles an electrical charge.
+///
+/// If `strength` is smaller than 0, it pushes nodes apart, if it is larger than 0 it pulls them together.
+struct ForceManyBody (
+    "attr.rerun.scope": "blueprint"
+) {
+    /// Whether the force is enabled.
+    enabled: rerun.blueprint.components.Enabled ("attr.rerun.component_optional", nullable, order: 100);
+
+    /// The strength of the force.
+    ///
+    /// If `strength` is smaller than 0, it pushes nodes apart, if it is larger than 0 it pulls them together.
+    strength: rerun.blueprint.components.ForceStrength ("attr.rerun.component_optional", nullable, order: 200);
+}

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

@@ -0,0 +1,15 @@
+namespace rerun.blueprint.archetypes;
+
+/// Similar to gravity, this force pulls nodes towards a specific position.
+struct ForcePosition (
+    "attr.rerun.scope": "blueprint"
+) {
+    /// Whether the force is enabled.
+    enabled: rerun.blueprint.components.Enabled ("attr.rerun.component_optional", nullable, order: 100);
+
+    /// The strength of the force.
+    strength: rerun.blueprint.components.ForceStrength ("attr.rerun.component_optional", nullable, order: 200);
+
+    /// The position where the nodes should be pulled towards.
+    position: rerun.components.Position2D ("attr.rerun.component_optional", nullable, order: 300);
+}

crates/store/re_types/definitions/rerun/blueprint/components/enabled.fbs

@@ -0,0 +1,15 @@
+namespace rerun.blueprint.components;
+
+// ---
+
+/// Whether a procedure is enabled.
+struct Enabled (
+    "attr.arrow.transparent",
+    "attr.rerun.scope": "blueprint",
+    "attr.python.aliases": "bool",
+    "attr.rust.derive": "Copy, Default, PartialEq, Eq, PartialOrd, Ord",
+    "attr.rust.repr": "transparent",
+    "attr.rust.tuple_struct"
+) {
+    visible: rerun.datatypes.Bool (order: 100);
+}

crates/store/re_types/definitions/rerun/blueprint/components/force_distance.fbs

@@ -0,0 +1,14 @@
+
+namespace rerun.blueprint.components;
+
+/// The target distance between two nodes.
+///
+/// This is helpful to scale the layout, for example if long labels are involved.
+struct ForceDistance (
+  "attr.arrow.transparent",
+  "attr.rust.derive": "Default, Copy, PartialEq",
+  "attr.rust.repr": "transparent",
+  "attr.rerun.scope": "blueprint"
+) {
+    distance: rerun.datatypes.Float64 (order: 100);
+}

crates/store/re_types/definitions/rerun/blueprint/components/force_iterations.fbs

@@ -0,0 +1,14 @@
+
+namespace rerun.blueprint.components;
+
+/// Specifies how often this force should be applied per iteration.
+///
+/// Increasing this parameter can lead to better results at the cost of longer computation time.
+struct ForceIterations (
+  "attr.arrow.transparent",
+  "attr.rust.derive": "Default, Copy, PartialEq, Eq",
+  "attr.rust.repr": "transparent",
+  "attr.rerun.scope": "blueprint"
+) {
+    distance: rerun.datatypes.UInt64 (order: 100);
+}

crates/store/re_types/definitions/rerun/blueprint/components/force_strength.fbs

@@ -0,0 +1,14 @@
+
+namespace rerun.blueprint.components;
+
+/// The strength of a given force.
+///
+/// Allows to assign different weights to the individual forces, prioritizing one over the other.
+struct ForceStrength (
+  "attr.arrow.transparent",
+  "attr.rust.derive": "Default, Copy, PartialEq",
+  "attr.rust.repr": "transparent",
+  "attr.rerun.scope": "blueprint"
+) {
+    distance: rerun.datatypes.Float64 (order: 100);
+}

crates/store/re_types/definitions/rerun/blueprint/views/graph.fbs

@@ -11,4 +11,19 @@ table GraphView (
     ///
     /// Somethings outside of these bounds may also be visible due to letterboxing.
     visual_bounds: rerun.blueprint.archetypes.VisualBounds2D (order: 1000);
+
+    /// Allows to control the interaction between two nodes connected by an edge.
+    force_link: rerun.blueprint.archetypes.ForceLink (order: 2000);
+
+    /// A force between each pair of nodes that ressembles an electrical charge.
+    force_many_body: rerun.blueprint.archetypes.ForceManyBody (order: 3000);
+
+    /// Similar to gravity, this force pulls nodes towards a specific position.
+    force_position: rerun.blueprint.archetypes.ForcePosition (order: 4000);
+
+    /// Resolves collisions between the bounding spheres, according to the radius of the nodes.
+    force_collision_radius: rerun.blueprint.archetypes.ForceCollisionRadius (order: 5000);
+
+    /// Tries to move the center of mass of the graph to the origin.
+    force_center: rerun.blueprint.archetypes.ForceCenter (order: 6000);
 }