This commit is contained in:
2018-11-19 15:30:57 +01:00
parent a8f928f488
commit f3643ba31b
11 changed files with 126 additions and 225 deletions
+1 -3
View File
@@ -1,3 +1 @@
fn main() {
}
fn main() {}
+19 -30
View File
@@ -1,26 +1,18 @@
#[macro_use]
extern crate clap;
extern crate sfml;
extern crate rusty;
extern crate sfml;
use std::time::Instant;
use clap::{
Arg,
App,
};
use clap::{App, Arg};
use sfml::window::{
Event,
Key,
joystick,
};
use sfml::window::{joystick, Event, Key};
use rusty::engine::scene::Scene;
use rusty::engine::character::Character;
use rusty::engine::controls::Controls;
use rusty::engine::renderer::Renderer;
use rusty::engine::scene::Scene;
fn parse_resolution(res: &str) -> Result<(u32, u32), String> {
let split = res.split('x').collect::<Vec<_>>();
@@ -43,21 +35,22 @@ fn parse_resolution(res: &str) -> Result<(u32, u32), String> {
}
fn main() {
let matches = App::new("Rusty Maker")
.version(crate_version!())
.arg(Arg::with_name("resolution")
.short("r")
.long("resolution")
.value_name("WIDTHxHEIGHT")
.takes_value(true)
.default_value("800x450")
.validator(|x| parse_resolution(&x).map(|_| ())))
.arg(Arg::with_name("fullscreen")
.short("f")
.long("fullscreen")
.takes_value(false))
.get_matches();
.arg(
Arg::with_name("resolution")
.short("r")
.long("resolution")
.value_name("WIDTHxHEIGHT")
.takes_value(true)
.default_value("800x450")
.validator(|x| parse_resolution(&x).map(|_| ())),
).arg(
Arg::with_name("fullscreen")
.short("f")
.long("fullscreen")
.takes_value(false),
).get_matches();
let resolution = parse_resolution(matches.value_of("resolution").unwrap()).unwrap();
let fullscreen = matches.is_present("fullscreen");
@@ -83,10 +76,8 @@ fn main() {
let mut running = true;
loop {
// Manage the events
while let Some(event) = renderer.poll_event() {
match event {
// Quit the game if window is closed
Event::Closed => running = false,
@@ -120,10 +111,8 @@ fn main() {
// Display and manage the frame rate
renderer.display();
if ! running {
if !running {
break;
}
}
}