a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-24 09:24:26 +03:00
Code Issues Projects Releases Wiki Activity

Recreate the road in the quadtree when modifying width. #597

Browse Source
This commit is contained in:
Dustin Carlino 2021-04-10 11:52:23 -07:00
parent 4a0635fa5a
commit 6b30bffc43
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/src/edit/mod.rs
View File

@ -690,7 +690,7 @@ pub fn apply_map_edits(ctx: &mut EventCtx, app: &mut App, edits: MapEdits) {
for r in roads_changed { for r in roads_changed {
let road = app.primary.map.get_r(r); let road = app.primary.map.get_r(r);
app.primary.draw_map.roads[r.0].clear_rendering(); app.primary.draw_map.recreate_road(road, &app.primary.map);
// An edit to one lane potentially affects markings in all lanes in the same road, because // An edit to one lane potentially affects markings in all lanes in the same road, because
// of one-way markings, driving lines, etc. // of one-way markings, driving lines, etc.

18
map_gui/src/render/map.rs
View File

@ -4,7 +4,9 @@ use aabb_quadtree::QuadTree;
use abstutil::Timer; use abstutil::Timer;
use geom::{Bounds, Polygon}; use geom::{Bounds, Polygon};
use map_model::{AreaID, BuildingID, BusStopID, IntersectionID, LaneID, Map, ParkingLotID, RoadID}; use map_model::{
AreaID, BuildingID, BusStopID, IntersectionID, LaneID, Map, ParkingLotID, Road, RoadID,
};
use widgetry::{Color, Drawable, EventCtx, GeomBatch}; use widgetry::{Color, Drawable, EventCtx, GeomBatch};
use crate::colors::ColorScheme; use crate::colors::ColorScheme;
@ -145,7 +147,9 @@ impl DrawMap {
let mut quadtree_ids = HashMap::new(); let mut quadtree_ids = HashMap::new();
// TODO use iter chain if everything was boxed as a renderable... // TODO use iter chain if everything was boxed as a renderable...
for obj in &roads { for obj in &roads {
let item_id =
quadtree.insert_with_box(obj.get_id(), obj.get_outline(map).get_bounds().as_bbox()); quadtree.insert_with_box(obj.get_id(), obj.get_outline(map).get_bounds().as_bbox());
quadtree_ids.insert(obj.get_id(), item_id);
} }
for (_, obj) in &lanes { for (_, obj) in &lanes {
let item_id = let item_id =
@ -480,4 +484,16 @@ impl DrawMap {
self.quadtree_ids.insert(draw.get_id(), item_id); self.quadtree_ids.insert(draw.get_id(), item_id);
self.intersections[i.0] = draw; self.intersections[i.0] = draw;
} }
pub fn recreate_road(&mut self, road: &Road, map: &Map) {
let item_id = self.quadtree_ids.remove(&ID::Road(road.id)).unwrap();
self.quadtree.remove(item_id).unwrap();
let draw = DrawRoad::new(road);
let item_id = self
.quadtree
.insert_with_box(draw.get_id(), draw.get_outline(map).get_bounds().as_bbox());
self.quadtree_ids.insert(draw.get_id(), item_id);
self.roads[road.id.0] = draw;
}
} }