asuro/rust-engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mess

Browse Source
This commit is contained in:
Till
2019-08-13 11:36:40 +02:00
parent 35bb18ace9
commit 1a9e37df79
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@@ -45,8 +45,8 @@ impl TestGame {
self.input.frame_start();
let new_time = (renderer.game_data.start_time.elapsed().unwrap().as_micros() as f64 / 1000000.0) as f32;
let frame_time = new_time - renderer.game_data.push_constants.time;
renderer.game_data.push_constants.time = new_time;
// let frame_time = new_time - renderer.game_data.uniform_buffers.iter().map(|ubo| ubo.time).max_by(|a,b| if a > b {Ordering::Greater} else {Ordering::Less} ).unwrap();
// renderer.game_data.uniform_buffers.iter_mut().for_each(|ubo| ubo.time = new_time);
// User interaction
if self.input.button_just_released("quit") {
@@ -58,7 +58,7 @@ impl TestGame {
}
if self.input.button_down("print_framerate") {
println!("{:.0} ms / {:.0} FPS", frame_time * 1000.0, 1.0 / frame_time);
// println!("{:.0} ms / {:.0} FPS", frame_time * 1000.0, 1.0 / frame_time);
}
if self.input.button_just_pressed("test") {
@@ -87,6 +87,8 @@ impl TestGame {
renderer.game_data.push_constants.view = view.into();
renderer.game_data.push_constants.projection = proj.into();
// renderer.game_data.uniform_buffers.iter_mut().for_each(|ubo| ubo.view = view.into());
// renderer.game_data.uniform_buffers.iter_mut().for_each(|ubo| ubo.projection = proj.into());
renderer.game_data.line_push_constants.view = view.into();
renderer.game_data.line_push_constants.projection = proj.into();
@@ -100,7 +102,7 @@ fn main() {
let mut game = TestGame {
input: InputState::new("config/input.toml", log_config),
cam_rotation: Quaternion::one(),
cam_position: Vector3::new(0.0, 0.0, -10.0),
cam_position: Vector3::new(0.0, 3.0, -10.0),
test_meshes: vec![],
cubes: vec![],
log_config