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

adding hands to the bikes

Browse Source
This commit is contained in:
Dustin Carlino 2019-05-06 18:14:58 -07:00
parent 95b664e394
commit 939f2fefdd
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
editor/src/render/bike.rs
View File

@ -33,32 +33,50 @@ impl DrawBike {
CarStatus::Stuck => cs.get_def("stuck bike", Color::RED), CarStatus::Stuck => cs.get_def("stuck bike", Color::RED),
CarStatus::Parked => panic!("Can't have a parked bike {}", input.id), CarStatus::Parked => panic!("Can't have a parked bike {}", input.id),
}; };
draw_default.push(( draw_default.push((
cs.get_def("bike frame", Color::grey(0.6)), cs.get_def("bike frame", Color::rgb(0, 128, 128)),
input.body.make_polygons(Distance::meters(0.4)), input.body.make_polygons(Distance::meters(0.4)),
)); ));
{
// Handlebars
let (pos, angle) = input.body.dist_along(0.9 * input.body.length());
draw_default.push((
cs.get("bike frame"),
Line::new(
pos.project_away(body_radius, angle.rotate_degs(90.0)),
pos.project_away(body_radius, angle.rotate_degs(-90.0)),
)
.make_polygons(Distance::meters(0.1)),
));
}
let (pos, facing) = input.body.dist_along(0.4 * input.body.length()); let (body_pos, facing) = input.body.dist_along(0.4 * input.body.length());
let body_circle = Circle::new(pos, body_radius); let body_circle = Circle::new(body_pos, body_radius);
draw_default.push((body_color, body_circle.to_polygon())); draw_default.push((body_color, body_circle.to_polygon()));
draw_default.push(( draw_default.push((
cs.get("pedestrian head"), cs.get("pedestrian head"),
Circle::new(pos, 0.5 * body_radius).to_polygon(), Circle::new(body_pos, 0.5 * body_radius).to_polygon(),
)); ));
{
// Handlebars
let (hand_pos, hand_angle) = input.body.dist_along(0.9 * input.body.length());
draw_default.push((
cs.get("bike frame"),
Line::new(
hand_pos.project_away(body_radius, hand_angle.rotate_degs(90.0)),
hand_pos.project_away(body_radius, hand_angle.rotate_degs(-90.0)),
)
.make_polygons(Distance::meters(0.1)),
));
// Hands
draw_default.push((
body_color,
Line::new(
body_pos.project_away(0.9 * body_radius, facing.rotate_degs(-30.0)),
hand_pos.project_away(0.4 * body_radius, hand_angle.rotate_degs(-90.0)),
)
.make_polygons(Distance::meters(0.08)),
));
draw_default.push((
body_color,
Line::new(
body_pos.project_away(0.9 * body_radius, facing.rotate_degs(30.0)),
hand_pos.project_away(0.4 * body_radius, hand_angle.rotate_degs(90.0)),
)
.make_polygons(Distance::meters(0.08)),
));
}
DrawBike { DrawBike {
id: input.id, id: input.id,
body_circle, body_circle,

8
ezgui/src/widgets/modal_menu.rs
View File

@ -50,7 +50,13 @@ impl ModalMenu {
match self.menu.event(ctx.input.event, ctx.canvas) { match self.menu.event(ctx.input.event, ctx.canvas) {
InputResult::Canceled | InputResult::StillActive => {} InputResult::Canceled | InputResult::StillActive => {}
InputResult::Done(action, _) => { InputResult::Done(action, _) => {
assert!(!ctx.input.event_consumed); //assert!(!ctx.input.event_consumed);
if ctx.input.event_consumed {
panic!(
"{} chosen from ModalMenu, but event {:?} was already consumed",
action, ctx.input.event
);
}
ctx.input.event_consumed = true; ctx.input.event_consumed = true;
self.chosen_action = Some(action); self.chosen_action = Some(action);
} }