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

adjust possible controls

Browse Source
This commit is contained in:
Dustin Carlino 2018-12-04 12:58:01 -08:00
parent 1bb146fe23
commit 5ea6e0ea18
2 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editor/src/plugins/traffic_signal_editor.rs
View File

@ -136,26 +136,20 @@ impl Plugin for TrafficSignalEditor {
let mut signal = ctx.primary.map.get_traffic_signal(*i).clone();
{
let cycle = &mut signal.cycles[*current_cycle];
if cycle.get_priority(id) == TurnPriority::Priority {
if input.key_pressed(
Key::Backspace,
"remove this turn from this cycle",
) {
cycle.remove(id, &ctx.primary.map);
}
} else if cycle.could_be_priority_turn(id, &ctx.primary.map) {
if input.key_pressed(
if cycle.get_priority(id) != TurnPriority::Stop && input
.key_pressed(Key::Backspace, "remove this turn from this cycle")
{
cycle.edit_turn(id, TurnPriority::Stop, &ctx.primary.map);
} else if cycle.could_be_priority_turn(id, &ctx.primary.map)
&& input.key_pressed(
Key::Space,
"add this turn to this cycle as priority",
) {
cycle.add(id, TurnPriority::Priority, &ctx.primary.map);
}
} else if cycle.get_priority(id) == TurnPriority::Stop {
if input
.key_pressed(Key::Y, "add this turn to this cycle as yield")
{
cycle.add(id, TurnPriority::Yield, &ctx.primary.map);
}
cycle.edit_turn(id, TurnPriority::Priority, &ctx.primary.map);
} else if cycle.could_be_yield_turn(id, &ctx.primary.map) && input
.key_pressed(Key::Y, "add this turn to this cycle as yield")
{
cycle.edit_turn(id, TurnPriority::Yield, &ctx.primary.map);
}
}

45
map_model/src/traffic_signals.rs
View File

@ -78,14 +78,19 @@ pub struct Cycle {
impl Cycle {
pub fn could_be_priority_turn(&self, t1: TurnID, map: &Map) -> bool {
let turn1 = map.get_t(t1);
for t2 in &self.priority_turns {
if map.get_t(t1).conflicts_with(map.get_t(*t2)) {
if t1 == *t2 || turn1.conflicts_with(map.get_t(*t2)) {
return false;
}
}
true
}
pub fn could_be_yield_turn(&self, t: TurnID, map: &Map) -> bool {
!self.yield_turns.contains(&t) && map.get_t(t).turn_type != TurnType::Crosswalk
}
pub fn get_priority(&self, t: TurnID) -> TurnPriority {
if self.priority_turns.contains(&t) {
TurnPriority::Priority
@ -96,12 +101,25 @@ impl Cycle {
}
}
pub fn add(&mut self, t: TurnID, pri: TurnPriority, map: &Map) {
pub fn edit_turn(&mut self, t: TurnID, pri: TurnPriority, map: &Map) {
let turn = map.get_t(t);
assert_eq!(t.parent, self.parent);
// TODO assert not in the current (maybe other) set
// First remove the turn from the old set, if present.
if self.priority_turns.contains(&t) {
assert_ne!(pri, TurnPriority::Priority);
self.priority_turns.remove(&t);
if turn.turn_type == TurnType::Crosswalk {
self.priority_turns.remove(&turn.other_crosswalk_id());
}
} else if self.yield_turns.contains(&t) {
assert_ne!(pri, TurnPriority::Yield);
self.yield_turns.remove(&t);
} else {
assert_ne!(pri, TurnPriority::Stop);
}
// Now add to the new set
match pri {
TurnPriority::Priority => {
// TODO assert compatible
@ -114,30 +132,11 @@ impl Cycle {
assert_ne!(turn.turn_type, TurnType::Crosswalk);
self.yield_turns.insert(t);
}
TurnPriority::Stop => {
panic!("add {} with Stop priority to a Cycle doesn't make sense", t);
}
TurnPriority::Stop => {}
}
self.changed = true;
}
pub fn remove(&mut self, t: TurnID, map: &Map) {
if self.priority_turns.contains(&t) {
self.priority_turns.remove(&t);
let turn = map.get_t(t);
if turn.turn_type == TurnType::Crosswalk {
self.priority_turns.remove(&turn.other_crosswalk_id());
}
} else if self.yield_turns.contains(&t) {
self.yield_turns.remove(&t);
} else {
panic!(
"Cycle {:?} doesn't have {} as a priority or yield turn; why remove it?",
self, t
);
}
}
pub fn edit_duration(&mut self, new_duration: si::Second<f64>) {
self.changed = true;
self.duration = new_duration;