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

start with the simulation playing by default. part of #31 and something on the long list of UX issues anyway

Browse Source
This commit is contained in:
Dustin Carlino 2019-12-14 21:02:21 -08:00
parent 9c879ab488
commit 90fcfbc1ea
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ pub struct SandboxMode {
impl SandboxMode { impl SandboxMode {
pub fn new(ctx: &mut EventCtx, ui: &mut UI, mode: GameplayMode) -> SandboxMode { pub fn new(ctx: &mut EventCtx, ui: &mut UI, mode: GameplayMode) -> SandboxMode {
SandboxMode { SandboxMode {
speed: speed::SpeedControls::new(ctx, ui.opts.dev), speed: speed::SpeedControls::new(ctx, ui),
agent_meter: AgentMeter::new(ctx, ui), agent_meter: AgentMeter::new(ctx, ui),
agent_tools: AgentTools::new(), agent_tools: AgentTools::new(),
overlay: Overlays::Inactive, overlay: Overlays::Inactive,

12
game/src/sandbox/speed.rs
View File

@ -50,7 +50,7 @@ enum SpeedState {
} }
impl SpeedControls { impl SpeedControls {
pub fn new(ctx: &mut EventCtx, dev_mode: bool) -> SpeedControls { pub fn new(ctx: &mut EventCtx, ui: &UI) -> SpeedControls {
let draw_fixed = { let draw_fixed = {
let mut batch = GeomBatch::new(); let mut batch = GeomBatch::new();
let mut txt = Vec::new(); let mut txt = Vec::new();
@ -147,7 +147,7 @@ impl SpeedControls {
); );
// 10 sim minutes / real second normally, or 1 sim hour / real second for dev mode // 10 sim minutes / real second normally, or 1 sim hour / real second for dev mode
let speed_cap: f64 = if dev_mode { 3600.0 } else { 600.0 }; let speed_cap: f64 = if ui.opts.dev { 3600.0 } else { 600.0 };
let mut speed_slider = Slider::new(157.0, 10.0); let mut speed_slider = Slider::new(157.0, 10.0);
// Start with speed=1.0 // Start with speed=1.0
speed_slider.set_percent(ctx, (speed_cap / 1.0).powf(-1.0 / std::f64::consts::E)); speed_slider.set_percent(ctx, (speed_cap / 1.0).powf(-1.0 / std::f64::consts::E));
@ -170,6 +170,7 @@ impl SpeedControls {
) )
.at(ScreenPt::new(top_left.x + 600.0, top_left.y + 10.0)); .at(ScreenPt::new(top_left.x + 600.0, top_left.y + 10.0));
let now = Instant::now();
SpeedControls { SpeedControls {
time_panel: TimePanel::new(ctx), time_panel: TimePanel::new(ctx),
top_left, top_left,
@ -185,7 +186,12 @@ impl SpeedControls {
slow_down_btn, slow_down_btn,
speed_up_btn, speed_up_btn,
state: SpeedState::Paused, state: SpeedState::Running {
last_step: now,
speed_description: "...".to_string(),
last_measurement: now,
last_measurement_sim: ui.primary.sim.time(),
},
speed_cap, speed_cap,
} }
} }