|
|
|
@@ -2,24 +2,28 @@ use glc::{ |
|
|
|
misc::Bindable, |
|
|
|
shader::{Program, Shader, Type}, |
|
|
|
}; |
|
|
|
use log::error; |
|
|
|
use log::{error, info}; |
|
|
|
use shrev::{EventChannel, ReaderId}; |
|
|
|
use specs::{ReadExpect, System, World, WriteExpect}; |
|
|
|
|
|
|
|
use crate::Error; |
|
|
|
|
|
|
|
use super::super::misc::{camera::Camera, events::WindowEvent, geometry::Geometry}; |
|
|
|
use super::super::misc::{ |
|
|
|
camera::Camera, events::WindowEvent, frame_counter::FrameCounter, geometry::Geometry, |
|
|
|
}; |
|
|
|
|
|
|
|
/* Global */ |
|
|
|
|
|
|
|
pub struct Global { |
|
|
|
pub camera: Camera, |
|
|
|
pub frame_counter: FrameCounter, |
|
|
|
} |
|
|
|
|
|
|
|
impl Global { |
|
|
|
pub fn new() -> Result<Self, Error> { |
|
|
|
Ok(Self { |
|
|
|
camera: Camera::new()?, |
|
|
|
frame_counter: FrameCounter::default(), |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -82,6 +86,10 @@ impl<'a> System<'a> for Init { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if global.frame_counter.next() { |
|
|
|
info!("FPS: {}", global.frame_counter.fps()); |
|
|
|
} |
|
|
|
|
|
|
|
self.program.bind(); |
|
|
|
geometry.render_quad(); |
|
|
|
self.program.unbind(); |
|
|
|
|