{"header":{"message":"add new middleware folder","description":null,"timestamp":"2024-02-06T23:14:35.896960657Z","authors":[{}]},"hash":"34CROJEM52NB7TGBCGGMIYAQ2AZUI44FWO25MGYYUSCMHLCLJNAQC","authors":[{"login":"Jengamon","key":"47a75hR6eVaawZfVGBs2CqZUKZbcNz5Ago5CubrCkWvZ"}],"deps":{"hashes":[["34CROJEM52NB7TGBCGGMIYAQ2AZUI44FWO25MGYYUSCMHLCLJNAQC","add new middleware folder"],["AA",null],["HTDZ53HWD4X3DSFZX7MMC7DPFJNHQPGBVLJD2S325SQRRVIQ3CLAC","separate world rendering into middleware pattern"],["LJD76LBNKTWSAHLRGL7EXNMM5HYRSOD6VXWYQSX2XVK7TQROTZ6QC","add render options and gamma control"],["HUZ7YFN6VIDK3MFB45AC5HP5JLT7XKJQ4SMNXTFY2L5TRTFY4OHAC","sketch out world renderer"],["L5SVCVPJMJPDARA4H43U5INQMAKHUIB5PUP55IDRKAPQDB35MXZQC","add camera tests"]],"deps":["HTDZ53HWD4X3DSFZX7MMC7DPFJNHQPGBVLJD2S325SQRRVIQ3CLAC"],"known":["LJD76LBNKTWSAHLRGL7EXNMM5HYRSOD6VXWYQSX2XVK7TQROTZ6QC","HUZ7YFN6VIDK3MFB45AC5HP5JLT7XKJQ4SMNXTFY2L5TRTFY4OHAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":2925},"path":"src/screen/middleware.rs","line":4,"ins":{"up_context":[{"change":3,"pos":82}],"down_context":[],"flag":"BLOCK","start":0,"end":11,"inode":{"change":3,"pos":2925}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":82},"to":{"change":2,"start":1438,"end":4385},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":4385},"to":{"change":3,"start":190,"end":216},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":190},"to":{"change":3,"start":190,"end":216},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":216},"to":{"change":2,"start":4386,"end":6501},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":6501},"to":{"change":3,"start":301,"end":365},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":301},"to":{"change":3,"start":301,"end":365},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":365},"to":{"change":2,"start":6502,"end":17782},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":17782},"to":{"change":3,"start":385,"end":396},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":385},"to":{"change":3,"start":385,"end":396},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":396},"to":{"change":2,"start":17783,"end":19063},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":19063},"to":{"change":3,"start":472,"end":483},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":472},"to":{"change":3,"start":472,"end":483},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":483},"to":{"change":2,"start":19064,"end":19095},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":19095},"to":{"change":3,"start":510,"end":592},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":510},"to":{"change":3,"start":510,"end":592},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":592},"to":{"change":2,"start":19096,"end":19152},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":19152},"to":{"change":3,"start":647,"end":659},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":647},"to":{"change":3,"start":647,"end":659},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":659},"to":{"change":2,"start":19153,"end":19731},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":19731},"to":{"change":3,"start":725,"end":743},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":725},"to":{"change":3,"start":725,"end":743},"introduced_by":3}],"inode":{"change":3,"pos":2925}},"ins_contents":[{"Add":"mod world;"}],"del_contents":[{"Del":"mod world {\n use std::collections::HashMap;\n\n use assets_manager::AssetCache;\n use encase::{ShaderType, UniformBuffer};\n use naga_oil::compose;\n use wgpu::util::DeviceExt;\n use winit::window::Window;\n\n use crate::screen::{Camera, RenderOptions, WORLD_HALF_EXTENTS};\n\n /// Information sent to the shader about our camera\n #[derive(ShaderType)]\n struct CameraUniform {\n view_proj: glam::Mat4,\n }\n\n impl CameraUniform {\n fn new() -> Self {\n Self {\n view_proj: glam::Mat4::IDENTITY,\n }\n }\n\n fn update_view_proj(&mut self, camera: &Camera) {\n self.view_proj = camera.build_view_projection_matrix();\n }\n }\n\n pub struct WorldRenderer {\n // world_texture: wgpu::Texture,\n world_texture_view: wgpu::TextureView,\n // world_texture_sampler: wgpu::Sampler,\n world_texture_bind_group: wgpu::BindGroup,\n\n camera_uniform: CameraUniform,\n camera_buffer: wgpu::Buffer,\n camera_bind_group: wgpu::BindGroup,\n\n render_options_buffer: wgpu::Buffer,\n render_options_bind_group: wgpu::BindGroup,\n\n /// Renders from the world texture to screen space within the bounds of the camera\n // TODO eventually handle screen space effects\n world_render_pipeline: wgpu::RenderPipeline,\n // num_world_vertices: u32,\n num_world_indices: u32,\n world_vertex_buffer: wgpu::Buffer,\n world_index_buffer: wgpu::Buffer,\n }\n\n pub struct WorldRenderFrameData {}\n\n /// Most general type of vertex\n /// Specifies a position, then tex coordinates, then an associated color (w/ alpha)\n #[repr(C)]\n #[derive(Copy, Clone, Debug, bytemuck::Pod, bytemuck::Zeroable)]\n struct Vertex {\n position: [f32; 3],\n tex_coords: [f32; 2],\n color: [f32; 4],\n }\n\n impl Vertex {\n fn desc() -> wgpu::VertexBufferLayout<'static> {\n wgpu::VertexBufferLayout {\n array_stride: std::mem::size_of::() as wgpu::BufferAddress,\n step_mode: wgpu::VertexStepMode::Vertex,\n attributes: &[\n wgpu::VertexAttribute {\n offset: 0,\n shader_location: 0,\n format: wgpu::VertexFormat::Float32x3,\n },\n wgpu::VertexAttribute {\n offset: std::mem::size_of::<[f32; 3]>() as wgpu::BufferAddress,\n shader_location: 1,\n format: wgpu::VertexFormat::Float32x2,\n },\n wgpu::VertexAttribute {\n offset: std::mem::size_of::<[f32; 5]>() as wgpu::BufferAddress,\n shader_location: 2,\n format: wgpu::VertexFormat::Float32x4,\n },\n ],\n }\n }\n }\n"},{"Del":"\n impl WorldRenderer {\n"},{"Del":" const INDICES: &'static [u16] = &[0, 2, 3, 0, 1, 2];\n /// `w` and `h` are percentages of the screen to use to render the world, (0.0, 1.0]\n fn generate_world_vertices(w: f32, h: f32) -> Vec {\n let verts = vec![\n Vertex {\n position: [-w, -h, 0.0],\n tex_coords: [0.0, 1.0],\n color: [1.0, 1.0, 1.0, 1.0],\n },\n Vertex {\n position: [w, -h, 0.0],\n tex_coords: [1.0, 1.0],\n color: [1.0, 1.0, 1.0, 1.0],\n },\n Vertex {\n position: [w, h, 0.0],\n tex_coords: [1.0, 0.0],\n color: [1.0, 1.0, 1.0, 1.0],\n },\n Vertex {\n position: [-w, h, 0.0],\n tex_coords: [0.0, 0.0],\n color: [1.0, 1.0, 1.0, 1.0],\n },\n ];\n\n verts\n }\n\n fn create_composer(\n _assets: &AssetCache,\n ) -> Result {\n let mut composer = compose::Composer::default();\n\n // HDR module\n let hdr_module_src = include_str!(\"../hdr.wgsl\");\n let (name, imports, shader_defs) = compose::get_preprocessor_data(hdr_module_src);\n composer.add_composable_module(compose::ComposableModuleDescriptor {\n as_name: name,\n source: hdr_module_src,\n file_path: \"hdr.wgsl\",\n language: compose::ShaderLanguage::Wgsl,\n additional_imports: &imports,\n shader_defs,\n })?;\n\n Ok(composer)\n }\n\n pub fn world_texture_view(&self) -> &wgpu::TextureView {\n &self.world_texture_view\n }\n\n pub fn new(\n device: &wgpu::Device,\n texture_format: wgpu::TextureFormat,\n world_texture_format: wgpu::TextureFormat,\n assets: &AssetCache,\n ) -> color_eyre::Result {\n"},{"Del":" let _ = device;\n let _ = texture_format;\n"},{"Del":" let num_world_indices = Self::INDICES.len() as u32;\n let mut composer = Self::create_composer(assets)?;\n\n let world_vertices = Self::generate_world_vertices(1.0, 1.0);\n // let num_world_vertices = world_vertices.len() as u32;\n let world_vertex_buffer =\n device.create_buffer_init(&wgpu::util::BufferInitDescriptor {\n label: Some(\"world vertex buffer\"),\n contents: bytemuck::cast_slice(&world_vertices),\n usage: wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,\n });\n let world_index_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {\n label: Some(\"world vertex buffer\"),\n contents: bytemuck::cast_slice(Self::INDICES),\n usage: wgpu::BufferUsages::INDEX,\n });\n let world_texture = device.create_texture(&wgpu::TextureDescriptor {\n size: wgpu::Extent3d {\n width: WORLD_HALF_EXTENTS.x * 2,\n height: WORLD_HALF_EXTENTS.y * 2,\n depth_or_array_layers: 1,\n },\n mip_level_count: 1,\n sample_count: 1,\n dimension: wgpu::TextureDimension::D2,\n format: world_texture_format,\n usage: wgpu::TextureUsages::RENDER_ATTACHMENT\n | wgpu::TextureUsages::TEXTURE_BINDING,\n label: Some(\"world texture\"),\n view_formats: &[],\n });\n let world_texture_view =\n world_texture.create_view(&wgpu::TextureViewDescriptor::default());\n let world_texture_sampler = device.create_sampler(&wgpu::SamplerDescriptor {\n address_mode_u: wgpu::AddressMode::ClampToEdge,\n address_mode_v: wgpu::AddressMode::ClampToEdge,\n address_mode_w: wgpu::AddressMode::ClampToEdge,\n mag_filter: wgpu::FilterMode::Nearest,\n min_filter: wgpu::FilterMode::Nearest,\n mipmap_filter: wgpu::FilterMode::Nearest,\n ..Default::default()\n });\n let world_texture_bind_group_layout =\n device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {\n label: Some(\"world texture bind group layout\"),\n entries: &[\n wgpu::BindGroupLayoutEntry {\n binding: 0,\n visibility: wgpu::ShaderStages::FRAGMENT,\n ty: wgpu::BindingType::Texture {\n sample_type: wgpu::TextureSampleType::Float { filterable: true },\n view_dimension: wgpu::TextureViewDimension::D2,\n multisampled: false,\n },\n count: None,\n },\n wgpu::BindGroupLayoutEntry {\n binding: 1,\n visibility: wgpu::ShaderStages::FRAGMENT,\n ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),\n count: None,\n },\n ],\n });\n let world_texture_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {\n label: Some(\"world texture bind group\"),\n layout: &world_texture_bind_group_layout,\n entries: &[\n wgpu::BindGroupEntry {\n binding: 0,\n resource: wgpu::BindingResource::TextureView(&world_texture_view),\n },\n wgpu::BindGroupEntry {\n binding: 1,\n resource: wgpu::BindingResource::Sampler(&world_texture_sampler),\n },\n ],\n });\n\n let camera_uniform = CameraUniform::new();\n let mut uniform_buffer = UniformBuffer::new(Vec::new());\n uniform_buffer.write(&camera_uniform).unwrap();\n let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {\n label: Some(\"camera buffer\"),\n contents: &uniform_buffer.into_inner(),\n usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,\n });\n let camera_bind_group_layout =\n device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {\n label: Some(\"camera bind group layout\"),\n entries: &[wgpu::BindGroupLayoutEntry {\n binding: 0,\n visibility: wgpu::ShaderStages::VERTEX,\n ty: wgpu::BindingType::Buffer {\n ty: wgpu::BufferBindingType::Uniform,\n has_dynamic_offset: false,\n min_binding_size: None,\n },\n count: None,\n }],\n });\n let camera_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {\n layout: &camera_bind_group_layout,\n entries: &[wgpu::BindGroupEntry {\n binding: 0,\n resource: camera_buffer.as_entire_binding(),\n }],\n label: Some(\"camera bind group\"),\n });\n let render_options = RenderOptions::default();\n let mut render_options_uniform_buffer = UniformBuffer::new(Vec::new());\n render_options_uniform_buffer\n .write(&render_options)\n .unwrap();\n let render_options_buffer =\n device.create_buffer_init(&wgpu::util::BufferInitDescriptor {\n label: Some(\"render options buffer\"),\n contents: &render_options_uniform_buffer.into_inner(),\n usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,\n });\n let render_options_bind_group_layout =\n device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {\n entries: &[wgpu::BindGroupLayoutEntry {\n binding: 0,\n visibility: wgpu::ShaderStages::FRAGMENT,\n ty: wgpu::BindingType::Buffer {\n ty: wgpu::BufferBindingType::Uniform,\n has_dynamic_offset: false,\n min_binding_size: None,\n },\n count: None,\n }],\n label: Some(\"render options bind group layout\"),\n });\n let render_options_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {\n label: Some(\"render options bind group\"),\n layout: &render_options_bind_group_layout,\n entries: &[wgpu::BindGroupEntry {\n binding: 0,\n resource: render_options_buffer.as_entire_binding(),\n }],\n });\n\n // let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {\n // label: Some(\"world shader\"),\n // source: wgpu::ShaderSource::Wgsl(include_str!(\"world_shader.wgsl\").into()),\n // });\n\n let composed_world_shader =\n composer.make_naga_module(compose::NagaModuleDescriptor {\n source: include_str!(\"../world_shader.wgsl\"),\n file_path: \"world_shader.wgsl\",\n shader_type: compose::ShaderType::Wgsl,\n shader_defs: HashMap::new(),\n additional_imports: &[],\n })?;\n let mut validator = naga::valid::Validator::new(\n naga::valid::ValidationFlags::default(),\n naga::valid::Capabilities::default(),\n );\n let composed_world_shader_module_info = validator.validate(&composed_world_shader)?;\n let shader_source = naga::back::wgsl::write_string(\n &composed_world_shader,\n &composed_world_shader_module_info,\n naga::back::wgsl::WriterFlags::EXPLICIT_TYPES,\n )?;\n let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {\n label: Some(\"world shader\"),\n source: wgpu::ShaderSource::Wgsl(shader_source.into()),\n });\n\n let world_render_pipeline_layout =\n device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {\n label: Some(\"world render pipeline layout\"),\n bind_group_layouts: &[\n &world_texture_bind_group_layout,\n &camera_bind_group_layout,\n &render_options_bind_group_layout,\n ],\n push_constant_ranges: &[],\n });\n let world_render_pipeline =\n device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {\n label: Some(\"world render pipeline\"),\n layout: Some(&world_render_pipeline_layout),\n vertex: wgpu::VertexState {\n module: &shader,\n entry_point: \"vs_main\",\n buffers: &[Vertex::desc()],\n },\n primitive: wgpu::PrimitiveState {\n topology: wgpu::PrimitiveTopology::TriangleList,\n strip_index_format: None,\n front_face: wgpu::FrontFace::Ccw,\n cull_mode: Some(wgpu::Face::Back),\n polygon_mode: wgpu::PolygonMode::Fill,\n unclipped_depth: false,\n conservative: false,\n },\n depth_stencil: None,\n multisample: wgpu::MultisampleState {\n count: 1,\n mask: !0,\n alpha_to_coverage_enabled: false,\n },\n fragment: Some(wgpu::FragmentState {\n module: &shader,\n entry_point: \"fs_main\",\n targets: &[Some(wgpu::ColorTargetState {\n format: texture_format,\n blend: Some(wgpu::BlendState::REPLACE),\n write_mask: wgpu::ColorWrites::ALL,\n })],\n }),\n multiview: None,\n });\n\n Ok(Self {\n world_texture_view,\n world_texture_bind_group,\n camera_uniform,\n camera_buffer,\n camera_bind_group,\n render_options_buffer,\n render_options_bind_group,\n world_render_pipeline,\n num_world_indices,\n world_vertex_buffer,\n world_index_buffer,\n })\n"},{"Del":" }\n\n"},{"Del":" pub fn prepare(\n &mut self,\n _device: &wgpu::Device,\n queue: &wgpu::Queue,\n window: &Window,\n camera: &mut Camera,\n render_options: &RenderOptions,\n ) -> WorldRenderFrameData {\n if let Some((w, h)) = camera.update_aspect(window) {\n // Update the world vertex buffer\n let new_world_vertices = Self::generate_world_vertices(w, h);\n queue.write_buffer(\n &self.world_vertex_buffer,\n 0,\n bytemuck::cast_slice(&new_world_vertices),\n );\n }\n\n // Update the camera and camera buffer\n self.camera_uniform.update_view_proj(camera);\n let mut uniform_buffer = UniformBuffer::new(Vec::new());\n uniform_buffer.write(&self.camera_uniform).unwrap();\n queue.write_buffer(&self.camera_buffer, 0, &uniform_buffer.into_inner());\n\n // Update render options\n let mut uniform_buffer = UniformBuffer::new(Vec::new());\n uniform_buffer.write(render_options).unwrap();\n queue.write_buffer(&self.render_options_buffer, 0, &uniform_buffer.into_inner());\n\n WorldRenderFrameData {}\n"},{"Del":" }\n\n"},{"Del":" pub fn render<'rpass>(\n"},{"Del":" &'rpass self,\n render_pass: &mut wgpu::RenderPass<'rpass>,\n"},{"Del":" _render_data: &'rpass WorldRenderFrameData,\n"},{"Del":" ) {\n"},{"Del":" render_pass.set_pipeline(&self.world_render_pipeline);\n render_pass.set_bind_group(0, &self.world_texture_bind_group, &[]);\n render_pass.set_bind_group(1, &self.camera_bind_group, &[]);\n render_pass.set_bind_group(2, &self.render_options_bind_group, &[]);\n render_pass.set_vertex_buffer(0, self.world_vertex_buffer.slice(..));\n render_pass\n .set_index_buffer(self.world_index_buffer.slice(..), wgpu::IndexFormat::Uint16);\n render_pass.draw_indexed(0..self.num_world_indices, 0, 0..1);\n"},{"Del":" }\n }\n}\n"}]}},{"FileAdd":{"meta":{"basename":"middleware","metadata":576},"context":[{"change":6,"pos":44}],"contents":[]}},{"FileAdd":{"meta":{"basename":"world.rs","metadata":0},"context":[{"change":0,"pos":34}],"contents":[{"Add":"use std::collections::HashMap;"},{"Add":""},{"Add":"use assets_manager::AssetCache;"},{"Add":"use encase::{ShaderType, UniformBuffer};"},{"Add":"use naga_oil::compose;"},{"Add":"use wgpu::util::DeviceExt;"},{"Add":"use winit::window::Window;"},{"Add":""},{"Add":"use crate::screen::{Camera, RenderOptions, WORLD_HALF_EXTENTS};"},{"Add":""},{"Add":"/// Information sent to the shader about our camera"},{"Add":"#[derive(ShaderType)]"},{"Add":"struct CameraUniform {"},{"Add":" view_proj: glam::Mat4,"},{"Add":"}"},{"Add":""},{"Add":"impl CameraUniform {"},{"Add":" fn new() -> Self {"},{"Add":" Self {"},{"Add":" view_proj: glam::Mat4::IDENTITY,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn update_view_proj(&mut self, camera: &Camera) {"},{"Add":" self.view_proj = camera.build_view_projection_matrix();"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct WorldRenderer {"},{"Add":" // world_texture: wgpu::Texture,"},{"Add":" world_texture_view: wgpu::TextureView,"},{"Add":" // world_texture_sampler: wgpu::Sampler,"},{"Add":" world_texture_bind_group: wgpu::BindGroup,"},{"Add":""},{"Add":" camera_uniform: CameraUniform,"},{"Add":" camera_buffer: wgpu::Buffer,"},{"Add":" camera_bind_group: wgpu::BindGroup,"},{"Add":""},{"Add":" render_options_buffer: wgpu::Buffer,"},{"Add":" render_options_bind_group: wgpu::BindGroup,"},{"Add":""},{"Add":" /// Renders from the world texture to screen space within the bounds of the camera"},{"Add":" // TODO eventually handle screen space effects"},{"Add":" world_render_pipeline: wgpu::RenderPipeline,"},{"Add":" // num_world_vertices: u32,"},{"Add":" num_world_indices: u32,"},{"Add":" world_vertex_buffer: wgpu::Buffer,"},{"Add":" world_index_buffer: wgpu::Buffer,"},{"Add":"}"},{"Add":""},{"Add":"pub struct WorldRenderFrameData {}"},{"Add":""},{"Add":"/// Most general type of vertex"},{"Add":"/// Specifies a position, then tex coordinates, then an associated color (w/ alpha)"},{"Add":"#[repr(C)]"},{"Add":"#[derive(Copy, Clone, Debug, bytemuck::Pod, bytemuck::Zeroable)]"},{"Add":"struct Vertex {"},{"Add":" position: [f32; 3],"},{"Add":" tex_coords: [f32; 2],"},{"Add":" color: [f32; 4],"},{"Add":"}"},{"Add":""},{"Add":"impl Vertex {"},{"Add":" fn desc() -> wgpu::VertexBufferLayout<'static> {"},{"Add":" wgpu::VertexBufferLayout {"},{"Add":" array_stride: std::mem::size_of::() as wgpu::BufferAddress,"},{"Add":" step_mode: wgpu::VertexStepMode::Vertex,"},{"Add":" attributes: &["},{"Add":" wgpu::VertexAttribute {"},{"Add":" offset: 0,"},{"Add":" shader_location: 0,"},{"Add":" format: wgpu::VertexFormat::Float32x3,"},{"Add":" },"},{"Add":" wgpu::VertexAttribute {"},{"Add":" offset: std::mem::size_of::<[f32; 3]>() as wgpu::BufferAddress,"},{"Add":" shader_location: 1,"},{"Add":" format: wgpu::VertexFormat::Float32x2,"},{"Add":" },"},{"Add":" wgpu::VertexAttribute {"},{"Add":" offset: std::mem::size_of::<[f32; 5]>() as wgpu::BufferAddress,"},{"Add":" shader_location: 2,"},{"Add":" format: wgpu::VertexFormat::Float32x4,"},{"Add":" },"},{"Add":" ],"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WorldRenderer {"},{"Add":" const INDICES: &'static [u16] = &[0, 2, 3, 0, 1, 2];"},{"Add":" /// `w` and `h` are percentages of the screen to use to render the world, (0.0, 1.0]"},{"Add":" fn generate_world_vertices(w: f32, h: f32) -> Vec {"},{"Add":" let verts = vec!["},{"Add":" Vertex {"},{"Add":" position: [-w, -h, 0.0],"},{"Add":" tex_coords: [0.0, 1.0],"},{"Add":" color: [1.0, 1.0, 1.0, 1.0],"},{"Add":" },"},{"Add":" Vertex {"},{"Add":" position: [w, -h, 0.0],"},{"Add":" tex_coords: [1.0, 1.0],"},{"Add":" color: [1.0, 1.0, 1.0, 1.0],"},{"Add":" },"},{"Add":" Vertex {"},{"Add":" position: [w, h, 0.0],"},{"Add":" tex_coords: [1.0, 0.0],"},{"Add":" color: [1.0, 1.0, 1.0, 1.0],"},{"Add":" },"},{"Add":" Vertex {"},{"Add":" position: [-w, h, 0.0],"},{"Add":" tex_coords: [0.0, 0.0],"},{"Add":" color: [1.0, 1.0, 1.0, 1.0],"},{"Add":" },"},{"Add":" ];"},{"Add":""},{"Add":" verts"},{"Add":" }"},{"Add":""},{"Add":" fn create_composer(_assets: &AssetCache) -> Result {"},{"Add":" let mut composer = compose::Composer::default();"},{"Add":""},{"Add":" // HDR module"},{"Add":" let hdr_module_src = include_str!(\"../../hdr.wgsl\");"},{"Add":" let (name, imports, shader_defs) = compose::get_preprocessor_data(hdr_module_src);"},{"Add":" composer.add_composable_module(compose::ComposableModuleDescriptor {"},{"Add":" as_name: name,"},{"Add":" source: hdr_module_src,"},{"Add":" file_path: \"hdr.wgsl\","},{"Add":" language: compose::ShaderLanguage::Wgsl,"},{"Add":" additional_imports: &imports,"},{"Add":" shader_defs,"},{"Add":" })?;"},{"Add":""},{"Add":" Ok(composer)"},{"Add":" }"},{"Add":""},{"Add":" pub fn world_texture_view(&self) -> &wgpu::TextureView {"},{"Add":" &self.world_texture_view"},{"Add":" }"},{"Add":""},{"Add":" pub fn new("},{"Add":" device: &wgpu::Device,"},{"Add":" texture_format: wgpu::TextureFormat,"},{"Add":" world_texture_format: wgpu::TextureFormat,"},{"Add":" assets: &AssetCache,"},{"Add":" ) -> color_eyre::Result {"},{"Add":" let _ = device;"},{"Add":" let _ = texture_format;"},{"Add":" let num_world_indices = Self::INDICES.len() as u32;"},{"Add":" let mut composer = Self::create_composer(assets)?;"},{"Add":""},{"Add":" let world_vertices = Self::generate_world_vertices(1.0, 1.0);"},{"Add":" // let num_world_vertices = world_vertices.len() as u32;"},{"Add":" let world_vertex_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {"},{"Add":" label: Some(\"world vertex buffer\"),"},{"Add":" contents: bytemuck::cast_slice(&world_vertices),"},{"Add":" usage: wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,"},{"Add":" });"},{"Add":" let world_index_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {"},{"Add":" label: Some(\"world vertex buffer\"),"},{"Add":" contents: bytemuck::cast_slice(Self::INDICES),"},{"Add":" usage: wgpu::BufferUsages::INDEX,"},{"Add":" });"},{"Add":" let world_texture = device.create_texture(&wgpu::TextureDescriptor {"},{"Add":" size: wgpu::Extent3d {"},{"Add":" width: WORLD_HALF_EXTENTS.x * 2,"},{"Add":" height: WORLD_HALF_EXTENTS.y * 2,"},{"Add":" depth_or_array_layers: 1,"},{"Add":" },"},{"Add":" mip_level_count: 1,"},{"Add":" sample_count: 1,"},{"Add":" dimension: wgpu::TextureDimension::D2,"},{"Add":" format: world_texture_format,"},{"Add":" usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::TEXTURE_BINDING,"},{"Add":" label: Some(\"world texture\"),"},{"Add":" view_formats: &[],"},{"Add":" });"},{"Add":" let world_texture_view = world_texture.create_view(&wgpu::TextureViewDescriptor::default());"},{"Add":" let world_texture_sampler = device.create_sampler(&wgpu::SamplerDescriptor {"},{"Add":" address_mode_u: wgpu::AddressMode::ClampToEdge,"},{"Add":" address_mode_v: wgpu::AddressMode::ClampToEdge,"},{"Add":" address_mode_w: wgpu::AddressMode::ClampToEdge,"},{"Add":" mag_filter: wgpu::FilterMode::Nearest,"},{"Add":" min_filter: wgpu::FilterMode::Nearest,"},{"Add":" mipmap_filter: wgpu::FilterMode::Nearest,"},{"Add":" ..Default::default()"},{"Add":" });"},{"Add":" let world_texture_bind_group_layout ="},{"Add":" device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {"},{"Add":" label: Some(\"world texture bind group layout\"),"},{"Add":" entries: &["},{"Add":" wgpu::BindGroupLayoutEntry {"},{"Add":" binding: 0,"},{"Add":" visibility: wgpu::ShaderStages::FRAGMENT,"},{"Add":" ty: wgpu::BindingType::Texture {"},{"Add":" sample_type: wgpu::TextureSampleType::Float { filterable: true },"},{"Add":" view_dimension: wgpu::TextureViewDimension::D2,"},{"Add":" multisampled: false,"},{"Add":" },"},{"Add":" count: None,"},{"Add":" },"},{"Add":" wgpu::BindGroupLayoutEntry {"},{"Add":" binding: 1,"},{"Add":" visibility: wgpu::ShaderStages::FRAGMENT,"},{"Add":" ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),"},{"Add":" count: None,"},{"Add":" },"},{"Add":" ],"},{"Add":" });"},{"Add":" let world_texture_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {"},{"Add":" label: Some(\"world texture bind group\"),"},{"Add":" layout: &world_texture_bind_group_layout,"},{"Add":" entries: &["},{"Add":" wgpu::BindGroupEntry {"},{"Add":" binding: 0,"},{"Add":" resource: wgpu::BindingResource::TextureView(&world_texture_view),"},{"Add":" },"},{"Add":" wgpu::BindGroupEntry {"},{"Add":" binding: 1,"},{"Add":" resource: wgpu::BindingResource::Sampler(&world_texture_sampler),"},{"Add":" },"},{"Add":" ],"},{"Add":" });"},{"Add":""},{"Add":" let camera_uniform = CameraUniform::new();"},{"Add":" let mut uniform_buffer = UniformBuffer::new(Vec::new());"},{"Add":" uniform_buffer.write(&camera_uniform).unwrap();"},{"Add":" let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {"},{"Add":" label: Some(\"camera buffer\"),"},{"Add":" contents: &uniform_buffer.into_inner(),"},{"Add":" usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,"},{"Add":" });"},{"Add":" let camera_bind_group_layout ="},{"Add":" device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {"},{"Add":" label: Some(\"camera bind group layout\"),"},{"Add":" entries: &[wgpu::BindGroupLayoutEntry {"},{"Add":" binding: 0,"},{"Add":" visibility: wgpu::ShaderStages::VERTEX,"},{"Add":" ty: wgpu::BindingType::Buffer {"},{"Add":" ty: wgpu::BufferBindingType::Uniform,"},{"Add":" has_dynamic_offset: false,"},{"Add":" min_binding_size: None,"},{"Add":" },"},{"Add":" count: None,"},{"Add":" }],"},{"Add":" });"},{"Add":" let camera_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {"},{"Add":" layout: &camera_bind_group_layout,"},{"Add":" entries: &[wgpu::BindGroupEntry {"},{"Add":" binding: 0,"},{"Add":" resource: camera_buffer.as_entire_binding(),"},{"Add":" }],"},{"Add":" label: Some(\"camera bind group\"),"},{"Add":" });"},{"Add":" let render_options = RenderOptions::default();"},{"Add":" let mut render_options_uniform_buffer = UniformBuffer::new(Vec::new());"},{"Add":" render_options_uniform_buffer"},{"Add":" .write(&render_options)"},{"Add":" .unwrap();"},{"Add":" let render_options_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {"},{"Add":" label: Some(\"render options buffer\"),"},{"Add":" contents: &render_options_uniform_buffer.into_inner(),"},{"Add":" usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,"},{"Add":" });"},{"Add":" let render_options_bind_group_layout ="},{"Add":" device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {"},{"Add":" entries: &[wgpu::BindGroupLayoutEntry {"},{"Add":" binding: 0,"},{"Add":" visibility: wgpu::ShaderStages::FRAGMENT,"},{"Add":" ty: wgpu::BindingType::Buffer {"},{"Add":" ty: wgpu::BufferBindingType::Uniform,"},{"Add":" has_dynamic_offset: false,"},{"Add":" min_binding_size: None,"},{"Add":" },"},{"Add":" count: None,"},{"Add":" }],"},{"Add":" label: Some(\"render options bind group layout\"),"},{"Add":" });"},{"Add":" let render_options_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {"},{"Add":" label: Some(\"render options bind group\"),"},{"Add":" layout: &render_options_bind_group_layout,"},{"Add":" entries: &[wgpu::BindGroupEntry {"},{"Add":" binding: 0,"},{"Add":" resource: render_options_buffer.as_entire_binding(),"},{"Add":" }],"},{"Add":" });"},{"Add":""},{"Add":" // let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {"},{"Add":" // label: Some(\"world shader\"),"},{"Add":" // source: wgpu::ShaderSource::Wgsl(include_str!(\"world_shader.wgsl\").into()),"},{"Add":" // });"},{"Add":""},{"Add":" let composed_world_shader = composer.make_naga_module(compose::NagaModuleDescriptor {"},{"Add":" source: include_str!(\"../../world_shader.wgsl\"),"},{"Add":" file_path: \"world_shader.wgsl\","},{"Add":" shader_type: compose::ShaderType::Wgsl,"},{"Add":" shader_defs: HashMap::new(),"},{"Add":" additional_imports: &[],"},{"Add":" })?;"},{"Add":" let mut validator = naga::valid::Validator::new("},{"Add":" naga::valid::ValidationFlags::default(),"},{"Add":" naga::valid::Capabilities::default(),"},{"Add":" );"},{"Add":" let composed_world_shader_module_info = validator.validate(&composed_world_shader)?;"},{"Add":" let shader_source = naga::back::wgsl::write_string("},{"Add":" &composed_world_shader,"},{"Add":" &composed_world_shader_module_info,"},{"Add":" naga::back::wgsl::WriterFlags::EXPLICIT_TYPES,"},{"Add":" )?;"},{"Add":" let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {"},{"Add":" label: Some(\"world shader\"),"},{"Add":" source: wgpu::ShaderSource::Wgsl(shader_source.into()),"},{"Add":" });"},{"Add":""},{"Add":" let world_render_pipeline_layout ="},{"Add":" device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {"},{"Add":" label: Some(\"world render pipeline layout\"),"},{"Add":" bind_group_layouts: &["},{"Add":" &world_texture_bind_group_layout,"},{"Add":" &camera_bind_group_layout,"},{"Add":" &render_options_bind_group_layout,"},{"Add":" ],"},{"Add":" push_constant_ranges: &[],"},{"Add":" });"},{"Add":" let world_render_pipeline ="},{"Add":" device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {"},{"Add":" label: Some(\"world render pipeline\"),"},{"Add":" layout: Some(&world_render_pipeline_layout),"},{"Add":" vertex: wgpu::VertexState {"},{"Add":" module: &shader,"},{"Add":" entry_point: \"vs_main\","},{"Add":" buffers: &[Vertex::desc()],"},{"Add":" },"},{"Add":" primitive: wgpu::PrimitiveState {"},{"Add":" topology: wgpu::PrimitiveTopology::TriangleList,"},{"Add":" strip_index_format: None,"},{"Add":" front_face: wgpu::FrontFace::Ccw,"},{"Add":" cull_mode: Some(wgpu::Face::Back),"},{"Add":" polygon_mode: wgpu::PolygonMode::Fill,"},{"Add":" unclipped_depth: false,"},{"Add":" conservative: false,"},{"Add":" },"},{"Add":" depth_stencil: None,"},{"Add":" multisample: wgpu::MultisampleState {"},{"Add":" count: 1,"},{"Add":" mask: !0,"},{"Add":" alpha_to_coverage_enabled: false,"},{"Add":" },"},{"Add":" fragment: Some(wgpu::FragmentState {"},{"Add":" module: &shader,"},{"Add":" entry_point: \"fs_main\","},{"Add":" targets: &[Some(wgpu::ColorTargetState {"},{"Add":" format: texture_format,"},{"Add":" blend: Some(wgpu::BlendState::REPLACE),"},{"Add":" write_mask: wgpu::ColorWrites::ALL,"},{"Add":" })],"},{"Add":" }),"},{"Add":" multiview: None,"},{"Add":" });"},{"Add":""},{"Add":" Ok(Self {"},{"Add":" world_texture_view,"},{"Add":" world_texture_bind_group,"},{"Add":" camera_uniform,"},{"Add":" camera_buffer,"},{"Add":" camera_bind_group,"},{"Add":" render_options_buffer,"},{"Add":" render_options_bind_group,"},{"Add":" world_render_pipeline,"},{"Add":" num_world_indices,"},{"Add":" world_vertex_buffer,"},{"Add":" world_index_buffer,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" pub fn prepare("},{"Add":" &mut self,"},{"Add":" _device: &wgpu::Device,"},{"Add":" queue: &wgpu::Queue,"},{"Add":" window: &Window,"},{"Add":" camera: &mut Camera,"},{"Add":" render_options: &RenderOptions,"},{"Add":" ) -> WorldRenderFrameData {"},{"Add":" if let Some((w, h)) = camera.update_aspect(window) {"},{"Add":" // Update the world vertex buffer"},{"Add":" let new_world_vertices = Self::generate_world_vertices(w, h);"},{"Add":" queue.write_buffer("},{"Add":" &self.world_vertex_buffer,"},{"Add":" 0,"},{"Add":" bytemuck::cast_slice(&new_world_vertices),"},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" // Update the camera and camera buffer"},{"Add":" self.camera_uniform.update_view_proj(camera);"},{"Add":" let mut uniform_buffer = UniformBuffer::new(Vec::new());"},{"Add":" uniform_buffer.write(&self.camera_uniform).unwrap();"},{"Add":" queue.write_buffer(&self.camera_buffer, 0, &uniform_buffer.into_inner());"},{"Add":""},{"Add":" // Update render options"},{"Add":" let mut uniform_buffer = UniformBuffer::new(Vec::new());"},{"Add":" uniform_buffer.write(render_options).unwrap();"},{"Add":" queue.write_buffer(&self.render_options_buffer, 0, &uniform_buffer.into_inner());"},{"Add":""},{"Add":" WorldRenderFrameData {}"},{"Add":" }"},{"Add":""},{"Add":" pub fn render<'rpass>("},{"Add":" &'rpass self,"},{"Add":" render_pass: &mut wgpu::RenderPass<'rpass>,"},{"Add":" _render_data: &'rpass WorldRenderFrameData,"},{"Add":" ) {"},{"Add":" render_pass.set_pipeline(&self.world_render_pipeline);"},{"Add":" render_pass.set_bind_group(0, &self.world_texture_bind_group, &[]);"},{"Add":" render_pass.set_bind_group(1, &self.camera_bind_group, &[]);"},{"Add":" render_pass.set_bind_group(2, &self.render_options_bind_group, &[]);"},{"Add":" render_pass.set_vertex_buffer(0, self.world_vertex_buffer.slice(..));"},{"Add":" render_pass.set_index_buffer(self.world_index_buffer.slice(..), wgpu::IndexFormat::Uint16);"},{"Add":" render_pass.draw_indexed(0..self.num_world_indices, 0, 0..1);"},{"Add":" }"},{"Add":"}"}]}}],"owner":"Jengamon","repo":"rexweb","token":"7kE9CabQ4DwfE8kqQjvoMNlkqSmi4La+n9p0HEwu/W0=","login":null}

…

Dependencies

Change contents