From 421a79af65dd2f5cdbb1e58a15bfab2f4f11f2e8 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Mon, 8 Aug 2022 21:31:30 +0000 Subject: [PATCH] deploy: fced9db318b58d421c298db836f2190ea763aaa0 --- rustdoc/map_gui/tools/polygon/index.html | 2 +- rustdoc/map_gui/tools/polygon/struct.EditPolygon.html | 2 +- rustdoc/map_gui/tools/struct.EditPolygon.html | 2 +- .../title_screen/built_info/constant.BUILT_TIME_UTC.html | 2 +- .../debug/build/map_gui-163541a4ac2f3b12/out/built.rs.html | 2 +- rustdoc/src/map_gui/tools/polygon.rs.html | 6 ++++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rustdoc/map_gui/tools/polygon/index.html b/rustdoc/map_gui/tools/polygon/index.html index 145f2e5e01..29a0f3ffa1 100644 --- a/rustdoc/map_gui/tools/polygon/index.html +++ b/rustdoc/map_gui/tools/polygon/index.html @@ -4,7 +4,7 @@

Structs

Enums

Obj 🔒
\ No newline at end of file diff --git a/rustdoc/map_gui/tools/polygon/struct.EditPolygon.html b/rustdoc/map_gui/tools/polygon/struct.EditPolygon.html index 3798f560fe..12db58d576 100644 --- a/rustdoc/map_gui/tools/polygon/struct.EditPolygon.html +++ b/rustdoc/map_gui/tools/polygon/struct.EditPolygon.html @@ -7,7 +7,7 @@

Struct map_gui::tools::polygon::EditPolygon

source · []
pub struct EditPolygon {
     points: Vec<Pt2D>,
     world: Cached<f64, World<Obj>>,
-}

Fields

points: Vec<Pt2D>world: Cached<f64, World<Obj>>

Implementations

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

+}

Fields

points: Vec<Pt2D>world: Cached<f64, World<Obj>>

Implementations

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Immutably borrows from an owned value. Read more

Mutably borrows from an owned value. Read more

Convert Box<dyn Trait> (where Trait: Downcast) to Box<dyn Any>. Box<dyn Any> can diff --git a/rustdoc/map_gui/tools/struct.EditPolygon.html b/rustdoc/map_gui/tools/struct.EditPolygon.html index 853c9e735f..437b86a31c 100644 --- a/rustdoc/map_gui/tools/struct.EditPolygon.html +++ b/rustdoc/map_gui/tools/struct.EditPolygon.html @@ -7,7 +7,7 @@

Struct map_gui::tools::EditPolygon

source · []
pub struct EditPolygon {
     points: Vec<Pt2D>,
     world: Cached<f64, World<Obj>>,
-}

Fields

points: Vec<Pt2D>world: Cached<f64, World<Obj>>

Implementations

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

+}

Fields

points: Vec<Pt2D>world: Cached<f64, World<Obj>>

Implementations

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Immutably borrows from an owned value. Read more

Mutably borrows from an owned value. Read more

Convert Box<dyn Trait> (where Trait: Downcast) to Box<dyn Any>. Box<dyn Any> can diff --git a/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html index 51d3a1fbfb..0e3143d818 100644 --- a/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html @@ -4,6 +4,6 @@

pub const BUILT_TIME_UTC: &str = r"Mon, 08 Aug 2022 14:56:47 +0000";
Expand description

The build time in RFC2822, UTC.

+

Constant map_gui::tools::title_screen::built_info::BUILT_TIME_UTC

source · []
pub const BUILT_TIME_UTC: &str = r"Mon, 08 Aug 2022 21:30:28 +0000";
Expand description

The build time in RFC2822, UTC.

\ No newline at end of file diff --git a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-163541a4ac2f3b12/out/built.rs.html b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-163541a4ac2f3b12/out/built.rs.html index e85a5ef5ef..adcdd6b271 100644 --- a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-163541a4ac2f3b12/out/built.rs.html +++ b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-163541a4ac2f3b12/out/built.rs.html @@ -179,7 +179,7 @@ pub const RUSTDOC_VERSION: &str = r"rustdoc 1.62.1 (e092d0b6b 2022-07-16)"; #[doc=r#"The build time in RFC2822, UTC."#] #[allow(dead_code)] -pub const BUILT_TIME_UTC: &str = r"Mon, 08 Aug 2022 14:56:47 +0000"; +pub const BUILT_TIME_UTC: &str = r"Mon, 08 Aug 2022 21:30:28 +0000"; #[doc=r#"The target architecture, given by `CARGO_CFG_TARGET_ARCH`."#] #[allow(dead_code)] pub const CFG_TARGET_ARCH: &str = r"x86_64"; diff --git a/rustdoc/src/map_gui/tools/polygon.rs.html b/rustdoc/src/map_gui/tools/polygon.rs.html index f6560ae5ca..7d51539945 100644 --- a/rustdoc/src/map_gui/tools/polygon.rs.html +++ b/rustdoc/src/map_gui/tools/polygon.rs.html @@ -127,6 +127,7 @@ 122 123 124 +125
use crate::AppLike;
 use geom::{Circle, Distance, FindClosest, Pt2D, Ring};
 use widgetry::mapspace::{ObjectID, World, WorldOutcome};
@@ -172,11 +173,12 @@
                 .build(ctx);
         }
 
+        // Scale the circle as we zoom out
+        let circle = Circle::new(Pt2D::zero(), Distance::meters(10.0) / ctx.canvas.cam_zoom).to_polygon();
         for (idx, pt) in self.points.iter().enumerate() {
             world
                 .add(Obj::Point(idx))
-                // Scale the circle as we zoom out
-                .hitbox(Circle::new(*pt, Distance::meters(10.0) / ctx.canvas.cam_zoom).to_polygon())
+                .hitbox(circle.translate(pt.x(), pt.y()))
                 .zorder(1)
                 .draw_color(Color::RED)
                 .hover_alpha(0.8)