mitchellhansen/minimum-viable-game-engine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resizing fixed

Browse Source
This commit is contained in:
mitchellhansen
2021-02-04 22:00:14 -08:00
parent e2c459872f
commit f3e308cb2f
4 changed files with 93 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@@ -28,7 +28,5 @@ ddsfile = "0.4"
wgpu-subscriber = "0.1.0" wgpu-subscriber = "0.1.0"
tobj = "2.0.3" tobj = "2.0.3"
legion = "0.3.1" legion = "0.3.1"
nalgebra = "0.20"
ncollide3d = "0.22"

122
src/main.rs
View File

@@ -1,5 +1,6 @@
extern crate tobj; extern crate tobj;
extern crate winit; extern crate winit;
extern crate ncollide3d;
use std::rc::Rc; use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
@@ -19,6 +20,7 @@ use winit::{
}; };
use crate::render::Renderer; use crate::render::Renderer;
use winit::event::DeviceEvent::MouseMotion;
mod framework; mod framework;
mod geometry; mod geometry;
@@ -124,66 +126,28 @@ pub struct Mesh {
bind_group: Arc<BindGroup>, bind_group: Arc<BindGroup>,
} }
//log::info!("");
fn main() { fn main() {
// #[cfg(not(target_arch = "wasm32"))]
// {
// let chrome_tracing_dir = std::env::var("WGPU_CHROME_TRACE");
// wgpu_subscriber::initialize_default_subscriber(
// chrome_tracing_dir.as_ref().map(std::path::Path::new).ok(),
// );
// };
// #[cfg(target_arch = "wasm32")]
// console_log::init().expect("could not initialize logger");
use legion::*;
let mut world = World::default(); let mut world = World::default();
/*
Querying entities by their handle
// entries return `None` if the entity does not exist
if let Some(mut entry) = world.entry(entity) {
// access information about the entity's archetype
//println!("{:?} has {:?}", entity, entry.archetype().layout().component_types());
// add an extra component
//entry.add_component(12f32);
// access the entity's components, returns `None` if the entity does not have the component
//assert_eq!(entry.get_component::<f32>().unwrap(), &12f32);
}
*/
#[cfg(not(target_arch = "wasm32"))]
let (mut pool, spawner) = { let (mut pool, spawner) = {
let local_pool = futures::executor::LocalPool::new(); let local_pool = futures::executor::LocalPool::new();
let spawner = local_pool.spawner(); let spawner = local_pool.spawner();
(local_pool, spawner) (local_pool, spawner)
}; };
// Schedule for the render systen
let mut render_schedule = Schedule::builder() let mut render_schedule = Schedule::builder()
.add_system(render::render_test_system()) .add_system(render::render_test_system())
.build(); .build();
// run our schedule (you should do this each update) // TODO schedule for the update system and others
//schedule.execute(&mut world, &mut resources);
// Querying entities by component is just defining the component type!
let mut query = Read::<Position>::query();
// you can then iterate through the components found in the world
for position in query.iter(&world) {
//println!("{:?}", position);
}
let event_loop = EventLoop::new(); let event_loop = EventLoop::new();
let mut builder = winit::window::WindowBuilder::new(); let mut builder = winit::window::WindowBuilder::new();
builder = builder.with_title("title"); builder = builder.with_title("MVGE");
// I don't know what they are doing here // I don't know what they are doing here
#[cfg(windows_OFF)] // TODO #[cfg(windows_OFF)] // TODO
@@ -192,66 +156,48 @@ fn main() {
builder = builder.with_no_redirection_bitmap(true); builder = builder.with_no_redirection_bitmap(true);
} }
// I think right here is where I can start pulling everything into the renderer
let window = builder.build(&event_loop).unwrap(); let window = builder.build(&event_loop).unwrap();
// Not sure why this is guarded, maybe we don't handle the event loop timing?
#[cfg(not(target_arch = "wasm32"))]
let mut last_update_inst = Instant::now(); let mut last_update_inst = Instant::now();
log::info!("Entering render loop...");
// Load up the renderer (and the resources) // Load up the renderer (and the resources)
let mut renderer = render::Renderer::init(window); let mut renderer = {
let mut renderer = render::Renderer::init(&window);
entity_loading(&mut world, &mut renderer); entity_loading(&mut world, &mut renderer);
renderer
};
let mut resources = Resources::default(); let mut resources = Resources::default();
resources.insert(renderer); resources.insert(renderer);
// This is just an winit event loop
event_loop.run(move |event, _, control_flow| {
//let _ = (&instance, &adapter); // force ownership by the closure (wtf??)
// Override the control flow behaviour based on our system event_loop.run(move |event, _, control_flow| {
*control_flow = if cfg!(feature = "metal-auto-capture") {
ControlFlow::Exit // Artificially slows the loop rate to 10 millis
} else { // This is called after redraw events cleared
#[cfg(not(target_arch = "wasm32"))] *control_flow = ControlFlow::WaitUntil(Instant::now() + Duration::from_millis(10));
{
// Artificially slows the loop rate to 10 millis
// This is called after redraw events cleared
ControlFlow::WaitUntil(Instant::now() + Duration::from_millis(10))
}
#[cfg(target_arch = "wasm32")]
{
ControlFlow::Poll
}
};
match event { match event {
event::Event::MainEventsCleared => { event::Event::MainEventsCleared => {
#[cfg(not(target_arch = "wasm32"))] // ask for a redraw every 20 millis
{ if last_update_inst.elapsed() > Duration::from_millis(20) {
// ask for a redraw every 20 millis window.request_redraw();
if last_update_inst.elapsed() > Duration::from_millis(20) { last_update_inst = Instant::now();
//window.request_redraw();
resources
.get_mut::<Renderer>()
.unwrap()
.window
.request_redraw();
last_update_inst = Instant::now();
}
pool.run_until_stalled();
} }
pool.run_until_stalled();
#[cfg(target_arch = "wasm32")]
window.request_redraw();
} }
event::Event::DeviceEvent {
event: MouseMotion{ delta },
..
} => {
resources
.get_mut::<Renderer>()
.unwrap()
.cam_look_delta((delta.0, delta.1));
//swap_chain = device.create_swap_chain(&surface, &sc_desc);
},
// Resizing will queue a request_redraw // Resizing will queue a request_redraw
event::Event::WindowEvent { event::Event::WindowEvent {
event: WindowEvent::Resized(size), event: WindowEvent::Resized(size),
@@ -267,7 +213,7 @@ fn main() {
.resize(width, height); .resize(width, height);
//swap_chain = device.create_swap_chain(&surface, &sc_desc); //swap_chain = device.create_swap_chain(&surface, &sc_desc);
} },
event::Event::WindowEvent { event, .. } => match event { event::Event::WindowEvent { event, .. } => match event {
WindowEvent::KeyboardInput { WindowEvent::KeyboardInput {
input: input:
@@ -286,8 +232,8 @@ fn main() {
} }
}, },
event::Event::RedrawRequested(_) => { event::Event::RedrawRequested(_) => {
// Call the render system
render_schedule.execute(&mut world, &mut resources); render_schedule.execute(&mut world, &mut resources);
//resources.get_mut::<Renderer>().unwrap().render();
} }
_ => {} _ => {}
} }

71
src/render.rs
View File

@@ -3,7 +3,7 @@ use std::{iter, num::NonZeroU32, ops::Range, rc::Rc};
use bytemuck::__core::mem; use bytemuck::__core::mem;
use bytemuck::{Pod, Zeroable}; use bytemuck::{Pod, Zeroable};
use cgmath::Point3; use cgmath::{Point3, Matrix4, Transform, vec3};
use futures::executor::LocalPool; use futures::executor::LocalPool;
use legion::world::SubWorld; use legion::world::SubWorld;
use legion::*; use legion::*;
@@ -54,9 +54,9 @@ pub struct Pass {
} }
pub struct Renderer { pub struct Renderer {
pub window: Window,
swapchain: SwapChain, swapchain: SwapChain,
swapchain_description: Arc<SwapChainDescriptor>, swapchain_description: SwapChainDescriptor,
instance: Arc<Instance>, instance: Arc<Instance>,
device: Arc<Device>, device: Arc<Device>,
queue: Arc<Queue>, queue: Arc<Queue>,
@@ -66,14 +66,18 @@ pub struct Renderer {
lights_are_dirty: bool, lights_are_dirty: bool,
shadow_pass: Pass, shadow_pass: Pass,
forward_pass: Pass,
forward_depth: wgpu::TextureView,
entity_bind_group_layout: BindGroupLayout,
shadow_target_views: Vec<Arc<TextureView>>, shadow_target_views: Vec<Arc<TextureView>>,
views_given: u32, views_given: u32,
forward_pass: Pass,
forward_depth: wgpu::TextureView,
entity_bind_group_layout: BindGroupLayout,
light_uniform_buf: wgpu::Buffer, light_uniform_buf: wgpu::Buffer,
camera_projection: Matrix4<f32>,
} }
impl Renderer { impl Renderer {
@@ -87,12 +91,15 @@ impl Renderer {
const DEPTH_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Depth32Float; const DEPTH_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Depth32Float;
pub(crate) fn generate_matrix(aspect_ratio: f32) -> cgmath::Matrix4<f32> { pub(crate) fn generate_matrix(aspect_ratio: f32) -> cgmath::Matrix4<f32> {
// Specifies the aspect ratio that determines the field of view in the x direction.
// The aspect ratio is the ratio of x (width) to y (height).
let mx_projection = cgmath::perspective(cgmath::Deg(45f32), aspect_ratio, 1.0, 20.0); let mx_projection = cgmath::perspective(cgmath::Deg(45f32), aspect_ratio, 1.0, 20.0);
let mx_view = cgmath::Matrix4::look_at( let mx_view = cgmath::Matrix4::look_at(
cgmath::Point3::new(3.0f32, -10.0, 6.0), cgmath::Point3::new(3.0f32, -9.0, 6.0),
cgmath::Point3::new(0f32, 0.0, 0.0), cgmath::Point3::new(0f32, 0.0, 0.0),
cgmath::Vector3::unit_z(), cgmath::Vector3::unit_z(),
); );
let mx_correction = OPENGL_TO_WGPU_MATRIX; let mx_correction = OPENGL_TO_WGPU_MATRIX;
mx_correction * mx_projection * mx_view mx_correction * mx_projection * mx_view
} }
@@ -239,6 +246,7 @@ pub fn render_test(world: &mut SubWorld, #[resource] renderer: &mut Renderer) {
} }
impl Renderer { impl Renderer {
pub fn get_current_frame(&mut self) -> SwapChainFrame { pub fn get_current_frame(&mut self) -> SwapChainFrame {
// Update the renderers swapchain state // Update the renderers swapchain state
match self.swapchain.get_current_frame() { match self.swapchain.get_current_frame() {
@@ -367,14 +375,14 @@ impl Renderer {
} }
} }
pub fn init(window: Window) -> Renderer { pub fn init(window: &Window) -> Renderer {
log::info!("Initializing the surface..."); log::info!("Initializing the surface...");
// Grab the GPU instance, and query its features // Grab the GPU instance, and query its features
let instance = wgpu::Instance::new(wgpu::BackendBit::PRIMARY); let instance = wgpu::Instance::new(wgpu::BackendBit::PRIMARY);
let (size, surface) = unsafe { let (size, surface) = unsafe {
let size = window.inner_size(); let size = window.inner_size();
let surface = instance.create_surface(&window); let surface = instance.create_surface(window);
(size, surface) (size, surface)
}; };
let surface = Arc::new(surface); let surface = Arc::new(surface);
@@ -443,7 +451,7 @@ impl Renderer {
log::info!("Done doing the loading part..."); log::info!("Done doing the loading part...");
let mut sc_desc = Arc::new(wgpu::SwapChainDescriptor { let mut sc_desc = (wgpu::SwapChainDescriptor {
// Allows a texture to be a output attachment of a renderpass. // Allows a texture to be a output attachment of a renderpass.
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
format: if cfg!(target_arch = "wasm32") { format: if cfg!(target_arch = "wasm32") {
@@ -624,6 +632,9 @@ impl Renderer {
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32);
let forward_pass = { let forward_pass = {
// Create pipeline layout // Create pipeline layout
let bind_group_layout = let bind_group_layout =
@@ -677,8 +688,6 @@ impl Renderer {
push_constant_ranges: &[], push_constant_ranges: &[],
}); });
let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32);
// I need to know the number of lights... // I need to know the number of lights...
let forward_uniforms = ForwardUniforms { let forward_uniforms = ForwardUniforms {
proj: *mx_total.as_ref(), proj: *mx_total.as_ref(),
@@ -791,7 +800,6 @@ impl Renderer {
}); });
Renderer { Renderer {
window,
swapchain: swap_chain, swapchain: swap_chain,
queue: queue, queue: queue,
size, size,
@@ -807,10 +815,11 @@ impl Renderer {
surface, surface,
instance: Arc::new(instance), instance: Arc::new(instance),
views_given: 0, views_given: 0,
camera_projection: mx_total,
} }
} }
pub(crate) fn required_features() -> wgpu::Features { pub fn required_features() -> wgpu::Features {
wgpu::Features::empty() wgpu::Features::empty()
} }
@@ -818,7 +827,36 @@ impl Renderer {
wgpu::Features::DEPTH_CLAMPING wgpu::Features::DEPTH_CLAMPING
} }
pub fn cam_look_delta(&mut self, delta: (f64, f64)) {
// let mx_projection = cgmath::perspective(cgmath::Deg(45f32), aspect_ratio, 1.0, 20.0);
// let mx_view = cgmath::Matrix4::look_at(
// cgmath::Point3::new(3.0f32, -9.0, 6.0),
// cgmath::Point3::new(0f32, 0.0, 0.0),
// cgmath::Vector3::unit_z(),
// );
// let mx_correction = OPENGL_TO_WGPU_MATRIX;
// let mx_total = mx_correction * mx_projection * mx_view;
let mut mx_total = self.camera_projection.clone();
let q = vec3(delta.0 as f32, delta.1 as f32, 1.0);
mx_total.transform_vector(q);
let mx_ref: &[f32; 16] = mx_total.as_ref();
self.queue.write_buffer(
&self.forward_pass.uniform_buf,
0,
bytemuck::cast_slice(mx_ref),
);
}
pub fn resize(&mut self, width: u32, height: u32) { pub fn resize(&mut self, width: u32, height: u32) {
self.swapchain_description.width = width;
self.swapchain_description.height = height;
self.swapchain = self.device.create_swap_chain(
&self.surface, &self.swapchain_description.clone()
);
// update view-projection matrix // update view-projection matrix
let mx_total = Self::generate_matrix(width as f32 / height as f32); let mx_total = Self::generate_matrix(width as f32 / height as f32);
let mx_ref: &[f32; 16] = mx_total.as_ref(); let mx_ref: &[f32; 16] = mx_total.as_ref();
@@ -842,5 +880,8 @@ impl Renderer {
label: Some("Depth Texture"), label: Some("Depth Texture"),
}); });
self.forward_depth = depth_texture.create_view(&wgpu::TextureViewDescriptor::default()); self.forward_depth = depth_texture.create_view(&wgpu::TextureViewDescriptor::default());
self.camera_projection = mx_total;
} }
} }

2
wgpu-diagram
View File

@@ -1 +1 @@
<mxfile host="Electron" modified="2021-02-01T07:58:02.975Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.1.8 Chrome/87.0.4280.88 Electron/11.1.1 Safari/537.36" etag="2NJNGVERa2KLkA7RE-2K" version="14.1.8" type="device"><diagram id="LqEz0sV-94yUqItN7aiY" name="Page-1">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</diagram></mxfile> <mxfile host="Electron" modified="2021-02-05T04:05:12.722Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.1.8 Chrome/87.0.4280.88 Electron/11.1.1 Safari/537.36" etag="obF5lhMXlva4N7-E3vuM" version="14.1.8" type="device"><diagram id="LqEz0sV-94yUqItN7aiY" name="Page-1">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</diagram></mxfile>