|
|
@ -92,13 +92,13 @@ pub enum ShaderStage {
|
|
|
|
|
|
|
|
|
|
|
|
// a component is any type that is 'static, sized, send and sync
|
|
|
|
// a component is any type that is 'static, sized, send and sync
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
|
|
struct Position {
|
|
|
|
pub struct Position {
|
|
|
|
x: f32,
|
|
|
|
x: f32,
|
|
|
|
y: f32,
|
|
|
|
y: f32,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
|
|
struct Velocity {
|
|
|
|
pub struct Velocity {
|
|
|
|
dx: f32,
|
|
|
|
dx: f32,
|
|
|
|
dy: f32,
|
|
|
|
dy: f32,
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -182,7 +182,7 @@ fn main() {
|
|
|
|
|
|
|
|
|
|
|
|
// construct a schedule (you should do this on init)
|
|
|
|
// construct a schedule (you should do this on init)
|
|
|
|
let mut schedule = Schedule::builder()
|
|
|
|
let mut schedule = Schedule::builder()
|
|
|
|
// .add_system(Renderer::render_test)
|
|
|
|
.add_system(render::render_test_system())
|
|
|
|
.build();
|
|
|
|
.build();
|
|
|
|
|
|
|
|
|
|
|
|
// run our schedule (you should do this each update)
|
|
|
|
// run our schedule (you should do this each update)
|
|
|
@ -320,11 +320,14 @@ fn main() {
|
|
|
|
// Load up the renderer (and the resources)
|
|
|
|
// Load up the renderer (and the resources)
|
|
|
|
let mut renderer = render::Renderer::init(device.clone(), &sc_desc);
|
|
|
|
let mut renderer = render::Renderer::init(device.clone(), &sc_desc);
|
|
|
|
|
|
|
|
|
|
|
|
let (plane_vertex_buffer, plane_index_buffer) = Renderer::load_mesh_to_buffer(device.clone(), "plane.obj");
|
|
|
|
let (plane_vertex_buffer, plane_index_buffer) = Renderer::load_mesh_to_buffer(device.clone(), "./resources/untitled.obj");
|
|
|
|
|
|
|
|
|
|
|
|
// Init, this wants the references to the buffers...
|
|
|
|
// Init, this wants the references to the buffers...
|
|
|
|
let mut runtime = runtime::Runtime::init(&sc_desc, &device, &queue);
|
|
|
|
let mut runtime = runtime::Runtime::init(&sc_desc, &device, &queue);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut resources = Resources::default();
|
|
|
|
|
|
|
|
resources.insert(runtime);
|
|
|
|
|
|
|
|
resources.insert(renderer);
|
|
|
|
|
|
|
|
|
|
|
|
// This is just an winit event loop
|
|
|
|
// This is just an winit event loop
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
|
@ -352,6 +355,7 @@ fn main() {
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// ask for a redraw every 20 millis
|
|
|
|
// ask for a redraw every 20 millis
|
|
|
|
if last_update_inst.elapsed() > Duration::from_millis(20) {
|
|
|
|
if last_update_inst.elapsed() > Duration::from_millis(20) {
|
|
|
|
|
|
|
|
schedule.execute(&mut world, &mut resources);
|
|
|
|
window.request_redraw();
|
|
|
|
window.request_redraw();
|
|
|
|
last_update_inst = Instant::now();
|
|
|
|
last_update_inst = Instant::now();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -372,7 +376,7 @@ fn main() {
|
|
|
|
sc_desc.width = size.width;
|
|
|
|
sc_desc.width = size.width;
|
|
|
|
sc_desc.height = size.height;
|
|
|
|
sc_desc.height = size.height;
|
|
|
|
|
|
|
|
|
|
|
|
renderer.resize(&sc_desc, &device, &queue);
|
|
|
|
resources.get_mut::<Renderer>().unwrap().resize(&sc_desc, &device, &queue);
|
|
|
|
|
|
|
|
|
|
|
|
swap_chain = device.create_swap_chain(&surface, &sc_desc);
|
|
|
|
swap_chain = device.create_swap_chain(&surface, &sc_desc);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -404,7 +408,7 @@ fn main() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
renderer.render(&frame.output, &device, &queue, &spawner);
|
|
|
|
resources.get_mut::<Renderer>().unwrap().render(&frame.output, &device, &queue, &spawner);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|