From 9f5d8c59981580c9ba6410303031a651c12bf114 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 2 Jul 2024 09:34:31 +0200 Subject: [PATCH] fix point2d_ui_radius comparison test, rename entities to be more sensible --- crates/re_types/src/archetypes/points2d.rs | 4 ++-- crates/re_types/src/archetypes/points3d.rs | 4 ++-- docs/snippets/all/archetypes/point2d_ui_radius.cpp | 6 +++--- docs/snippets/all/archetypes/point2d_ui_radius.py | 4 ++-- docs/snippets/all/archetypes/point2d_ui_radius.rs | 4 ++-- docs/snippets/all/archetypes/point3d_ui_radius.cpp | 4 ++-- docs/snippets/all/archetypes/point3d_ui_radius.py | 4 ++-- docs/snippets/all/archetypes/point3d_ui_radius.rs | 4 ++-- rerun_cpp/src/rerun/archetypes/points2d.hpp | 6 +++--- rerun_cpp/src/rerun/archetypes/points3d.hpp | 4 ++-- rerun_py/rerun_sdk/rerun/archetypes/points2d.py | 4 ++-- rerun_py/rerun_sdk/rerun/archetypes/points3d.py | 4 ++-- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/crates/re_types/src/archetypes/points2d.rs b/crates/re_types/src/archetypes/points2d.rs index 827dad4952c6..64eef93ba595 100644 --- a/crates/re_types/src/archetypes/points2d.rs +++ b/crates/re_types/src/archetypes/points2d.rs @@ -65,7 +65,7 @@ use ::re_types_core::{DeserializationError, DeserializationResult}; /// /// // Two blue points with scene unit radii of 0.1 and 0.3. /// rec.log( -/// "scene_unit_points", +/// "scene_units", /// &rerun::Points2D::new([(0.0, 0.0), (0.0, 1.0)]) /// // By default, radii are interpreted as world-space units. /// .with_radii([0.1, 0.3]) @@ -76,7 +76,7 @@ use ::re_types_core::{DeserializationError, DeserializationResult}; /// // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. /// // For 100% ui scaling, UI points are equal to pixels. /// rec.log( -/// "ui_points_points", +/// "ui_points", /// &rerun::Points2D::new([(1.0, 0.0), (1.0, 1.0)]) /// // rerun::Radius::new_ui_points produces a radius that the viewer interprets as given in ui points. /// .with_radii([ diff --git a/crates/re_types/src/archetypes/points3d.rs b/crates/re_types/src/archetypes/points3d.rs index ae55ae9445f4..3e1657f894c0 100644 --- a/crates/re_types/src/archetypes/points3d.rs +++ b/crates/re_types/src/archetypes/points3d.rs @@ -65,7 +65,7 @@ use ::re_types_core::{DeserializationError, DeserializationResult}; /// /// // Two blue points with scene unit radii of 0.1 and 0.3. /// rec.log( -/// "scene_unit_points", +/// "scene_units", /// &rerun::Points3D::new([(0.0, 1.0, 0.0), (1.0, 1.0, 1.0)]) /// // By default, radii are interpreted as world-space units. /// .with_radii([0.1, 0.3]) @@ -76,7 +76,7 @@ use ::re_types_core::{DeserializationError, DeserializationResult}; /// // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. /// // For 100% ui scaling, UI points are equal to pixels. /// rec.log( -/// "ui_points_points", +/// "ui_points", /// &rerun::Points3D::new([(0.0, 0.0, 0.0), (1.0, 0.0, 1.0)]) /// // rerun::Radius::new_ui_points produces a radius that the viewer interprets as given in ui points. /// .with_radii([ diff --git a/docs/snippets/all/archetypes/point2d_ui_radius.cpp b/docs/snippets/all/archetypes/point2d_ui_radius.cpp index 1c9d6d9453fd..d49a207d5af3 100644 --- a/docs/snippets/all/archetypes/point2d_ui_radius.cpp +++ b/docs/snippets/all/archetypes/point2d_ui_radius.cpp @@ -8,7 +8,7 @@ int main() { // Two blue points with scene unit radii of 0.1 and 0.3. rec.log( - "scene_unit_points", + "scene_units", rerun::Points2D({{0.0f, 0.0f}, {0.0f, 1.0f}}) // By default, radii are interpreted as world-space units. .with_radii({0.1f, 0.3f}) @@ -19,8 +19,8 @@ int main() { // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. // For 100% ui scaling, UI points are equal to pixels. rec.log( - "ui_points_points", - rerun::Points2D({{0.0f, 0.0f}, {1.0f, 1.0f}}) + "ui_points", + rerun::Points2D({{1.0f, 0.0f}, {1.0f, 1.0f}}) // rerun::Radius::ui_points produces radii that the viewer interprets as given in ui points. .with_radii({ rerun::Radius::ui_points(40.0f), diff --git a/docs/snippets/all/archetypes/point2d_ui_radius.py b/docs/snippets/all/archetypes/point2d_ui_radius.py index f878d522dd72..5017aec2c183 100644 --- a/docs/snippets/all/archetypes/point2d_ui_radius.py +++ b/docs/snippets/all/archetypes/point2d_ui_radius.py @@ -7,7 +7,7 @@ # Two blue points with scene unit radii of 0.1 and 0.3. rr.log( - "scene_unit_points", + "scene_units", rr.Points2D( [[0, 0], [0, 1]], # By default, radii are interpreted as world-space units. @@ -20,7 +20,7 @@ # UI points are independent of zooming in Views, but are sensitive to the application UI scaling. # For 100% ui scaling, UI points are equal to pixels. rr.log( - "ui_points_points", + "ui_points", rr.Points2D( [[1, 0], [1, 1]], # rr.Radius.ui_points produces radii that the viewer interprets as given in ui points. diff --git a/docs/snippets/all/archetypes/point2d_ui_radius.rs b/docs/snippets/all/archetypes/point2d_ui_radius.rs index d8684f8c9401..846d67fd1355 100644 --- a/docs/snippets/all/archetypes/point2d_ui_radius.rs +++ b/docs/snippets/all/archetypes/point2d_ui_radius.rs @@ -5,7 +5,7 @@ fn main() -> Result<(), Box> { // Two blue points with scene unit radii of 0.1 and 0.3. rec.log( - "scene_unit_points", + "scene_units", &rerun::Points2D::new([(0.0, 0.0), (0.0, 1.0)]) // By default, radii are interpreted as world-space units. .with_radii([0.1, 0.3]) @@ -16,7 +16,7 @@ fn main() -> Result<(), Box> { // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. // For 100% ui scaling, UI points are equal to pixels. rec.log( - "ui_points_points", + "ui_points", &rerun::Points2D::new([(1.0, 0.0), (1.0, 1.0)]) // rerun::Radius::new_ui_points produces a radius that the viewer interprets as given in ui points. .with_radii([ diff --git a/docs/snippets/all/archetypes/point3d_ui_radius.cpp b/docs/snippets/all/archetypes/point3d_ui_radius.cpp index 3caf8677d0a9..0dd66af41395 100644 --- a/docs/snippets/all/archetypes/point3d_ui_radius.cpp +++ b/docs/snippets/all/archetypes/point3d_ui_radius.cpp @@ -8,7 +8,7 @@ int main() { // Two blue points with scene unit radii of 0.1 and 0.3. rec.log( - "scene_unit_points", + "scene_units", rerun::Points3D({{0.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f}}) // By default, radii are interpreted as world-space units. .with_radii({0.1f, 0.3f}) @@ -19,7 +19,7 @@ int main() { // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. // For 100% ui scaling, UI points are equal to pixels. rec.log( - "ui_points_points", + "ui_points", rerun::Points3D({{0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}}) // rerun::Radius::ui_points produces radii that the viewer interprets as given in ui points. .with_radii({ diff --git a/docs/snippets/all/archetypes/point3d_ui_radius.py b/docs/snippets/all/archetypes/point3d_ui_radius.py index a8e8b7aeb0c4..57832c24bf8a 100644 --- a/docs/snippets/all/archetypes/point3d_ui_radius.py +++ b/docs/snippets/all/archetypes/point3d_ui_radius.py @@ -6,7 +6,7 @@ # Two blue points with scene unit radii of 0.1 and 0.3. rr.log( - "scene_unit_points", + "scene_units", rr.Points3D( [[0, 1, 0], [1, 1, 1]], # By default, radii are interpreted as world-space units. @@ -19,7 +19,7 @@ # UI points are independent of zooming in Views, but are sensitive to the application UI scaling. # For 100% ui scaling, UI points are equal to pixels. rr.log( - "ui_points_points", + "ui_points", rr.Points3D( [[0, 0, 0], [1, 0, 1]], # rr.Radius.ui_points produces radii that the viewer interprets as given in ui points. diff --git a/docs/snippets/all/archetypes/point3d_ui_radius.rs b/docs/snippets/all/archetypes/point3d_ui_radius.rs index a57dd7f154c9..65ae06771eef 100644 --- a/docs/snippets/all/archetypes/point3d_ui_radius.rs +++ b/docs/snippets/all/archetypes/point3d_ui_radius.rs @@ -5,7 +5,7 @@ fn main() -> Result<(), Box> { // Two blue points with scene unit radii of 0.1 and 0.3. rec.log( - "scene_unit_points", + "scene_units", &rerun::Points3D::new([(0.0, 1.0, 0.0), (1.0, 1.0, 1.0)]) // By default, radii are interpreted as world-space units. .with_radii([0.1, 0.3]) @@ -16,7 +16,7 @@ fn main() -> Result<(), Box> { // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. // For 100% ui scaling, UI points are equal to pixels. rec.log( - "ui_points_points", + "ui_points", &rerun::Points3D::new([(0.0, 0.0, 0.0), (1.0, 0.0, 1.0)]) // rerun::Radius::new_ui_points produces a radius that the viewer interprets as given in ui points. .with_radii([ diff --git a/rerun_cpp/src/rerun/archetypes/points2d.hpp b/rerun_cpp/src/rerun/archetypes/points2d.hpp index 3d0ea293d3c9..dd9ff2b8e054 100644 --- a/rerun_cpp/src/rerun/archetypes/points2d.hpp +++ b/rerun_cpp/src/rerun/archetypes/points2d.hpp @@ -79,7 +79,7 @@ namespace rerun::archetypes { /// /// // Two blue points with scene unit radii of 0.1 and 0.3. /// rec.log( - /// "scene_unit_points", + /// "scene_units", /// rerun::Points2D({{0.0f, 0.0f}, {0.0f, 1.0f}}) /// // By default, radii are interpreted as world-space units. /// .with_radii({0.1f, 0.3f}) @@ -90,8 +90,8 @@ namespace rerun::archetypes { /// // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. /// // For 100% ui scaling, UI points are equal to pixels. /// rec.log( - /// "ui_points_points", - /// rerun::Points2D({{0.0f, 0.0f}, {1.0f, 1.0f}}) + /// "ui_points", + /// rerun::Points2D({{1.0f, 0.0f}, {1.0f, 1.0f}}) /// // rerun::Radius::ui_points produces radii that the viewer interprets as given in ui points. /// .with_radii({ /// rerun::Radius::ui_points(40.0f), diff --git a/rerun_cpp/src/rerun/archetypes/points3d.hpp b/rerun_cpp/src/rerun/archetypes/points3d.hpp index 4d8ac9d79410..a3ec21c61c23 100644 --- a/rerun_cpp/src/rerun/archetypes/points3d.hpp +++ b/rerun_cpp/src/rerun/archetypes/points3d.hpp @@ -76,7 +76,7 @@ namespace rerun::archetypes { /// /// // Two blue points with scene unit radii of 0.1 and 0.3. /// rec.log( - /// "scene_unit_points", + /// "scene_units", /// rerun::Points3D({{0.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 1.0f}}) /// // By default, radii are interpreted as world-space units. /// .with_radii({0.1f, 0.3f}) @@ -87,7 +87,7 @@ namespace rerun::archetypes { /// // UI points are independent of zooming in Views, but are sensitive to the application UI scaling. /// // For 100% ui scaling, UI points are equal to pixels. /// rec.log( - /// "ui_points_points", + /// "ui_points", /// rerun::Points3D({{0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}}) /// // rerun::Radius::ui_points produces radii that the viewer interprets as given in ui points. /// .with_radii({ diff --git a/rerun_py/rerun_sdk/rerun/archetypes/points2d.py b/rerun_py/rerun_sdk/rerun/archetypes/points2d.py index 22fd7e809e6f..ebbf205bee35 100644 --- a/rerun_py/rerun_sdk/rerun/archetypes/points2d.py +++ b/rerun_py/rerun_sdk/rerun/archetypes/points2d.py @@ -60,7 +60,7 @@ class Points2D(Points2DExt, Archetype): # Two blue points with scene unit radii of 0.1 and 0.3. rr.log( - "scene_unit_points", + "scene_units", rr.Points2D( [[0, 0], [0, 1]], # By default, radii are interpreted as world-space units. @@ -73,7 +73,7 @@ class Points2D(Points2DExt, Archetype): # UI points are independent of zooming in Views, but are sensitive to the application UI scaling. # For 100% ui scaling, UI points are equal to pixels. rr.log( - "ui_points_points", + "ui_points", rr.Points2D( [[1, 0], [1, 1]], # rr.Radius.ui_points produces radii that the viewer interprets as given in ui points. diff --git a/rerun_py/rerun_sdk/rerun/archetypes/points3d.py b/rerun_py/rerun_sdk/rerun/archetypes/points3d.py index f4ba43366818..873a6f2a0145 100644 --- a/rerun_py/rerun_sdk/rerun/archetypes/points3d.py +++ b/rerun_py/rerun_sdk/rerun/archetypes/points3d.py @@ -55,7 +55,7 @@ class Points3D(Points3DExt, Archetype): # Two blue points with scene unit radii of 0.1 and 0.3. rr.log( - "scene_unit_points", + "scene_units", rr.Points3D( [[0, 1, 0], [1, 1, 1]], # By default, radii are interpreted as world-space units. @@ -68,7 +68,7 @@ class Points3D(Points3DExt, Archetype): # UI points are independent of zooming in Views, but are sensitive to the application UI scaling. # For 100% ui scaling, UI points are equal to pixels. rr.log( - "ui_points_points", + "ui_points", rr.Points3D( [[0, 0, 0], [1, 0, 1]], # rr.Radius.ui_points produces radii that the viewer interprets as given in ui points.