{"header":{"message":"move stuff around","description":null,"timestamp":"2024-02-09T19:33:50.320331218Z","authors":[{}]},"hash":"NAHY2GVWYMPBD7O4R3AEHDHFD3A2MVCISDHDMMRYB6K5ZERSZSAQC","authors":[{"login":"Jengamon","key":"47a75hR6eVaawZfVGBs2CqZUKZbcNz5Ago5CubrCkWvZ"}],"deps":{"hashes":[["NAHY2GVWYMPBD7O4R3AEHDHFD3A2MVCISDHDMMRYB6K5ZERSZSAQC","move stuff around"],["AA",null],["QRA2RTSWERK2GJVKOH4F25KBZSNDHYVLGHSKL7IVSLD4QPMDOXDAC","cleanup"],["LK56CXDULK2QZHR4QOKKDZYTDJ6JZU676CLMUT4HOU32IUQG2IEAC","make Camera::update_aspect tests"],["KWCDYED7S3JSVY7XLRPEJBIWW52NEZ4SSXRRVP5DV7MCZQU7LPXAC","remove hdr"],["3GAL4KPRWFKBWY2AT4YE53JHQGT6H46UEKUPIT4CHKZY3NSVLHZAC","move towards document model"],["O5P6HCPWGMGJBFJEMC3SYQJ5OEW2AQV4KEJCMRVTTS3K6M45Z3BAC","get a cheeky little web going"],["OM6475B3O4T22Z22CPMOW4AN54JWQ34HXPMIV26MLRXRIKKBSTAAC","cleanup for rexweb"],["34CROJEM52NB7TGBCGGMIYAQ2AZUI44FWO25MGYYUSCMHLCLJNAQC","add new middleware folder"],["HUZ7YFN6VIDK3MFB45AC5HP5JLT7XKJQ4SMNXTFY2L5TRTFY4OHAC","sketch out world renderer"],["LJD76LBNKTWSAHLRGL7EXNMM5HYRSOD6VXWYQSX2XVK7TQROTZ6QC","add render options and gamma control"],["BYFMGWJ5ZPXZTCIFDHP66KK7JTEKT2NO7HR2XY7T5WRAAG3L5WYQC","prepare tracking and remove frame data"],["HTDZ53HWD4X3DSFZX7MMC7DPFJNHQPGBVLJD2S325SQRRVIQ3CLAC","separate world rendering into middleware pattern"],["EEO6C4YSWFW3JOZ3JH6K7X4TKAUTVJD53CQNYZHI2QY6REGEXUCAC","setup cosync and get webgl working again"],["L6RIUKGLJZLAOKFGUDTZKBPP4HUBPEZAKHJEQHO34WFF62AB2ZIQC","move from git to pijul"]],"deps":["QRA2RTSWERK2GJVKOH4F25KBZSNDHYVLGHSKL7IVSLD4QPMDOXDAC","LK56CXDULK2QZHR4QOKKDZYTDJ6JZU676CLMUT4HOU32IUQG2IEAC","KWCDYED7S3JSVY7XLRPEJBIWW52NEZ4SSXRRVP5DV7MCZQU7LPXAC","3GAL4KPRWFKBWY2AT4YE53JHQGT6H46UEKUPIT4CHKZY3NSVLHZAC"],"known":["LJD76LBNKTWSAHLRGL7EXNMM5HYRSOD6VXWYQSX2XVK7TQROTZ6QC","HUZ7YFN6VIDK3MFB45AC5HP5JLT7XKJQ4SMNXTFY2L5TRTFY4OHAC","HTDZ53HWD4X3DSFZX7MMC7DPFJNHQPGBVLJD2S325SQRRVIQ3CLAC","34CROJEM52NB7TGBCGGMIYAQ2AZUI44FWO25MGYYUSCMHLCLJNAQC","BYFMGWJ5ZPXZTCIFDHP66KK7JTEKT2NO7HR2XY7T5WRAAG3L5WYQC","O5P6HCPWGMGJBFJEMC3SYQJ5OEW2AQV4KEJCMRVTTS3K6M45Z3BAC","EEO6C4YSWFW3JOZ3JH6K7X4TKAUTVJD53CQNYZHI2QY6REGEXUCAC","OM6475B3O4T22Z22CPMOW4AN54JWQ34HXPMIV26MLRXRIKKBSTAAC"]},"hunks":[{"Replacement":{"inode":{"change":6,"pos":2925},"path":"src/screen/middleware.rs","line":1,"ins":{"up_context":[{"change":6,"pos":2925}],"down_context":[{"change":6,"pos":1436}],"flag":"BLOCK","start":0,"end":36,"inode":{"change":6,"pos":2925}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2925},"to":{"change":5,"start":1561,"end":1594},"introduced_by":5}],"inode":{"change":6,"pos":2925}},"ins_contents":[{"Add":"pub use document::DocumentRenderer;"}],"del_contents":[{"Del":"pub use world::DocumentRenderer;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":2925},"path":"src/screen/middleware.rs","line":4,"ins":{"up_context":[{"change":6,"pos":82}],"down_context":[],"flag":"BLOCK","start":37,"end":51,"inode":{"change":6,"pos":2925}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":82},"to":{"change":6,"start":0,"end":11},"introduced_by":6}],"inode":{"change":6,"pos":2925}},"ins_contents":[{"Add":"mod document;"}],"del_contents":[{"Del":"mod world;\n"}]}},{"FileDel":{"deleted_names":[{"basename":"world.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":34},"to":{"change":6,"start":36,"end":68},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":68},"to":{"change":6,"start":69,"end":69},"introduced_by":6}],"inode":{"change":6,"pos":69}}},"content_edges":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":59},"to":{"change":6,"start":101,"end":102},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":6,"pos":162},"to":{"change":6,"start":101,"end":102},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1245},"to":{"change":6,"start":101,"end":102},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":101},"to":{"change":6,"start":101,"end":102},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":134},"to":{"change":6,"start":134,"end":253},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1672},"to":{"change":6,"start":317,"end":693},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317},"to":{"change":6,"start":317,"end":693},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1703},"to":{"change":6,"start":720,"end":1416},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":720},"to":{"change":6,"start":720,"end":1416},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":190},"to":{"change":6,"start":1416,"end":1419},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1416},"to":{"change":6,"start":1416,"end":1419},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1455},"to":{"change":6,"start":1455,"end":2706},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1851},"to":{"change":6,"start":2727,"end":3640},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2727},"to":{"change":6,"start":2727,"end":3640},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":4,"pos":53},"to":{"change":6,"start":3797,"end":3820},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3797},"to":{"change":6,"start":3797,"end":3820},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":4,"pos":544},"to":{"change":6,"start":4280,"end":4410},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4280},"to":{"change":6,"start":4280,"end":4410},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1161},"to":{"change":6,"start":4426,"end":4553},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2277},"to":{"change":6,"start":4426,"end":4553},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4426},"to":{"change":6,"start":4426,"end":4553},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1194},"to":{"change":6,"start":4582,"end":4734},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4582},"to":{"change":6,"start":4582,"end":4734},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2331},"to":{"change":6,"start":4793,"end":5596},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4793},"to":{"change":6,"start":4793,"end":5596},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1941},"to":{"change":6,"start":5695,"end":11307},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5695},"to":{"change":6,"start":5695,"end":11307},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":11533},"to":{"change":6,"start":11533,"end":14930},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":237},"to":{"change":6,"start":14930,"end":15142},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14930},"to":{"change":6,"start":14930,"end":15142},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":15142},"to":{"change":5,"start":1942,"end":1972},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1972},"to":{"change":6,"start":238,"end":332},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":15142},"to":{"change":6,"start":238,"end":332},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1073},"to":{"change":6,"start":15235,"end":16087},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":15235},"to":{"change":6,"start":15235,"end":16087},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16120},"to":{"change":6,"start":16120,"end":16127},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":674},"to":{"change":6,"start":16288,"end":16829},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16288},"to":{"change":6,"start":16288,"end":16829},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16127},"to":{"change":6,"start":333,"end":674},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":332},"to":{"change":3,"start":999,"end":1073},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14930},"to":{"change":6,"start":191,"end":237},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5596},"to":{"change":5,"start":1852,"end":1941},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4734},"to":{"change":6,"start":2278,"end":2331},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4410},"to":{"change":6,"start":2261,"end":2277},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3820},"to":{"change":4,"start":54,"end":544},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3640},"to":{"change":6,"start":2180,"end":2260},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2260},"to":{"change":4,"start":0,"end":53},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2706},"to":{"change":5,"start":1704,"end":1851},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1416},"to":{"change":6,"start":163,"end":190},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":693},"to":{"change":5,"start":1673,"end":1703},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":253},"to":{"change":5,"start":1595,"end":1672},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":69},"to":{"change":2,"start":0,"end":59},"introduced_by":2}],"inode":{"change":6,"pos":69}},"content":[{"Del":"\n"},{"Del":"use encase::{ShaderType, UniformBuffer};\nuse naga_oil::compose;\nuse wgpu::util::DeviceExt;\nuse winit::window::Window;\n\n"},{"Del":"\n/// Information sent to the shader about our camera\n#[derive(ShaderType)]\nstruct CameraUniform {\n view_proj: glam::Mat4,\n}\n\nimpl 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"},{"Del":" // 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"},{"Del":"}\n\n"},{"Del":"/// 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)]\nstruct Vertex {\n position: [f32; 3],\n tex_coords: [f32; 2],\n color: [f32; 4],\n}\n\nimpl 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\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"},{"Del":"\n // HDR module\n"},{"Del":"\n Ok(composer)\n }\n\n pub fn world_texture_view(&self) -> &wgpu::TextureView {\n &self.world_texture_view\n }\n\n"},{"Del":" device: &wgpu::Device,\n texture_format: wgpu::TextureFormat,\n world_texture_format: wgpu::TextureFormat,\n"},{"Del":" ) -> color_eyre::Result {\n let _ = device;\n let _ = texture_format;\n let num_world_indices = Self::INDICES.len() as u32;\n"},{"Del":"\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 = 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"},{"Del":" 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 | wgpu::TextureUsages::TEXTURE_BINDING,\n label: Some(\"world texture\"),\n view_formats: &[],\n });\n let world_texture_view = 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 = 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"},{"Del":" let composed_world_shader = 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"},{"Del":" })\n }\n\n 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"},{"Del":" _document: &Document,\n"},{"Del":" ) {\n self.prepared\n .store(true, std::sync::atomic::Ordering::SeqCst);\n\n"},{"Del":" // 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"},{"Del":" }\n\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.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 }\n}\n"},{"Del":" pub fn render<'rpass>(&'rpass self, render_pass: &mut wgpu::RenderPass<'rpass>) {\n // I *know* I'm gonna forget\n if !self\n .prepared\n .swap(false, std::sync::atomic::Ordering::SeqCst)\n {\n log::error!(\"`WorldRenderer::prepare` was not called, so no data can be updated.\");\n }\n\n"},{"Del":" if let Some((w, h)) = camera.update_aspect(window.inner_size()) {\n"},{"Del":" prepared: AtomicBool::new(false),\n"},{"Del":" width: MAX_DOCUMENT_SIZE.x,\n height: MAX_DOCUMENT_SIZE.y,\n"},{"Del":" let mut composer = Self::create_composer()?;\n"},{"Del":" pub fn new(\n"},{"Del":" // 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"},{"Del":" fn create_composer() -> Result {\n"},{"Del":" let composer = compose::Composer::default();\n"},{"Del":"/// All document cells must fit within this area\npub const MAX_DOCUMENT_SIZE: glam::UVec2 = glam::UVec2::new(2048, 2048);\n\nimpl DocumentRenderer {\n"},{"Del":"\n prepared: AtomicBool,\n"},{"Del":"pub struct DocumentRenderer {\n"},{"Del":"use crate::{\n document::Document,\n screen::{Camera, RenderOptions},\n};\n"},{"Del":"use std::{collections::HashMap, sync::atomic::AtomicBool};\n"}]}},{"FileAdd":{"meta":{"basename":"document.rs","metadata":0},"context":[{"change":6,"pos":34}],"contents":[{"Add":"use std::{collections::HashMap, sync::atomic::AtomicBool};"},{"Add":""},{"Add":"use encase::{ShaderType, UniformBuffer};"},{"Add":"use naga_oil::compose;"},{"Add":"use wgpu::util::DeviceExt;"},{"Add":"use winit::window::Window;"},{"Add":""},{"Add":"use crate::{"},{"Add":" document::Document,"},{"Add":" screen::{Camera, RenderOptions},"},{"Add":"};"},{"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 DocumentRenderer {"},{"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":" prepared: AtomicBool,"},{"Add":"}"},{"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":"/// All document cells must fit within this area"},{"Add":"pub const MAX_DOCUMENT_SIZE: glam::UVec2 = glam::UVec2::new(2048, 2048);"},{"Add":""},{"Add":"impl DocumentRenderer {"},{"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() -> Result {"},{"Add":" let 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":" ) -> 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()?;"},{"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: MAX_DOCUMENT_SIZE.x,"},{"Add":" height: MAX_DOCUMENT_SIZE.y,"},{"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 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":" prepared: AtomicBool::new(false),"},{"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":" _document: &Document,"},{"Add":" ) {"},{"Add":" self.prepared"},{"Add":" .store(true, std::sync::atomic::Ordering::SeqCst);"},{"Add":""},{"Add":" if let Some((w, h)) = camera.update_aspect(window.inner_size()) {"},{"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":""},{"Add":" pub fn render<'rpass>(&'rpass self, render_pass: &mut wgpu::RenderPass<'rpass>) {"},{"Add":" // I *know* I'm gonna forget"},{"Add":" if !self"},{"Add":" .prepared"},{"Add":" .swap(false, std::sync::atomic::Ordering::SeqCst)"},{"Add":" {"},{"Add":" log::error!(\"`WorldRenderer::prepare` was not called, so no data could be updated.\");"},{"Add":" }"},{"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":"}"}]}},{"FileAdd":{"meta":{"basename":"document.rs","metadata":0},"context":[{"change":15,"pos":15}],"contents":[{"Add":"use crate::{"},{"Add":" screen::{Camera, RenderError, RenderInput, RenderOptions, Screen},"},{"Add":" text::{TextSystem, TextSystemData},"},{"Add":"};"},{"Add":"use winit::{"},{"Add":" event::{ElementState, KeyEvent, WindowEvent},"},{"Add":" keyboard::{Key, NamedKey},"},{"Add":" window::Window,"},{"Add":"};"},{"Add":""},{"Add":"pub struct Document {"},{"Add":" cell_width: u32,"},{"Add":" cell_height: u32,"},{"Add":"}"},{"Add":""},{"Add":"pub struct Project {"},{"Add":" screen: Screen,"},{"Add":" egui: egui::Context,"},{"Add":" egui_winit: egui_winit::State,"},{"Add":" internal_state: ProjectState,"},{"Add":""},{"Add":" text: TextSystem,"},{"Add":""},{"Add":" // internal controls"},{"Add":" show_debug: bool,"},{"Add":"}"},{"Add":""},{"Add":"pub struct ProjectState {"},{"Add":" pub camera: Camera,"},{"Add":" pub render_options: RenderOptions,"},{"Add":" pub document: Document,"},{"Add":"}"},{"Add":""},{"Add":"impl Project {"},{"Add":" pub async fn new(window: Window) -> color_eyre::Result {"},{"Add":" let camera = Camera::default();"},{"Add":" let render_options = RenderOptions::default();"},{"Add":" // The *only* time we need to manually do this, all others should use extract_view!"},{"Add":" let egui = egui::Context::default();"},{"Add":" let egui_winit ="},{"Add":" egui_winit::State::new(egui.clone(), egui::ViewportId::ROOT, &window, None, None);"},{"Add":" let screen = Screen::new(window).await?;"},{"Add":" let document = Document {"},{"Add":" cell_width: 100,"},{"Add":" cell_height: 100,"},{"Add":" };"},{"Add":""},{"Add":" Ok(Self {"},{"Add":" egui,"},{"Add":" egui_winit,"},{"Add":" screen,"},{"Add":""},{"Add":" // systems"},{"Add":" text: TextSystem::new()?,"},{"Add":""},{"Add":" show_debug: false,"},{"Add":" internal_state: ProjectState {"},{"Add":" camera,"},{"Add":" render_options,"},{"Add":" document,"},{"Add":" },"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" pub async fn create_surface(&mut self) -> color_eyre::Result<()> {"},{"Add":" self.screen.create_surface().await"},{"Add":" }"},{"Add":""},{"Add":" pub fn screen(&self) -> &Screen {"},{"Add":" &self.screen"},{"Add":" }"},{"Add":""},{"Add":" pub fn screen_mut(&mut self) -> &mut Screen {"},{"Add":" &mut self.screen"},{"Add":" }"},{"Add":""},{"Add":" /// Runs egui code"},{"Add":" pub fn gui_egui(&mut self) -> (egui::FullOutput, Vec) {"},{"Add":" egui_winit::update_viewport_info("},{"Add":" self.egui_winit"},{"Add":" .egui_input_mut()"},{"Add":" .viewports"},{"Add":" .get_mut(&egui::ViewportId::ROOT)"},{"Add":" .unwrap(),"},{"Add":" &self.egui,"},{"Add":" self.screen.window(),"},{"Add":" );"},{"Add":" let input = self.egui_winit.take_egui_input(self.screen.window());"},{"Add":""},{"Add":" let full_output = self.egui.run(input, |ctx| {"},{"Add":" egui::Window::new(\"Debug Tools\")"},{"Add":" .open(&mut self.show_debug)"},{"Add":" .show(ctx, |ui| {"},{"Add":" ui.horizontal(|ui| {"},{"Add":" let mut vsync = self.screen.is_vsync();"},{"Add":" let text = if vsync { \"yes\" } else { \"no\" };"},{"Add":" ui.label(\"VSync\");"},{"Add":" ui.toggle_value(&mut vsync, text);"},{"Add":" self.screen.vsync(vsync);"},{"Add":" });"},{"Add":" ui.add("},{"Add":" egui::Slider::new(&mut self.internal_state.render_options.gamma, 0.0..=2.0)"},{"Add":" .text(\"Gamma\"),"},{"Add":" );"},{"Add":" });"},{"Add":" });"},{"Add":""},{"Add":" self.egui_winit"},{"Add":" .handle_platform_output(self.screen.window(), full_output.platform_output.clone());"},{"Add":""},{"Add":" let prims = self"},{"Add":" .egui"},{"Add":" .tessellate(full_output.shapes.clone(), full_output.pixels_per_point);"},{"Add":""},{"Add":" (full_output, prims)"},{"Add":" }"},{"Add":""},{"Add":" /// Returns true if the event was handled"},{"Add":" pub fn input(&mut self, event: &WindowEvent) -> bool {"},{"Add":" #[cfg(debug_assertions)]"},{"Add":" if matches!("},{"Add":" event,"},{"Add":" WindowEvent::KeyboardInput {"},{"Add":" event: KeyEvent {"},{"Add":" logical_key: Key::Named(NamedKey::F1),"},{"Add":" state: ElementState::Pressed,"},{"Add":" repeat: false,"},{"Add":" .."},{"Add":" },"},{"Add":" .."},{"Add":" }"},{"Add":" ) {"},{"Add":" self.show_debug = !self.show_debug;"},{"Add":" return true;"},{"Add":" }"},{"Add":""},{"Add":" false"},{"Add":" }"},{"Add":""},{"Add":" pub fn update(&mut self, _dt: std::time::Duration) {"},{"Add":" puffin::profile_function!();"},{"Add":""},{"Add":" // Run any in-progress tasks from the async executor"},{"Add":" // self.executor.run_until_stall(&mut self.internal_state);"},{"Add":" }"},{"Add":""},{"Add":" pub fn render(&mut self) -> Result<(), RenderError> {"},{"Add":" puffin::profile_function!();"},{"Add":""},{"Add":" // Any resources only used for the rendering process go here"},{"Add":" let (egui_output, paint_jobs) = self.gui_egui();"},{"Add":" let text_data = TextSystemData::extract();"},{"Add":""},{"Add":" self.text.prepare(&text_data);"},{"Add":""},{"Add":" let camera_text_data_info: Vec<_> ="},{"Add":" self.text.produce_camera(&text_data).into_iter().collect();"},{"Add":" let camera_text_data = camera_text_data_info"},{"Add":" .iter()"},{"Add":" .map(|(buf, mapper)| mapper.produce(buf))"},{"Add":" .collect();"},{"Add":""},{"Add":" let world_text_data_info: Vec<_> ="},{"Add":" self.text.produce_world(&text_data).into_iter().collect();"},{"Add":" let world_text_data = world_text_data_info"},{"Add":" .iter()"},{"Add":" .map(|(buf, mapper)| mapper.produce(buf))"},{"Add":" .collect();"},{"Add":""},{"Add":" // Build the renderer input"},{"Add":" let input = RenderInput {"},{"Add":" paint_jobs: &paint_jobs,"},{"Add":" textures_delta: &egui_output.textures_delta,"},{"Add":" font_system: &mut self.text.fonts,"},{"Add":" swash_cache: &mut self.text.swash,"},{"Add":" camera: &mut self.internal_state.camera,"},{"Add":" render_options: &self.internal_state.render_options,"},{"Add":" camera_text_data,"},{"Add":" world_text_data,"},{"Add":" document: &self.internal_state.document,"},{"Add":" };"},{"Add":""},{"Add":" self.screen.render(input)"},{"Add":" }"},{"Add":""},{"Add":" // methods here might query the world to produce"},{"Add":" // rendering data ready for Screen to use"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"document","metadata":576},"context":[{"change":15,"pos":15}],"contents":[]}},{"FileAdd":{"meta":{"basename":"mode.rs","metadata":0},"context":[{"change":0,"pos":22710}],"contents":[{"Add":"//! Scenes describe all the resources required to display the current game state."},{"Add":"//!"},{"Add":"//! Only 1 scene can be active at any given moment."},{"Add":""},{"Add":"use winit::event::WindowEvent;"},{"Add":""},{"Add":"use super::GameView;"},{"Add":""},{"Add":"pub trait Mode {"},{"Add":" /// Activates the scene"},{"Add":" fn on_enter(&mut self, game: &mut GameView);"},{"Add":" /// De-activates the scene"},{"Add":" fn on_exit(&mut self, game: &mut GameView);"},{"Add":""},{"Add":" /// Scene input handing, true if handled"},{"Add":" fn input(&mut self, event: &WindowEvent, game: &mut GameView) -> bool;"},{"Add":" /// Updates the scene (and can return a SceneReference to go to another scene)"},{"Add":" fn update(&mut self, dt: std::time::Duration, game: &mut GameView) -> Option;"},{"Add":" /// Renders to egui's gui"},{"Add":" fn gui_egui(&mut self, ctx: &egui::Context, game: &mut GameView);"},{"Add":""},{"Add":" // Notice there's no \"render\" method? Yeah, the scene's responsibility is to adjust Game::world (and Game)"},{"Add":" // so that when the renderer comes around to rendering the world, the desired state is present to be rendered."},{"Add":"}"},{"Add":""},{"Add":"/// Scenes that can be referenced"},{"Add":"#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]"},{"Add":"pub enum ModeReference {"},{"Add":" /// Initial scene that starts the game"},{"Add":" Init,"},{"Add":"}"},{"Add":""},{"Add":"/// Library of all scenes that exist"},{"Add":"pub struct ModeLibrary;"},{"Add":""},{"Add":"impl ModeLibrary {"},{"Add":" pub fn get_scene(&self, game: &mut GameView, scene: ModeReference) -> Box {"},{"Add":" let _ = game;"},{"Add":" match scene {"},{"Add":" ModeReference::Init => Box::::default(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Default)]"},{"Add":"pub struct DefaultMode {"},{"Add":" voop: String,"},{"Add":"}"},{"Add":""},{"Add":"impl Mode for DefaultMode {"},{"Add":" fn on_enter(&mut self, game: &mut GameView<'_>) {"},{"Add":" let _ = game;"},{"Add":" // todo!()"},{"Add":" }"},{"Add":""},{"Add":" fn on_exit(&mut self, game: &mut GameView<'_>) {"},{"Add":" let _ = game;"},{"Add":" todo!()"},{"Add":" }"},{"Add":""},{"Add":" fn input(&mut self, event: &WindowEvent, game: &mut GameView<'_>) -> bool {"},{"Add":" let _ = game;"},{"Add":" let _ = event;"},{"Add":" false"},{"Add":" }"},{"Add":""},{"Add":" fn update("},{"Add":" &mut self,"},{"Add":" dt: std::time::Duration,"},{"Add":" game: &mut GameView<'_>,"},{"Add":" ) -> Option {"},{"Add":" let dt_secs = dt.as_secs_f32();"},{"Add":""},{"Add":" let negative = self.voop.starts_with('-');"},{"Add":" let negativity = if negative { -1.0 } else { 1.0 };"},{"Add":" if self.voop.to_lowercase().ends_with(\"camera\") {"},{"Add":" if self.voop.contains(\"rot\") {"},{"Add":" game.camera.transform *= glam::Affine3A::from_axis_angle("},{"Add":" glam::Vec3::Z,"},{"Add":" negativity * std::f32::consts::FRAC_PI_4 * dt_secs,"},{"Add":" );"},{"Add":" } else {"},{"Add":" game.camera.transform.translation.x += negativity * dt_secs * 0.0025;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" None"},{"Add":" }"},{"Add":""},{"Add":" fn gui_egui(&mut self, ctx: &egui::Context, game: &mut GameView) {"},{"Add":" let _ = game;"},{"Add":""},{"Add":" egui::Window::new(\"gama\")"},{"Add":" .default_pos((10.0, 200.0))"},{"Add":" .show(ctx, |ui| {"},{"Add":" ui.label(\">> Welcome to Cat Waiter <<\");"},{"Add":" if ui"},{"Add":" .text_edit_singleline(&mut self.voop)"},{"Add":" .on_hover_text(\"the best textbox of your life\")"},{"Add":" .changed()"},{"Add":" {"},{"Add":" log::info!(\">> new text: {}\", self.voop);"},{"Add":" }"},{"Add":" });"},{"Add":" }"},{"Add":"}"}]}}],"owner":"Jengamon","repo":"rexweb","token":"2FAq/OiivpG80Qu4IQ4QgBpf8lpXwigMZh77VdBri9A=","login":null}

…

Dependencies

Change contents