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

cleaning up apply_map_edits

Browse Source
This commit is contained in:
Dustin Carlino 2019-04-24 13:13:03 -07:00
parent e86f88199c
commit 3c2a8feef3
4 changed files with 61 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/design/notes/tutorial.md
View File

@ -260,3 +260,4 @@ Forget top menu, modal menu, OSD, right-click menus, all the current GUI things.
persisting anything as modes change is hard to do with the borrow checker. ex: modal menus within the edit mode, soon the core components like map and drawmap. when we're processing the current state, we &mut, but then we want to take ownership of the pieces, which should sorta be safe because we're replacing the overall state. solved this for screensaver because it's an Option, and we can take() it -- replace with None.
- can we just take ownership and return back at the end?

112
editor/src/edit/mod.rs
View File

@ -2,12 +2,15 @@ mod traffic_signals;
use crate::game::{GameState, Mode};
use crate::objects::{DrawCtx, ID};
use crate::plugins::{apply_map_edits, load_edits, PluginCtx};
use crate::render::{RenderOptions, Renderable, MIN_ZOOM_FOR_DETAIL};
use crate::plugins::load_edits;
use crate::render::{DrawLane, DrawMap, DrawTurn, RenderOptions, Renderable, MIN_ZOOM_FOR_DETAIL};
use crate::state::UIState;
use abstutil::Timer;
use ezgui::{Color, EventCtx, EventLoopMode, GfxCtx, Key, Wizard, WrappedWizard};
use map_model::{IntersectionID, Lane, LaneType, Map, Road, TurnPriority};
use std::collections::HashMap;
use map_model::{
IntersectionID, Lane, LaneID, LaneType, Map, MapEdits, Road, TurnID, TurnPriority,
};
use std::collections::{BTreeSet, HashMap};
pub enum EditMode {
ViewingDiffs,
@ -72,19 +75,7 @@ impl EditMode {
{
let mut new_edits = state.ui.state.primary.map.get_edits().clone();
new_edits.lane_overrides.insert(lane.id, new_type);
apply_map_edits(
&mut PluginCtx {
primary: &mut state.ui.state.primary,
secondary: &mut None,
canvas: ctx.canvas,
cs: &mut state.ui.state.cs,
prerender: ctx.prerender,
input: ctx.input,
hints: &mut state.ui.hints,
recalculate_current_selection: &mut false,
},
new_edits,
);
apply_map_edits(&mut state.ui.state, ctx, new_edits);
}
}
}
@ -131,19 +122,7 @@ impl EditMode {
&mut wizard.wrap(ctx.input, ctx.canvas),
"Load which map edits?",
) {
apply_map_edits(
&mut PluginCtx {
primary: &mut state.ui.state.primary,
secondary: &mut None,
canvas: ctx.canvas,
cs: &mut state.ui.state.cs,
prerender: ctx.prerender,
input: ctx.input,
hints: &mut state.ui.hints,
recalculate_current_selection: &mut false,
},
new_edits,
);
apply_map_edits(&mut state.ui.state, ctx, new_edits);
state.mode = Mode::Edit(EditMode::ViewingDiffs);
} else if wizard.aborted() {
state.mode = Mode::Edit(EditMode::ViewingDiffs);
@ -179,38 +158,14 @@ impl EditMode {
sign.turns.insert(t, next_priority);
let mut new_edits = state.ui.state.primary.map.get_edits().clone();
new_edits.stop_sign_overrides.insert(i, sign);
apply_map_edits(
&mut PluginCtx {
primary: &mut state.ui.state.primary,
secondary: &mut None,
canvas: ctx.canvas,
cs: &mut state.ui.state.cs,
prerender: ctx.prerender,
input: ctx.input,
hints: &mut state.ui.hints,
recalculate_current_selection: &mut false,
},
new_edits,
);
apply_map_edits(&mut state.ui.state, ctx, new_edits);
}
} else if ctx.input.modal_action("quit") {
state.mode = Mode::Edit(EditMode::ViewingDiffs);
} else if ctx.input.modal_action("reset to default") {
let mut new_edits = state.ui.state.primary.map.get_edits().clone();
new_edits.stop_sign_overrides.remove(&i);
apply_map_edits(
&mut PluginCtx {
primary: &mut state.ui.state.primary,
secondary: &mut None,
canvas: ctx.canvas,
cs: &mut state.ui.state.cs,
prerender: ctx.prerender,
input: ctx.input,
hints: &mut state.ui.hints,
recalculate_current_selection: &mut false,
},
new_edits,
);
apply_map_edits(&mut state.ui.state, ctx, new_edits);
}
}
Mode::Edit(EditMode::EditingTrafficSignal(ref mut editor)) => {
@ -402,3 +357,48 @@ fn can_change_lane_type(r: &Road, l: &Lane, lt: LaneType) -> bool {
true
}
pub fn apply_map_edits(state: &mut UIState, ctx: &mut EventCtx, edits: MapEdits) {
let mut timer = Timer::new("apply map edits");
state.primary.current_flags.sim_flags.edits_name = edits.edits_name.clone();
let (lanes_changed, turns_deleted, turns_added) =
state.primary.map.apply_edits(edits, &mut timer);
for l in lanes_changed {
state.primary.draw_map.lanes[l.0] = DrawLane::new(
state.primary.map.get_l(l),
&state.primary.map,
!state.primary.current_flags.dont_draw_lane_markings,
&state.cs,
ctx.prerender,
&mut timer,
);
}
let mut lanes_of_modified_turns: BTreeSet<LaneID> = BTreeSet::new();
for t in turns_deleted {
state.primary.draw_map.turns.remove(&t);
lanes_of_modified_turns.insert(t.src);
}
for t in &turns_added {
lanes_of_modified_turns.insert(t.src);
}
let mut turn_to_lane_offset: HashMap<TurnID, usize> = HashMap::new();
for l in lanes_of_modified_turns {
DrawMap::compute_turn_to_lane_offset(
&mut turn_to_lane_offset,
state.primary.map.get_l(l),
&state.primary.map,
);
}
for t in turns_added {
state.primary.draw_map.turns.insert(
t,
DrawTurn::new(
&state.primary.map,
state.primary.map.get_t(t),
turn_to_lane_offset[&t],
),
);
}
}

16
editor/src/edit/traffic_signals.rs
View File

@ -1,6 +1,6 @@
use crate::edit::apply_map_edits;
use crate::game::GameState;
use crate::objects::{DrawCtx, ID};
use crate::plugins::{apply_map_edits, PluginCtx};
use crate::render::{draw_signal_cycle, draw_signal_diagram, DrawTurn};
use crate::ui::UI;
use abstutil::Timer;
@ -220,19 +220,7 @@ impl TrafficSignalEditor {
} else {
new_edits.traffic_signal_overrides.insert(self.i, signal);
}
apply_map_edits(
&mut PluginCtx {
primary: &mut ui.state.primary,
secondary: &mut None,
canvas: ctx.canvas,
cs: &mut ui.state.cs,
prerender: ctx.prerender,
input: ctx.input,
hints: &mut ui.hints,
recalculate_current_selection: &mut false,
},
new_edits,
);
apply_map_edits(&mut ui.state, ctx, new_edits);
}
false

52
editor/src/plugins/mod.rs
View File

@ -5,18 +5,16 @@ pub mod view;
use crate::colors::ColorScheme;
use crate::objects::{DrawCtx, RenderingHints, ID};
use crate::render::{DrawLane, DrawMap, DrawTurn};
use crate::state::{PerMapUI, PluginsPerMap};
use ::sim::{ABTest, OriginDestination, Scenario};
use abstutil;
use abstutil::{Timer, WeightedUsizeChoice};
use abstutil::WeightedUsizeChoice;
use downcast::{
downcast, downcast_methods, downcast_methods_core, downcast_methods_std, impl_downcast, Any,
};
use ezgui::{Canvas, Color, GfxCtx, Prerender, UserInput, WrappedWizard};
use geom::Duration;
use map_model::{IntersectionID, LaneID, Map, MapEdits, Neighborhood, NeighborhoodBuilder, TurnID};
use std::collections::{BTreeSet, HashMap};
use map_model::{IntersectionID, Map, MapEdits, Neighborhood, NeighborhoodBuilder};
// TODO Split into two types, but then State needs two possible types in its exclusive blocking
// field.
@ -201,49 +199,3 @@ pub fn choose_origin_destination(
choose_intersection(wizard, query).map(OriginDestination::Border)
}
}
// Hmm, this is just shared functionality.
pub fn apply_map_edits(ctx: &mut PluginCtx, edits: MapEdits) {
let mut timer = Timer::new("apply map edits");
ctx.primary.current_flags.sim_flags.edits_name = edits.edits_name.clone();
let (lanes_changed, turns_deleted, turns_added) =
ctx.primary.map.apply_edits(edits, &mut timer);
for l in lanes_changed {
ctx.primary.draw_map.lanes[l.0] = DrawLane::new(
ctx.primary.map.get_l(l),
&ctx.primary.map,
!ctx.primary.current_flags.dont_draw_lane_markings,
ctx.cs,
ctx.prerender,
&mut timer,
);
}
let mut lanes_of_modified_turns: BTreeSet<LaneID> = BTreeSet::new();
for t in turns_deleted {
ctx.primary.draw_map.turns.remove(&t);
lanes_of_modified_turns.insert(t.src);
}
for t in &turns_added {
lanes_of_modified_turns.insert(t.src);
}
let mut turn_to_lane_offset: HashMap<TurnID, usize> = HashMap::new();
for l in lanes_of_modified_turns {
DrawMap::compute_turn_to_lane_offset(
&mut turn_to_lane_offset,
ctx.primary.map.get_l(l),
&ctx.primary.map,
);
}
for t in turns_added {
ctx.primary.draw_map.turns.insert(
t,
DrawTurn::new(
&ctx.primary.map,
ctx.primary.map.get_t(t),
turn_to_lane_offset[&t],
),
);
}
}