{"header":{"message":"remove rexweb-specific","description":null,"timestamp":"2024-02-09T19:39:20.324295083Z","authors":[{}]},"hash":"H72R2XKI5XMBPOMQFCQVWAFY4D253T7UJH4J54TNLE7OV3XHGM5AC","authors":[{"login":"Jengamon","key":"47a75hR6eVaawZfVGBs2CqZUKZbcNz5Ago5CubrCkWvZ"}],"deps":{"hashes":[["H72R2XKI5XMBPOMQFCQVWAFY4D253T7UJH4J54TNLE7OV3XHGM5AC","remove rexweb-specific"],["AA",null],["JSH46GOUA6YRECNZAREIXNJ6654U3TW2SK2RBR5AR25AGWQ4WCPQC","add unnecc"],["L6RIUKGLJZLAOKFGUDTZKBPP4HUBPEZAKHJEQHO34WFF62AB2ZIQC","move from git to pijul"],["X5EMQBC4BFNJOOHS2QMF4UB4QH6JKSALK6RXLK6B7SP6MNYSAP6QC","remove yakui for now, and actually integrate egui (maybe)"],["34CROJEM52NB7TGBCGGMIYAQ2AZUI44FWO25MGYYUSCMHLCLJNAQC","add new middleware folder"],["O5P6HCPWGMGJBFJEMC3SYQJ5OEW2AQV4KEJCMRVTTS3K6M45Z3BAC","get a cheeky little web going"],["NY2ZZYTQZUWTUH2S6DOUICDJ5YYGKUDOOSIVIAWKRXO4N3JZAZSQC","add LDtk structure (quicktype)"],["GROTV3H2V6BHU5CA7WSLVYDCWAR7GHUP5JV2QOGPLJ6N3553T4MAC","get text rendering somehow working"],["GHIHJCWBCGFZI4AG66L7WG4WKJ467DXFBRBNLT4ZULSN7ZVBJI6AC","get world space & world text rendering working"],["PAOLWMH7TLJLNAWBJBWP7KB7YGDFUPASMTFU33KZ3QW5JXJMPXCAC","naga-oil cuz that HDR bloom had my name written on it"],["L5SVCVPJMJPDARA4H43U5INQMAKHUIB5PUP55IDRKAPQDB35MXZQC","add camera tests"]],"deps":["JSH46GOUA6YRECNZAREIXNJ6654U3TW2SK2RBR5AR25AGWQ4WCPQC"],"known":["L6RIUKGLJZLAOKFGUDTZKBPP4HUBPEZAKHJEQHO34WFF62AB2ZIQC","NY2ZZYTQZUWTUH2S6DOUICDJ5YYGKUDOOSIVIAWKRXO4N3JZAZSQC","X5EMQBC4BFNJOOHS2QMF4UB4QH6JKSALK6RXLK6B7SP6MNYSAP6QC","GROTV3H2V6BHU5CA7WSLVYDCWAR7GHUP5JV2QOGPLJ6N3553T4MAC","GHIHJCWBCGFZI4AG66L7WG4WKJ467DXFBRBNLT4ZULSN7ZVBJI6AC","PAOLWMH7TLJLNAWBJBWP7KB7YGDFUPASMTFU33KZ3QW5JXJMPXCAC","L5SVCVPJMJPDARA4H43U5INQMAKHUIB5PUP55IDRKAPQDB35MXZQC","34CROJEM52NB7TGBCGGMIYAQ2AZUI44FWO25MGYYUSCMHLCLJNAQC","O5P6HCPWGMGJBFJEMC3SYQJ5OEW2AQV4KEJCMRVTTS3K6M45Z3BAC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"document.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":15},"to":{"change":2,"start":16961,"end":16996},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":16996},"to":{"change":2,"start":16997,"end":16997},"introduced_by":2}],"inode":{"change":2,"pos":16997}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":16997},"to":{"change":2,"start":16998,"end":22637},"introduced_by":2}],"inode":{"change":2,"pos":16997}},"content":[{"Del":"use crate::{\n screen::{Camera, RenderError, RenderInput, RenderOptions, Screen},\n text::{TextSystem, TextSystemData},\n};\nuse winit::{\n event::{ElementState, KeyEvent, WindowEvent},\n keyboard::{Key, NamedKey},\n window::Window,\n};\n\npub struct Document {\n cell_width: u32,\n cell_height: u32,\n}\n\npub struct Project {\n screen: Screen,\n egui: egui::Context,\n egui_winit: egui_winit::State,\n internal_state: ProjectState,\n\n text: TextSystem,\n\n // internal controls\n show_debug: bool,\n}\n\npub struct ProjectState {\n pub camera: Camera,\n pub render_options: RenderOptions,\n pub document: Document,\n}\n\nimpl Project {\n pub async fn new(window: Window) -> color_eyre::Result {\n let camera = Camera::default();\n let render_options = RenderOptions::default();\n // The *only* time we need to manually do this, all others should use extract_view!\n let egui = egui::Context::default();\n let egui_winit =\n egui_winit::State::new(egui.clone(), egui::ViewportId::ROOT, &window, None, None);\n let screen = Screen::new(window).await?;\n let document = Document {\n cell_width: 100,\n cell_height: 100,\n };\n\n Ok(Self {\n egui,\n egui_winit,\n screen,\n\n // systems\n text: TextSystem::new()?,\n\n show_debug: false,\n internal_state: ProjectState {\n camera,\n render_options,\n document,\n },\n })\n }\n\n pub async fn create_surface(&mut self) -> color_eyre::Result<()> {\n self.screen.create_surface().await\n }\n\n pub fn screen(&self) -> &Screen {\n &self.screen\n }\n\n pub fn screen_mut(&mut self) -> &mut Screen {\n &mut self.screen\n }\n\n /// Runs egui code\n pub fn gui_egui(&mut self) -> (egui::FullOutput, Vec) {\n egui_winit::update_viewport_info(\n self.egui_winit\n .egui_input_mut()\n .viewports\n .get_mut(&egui::ViewportId::ROOT)\n .unwrap(),\n &self.egui,\n self.screen.window(),\n );\n let input = self.egui_winit.take_egui_input(self.screen.window());\n\n let full_output = self.egui.run(input, |ctx| {\n egui::Window::new(\"Debug Tools\")\n .open(&mut self.show_debug)\n .show(ctx, |ui| {\n ui.horizontal(|ui| {\n let mut vsync = self.screen.is_vsync();\n let text = if vsync { \"yes\" } else { \"no\" };\n ui.label(\"VSync\");\n ui.toggle_value(&mut vsync, text);\n self.screen.vsync(vsync);\n });\n ui.add(\n egui::Slider::new(&mut self.internal_state.render_options.gamma, 0.0..=2.0)\n .text(\"Gamma\"),\n );\n });\n });\n\n self.egui_winit\n .handle_platform_output(self.screen.window(), full_output.platform_output.clone());\n\n let prims = self\n .egui\n .tessellate(full_output.shapes.clone(), full_output.pixels_per_point);\n\n (full_output, prims)\n }\n\n /// Returns true if the event was handled\n pub fn input(&mut self, event: &WindowEvent) -> bool {\n #[cfg(debug_assertions)]\n if matches!(\n event,\n WindowEvent::KeyboardInput {\n event: KeyEvent {\n logical_key: Key::Named(NamedKey::F1),\n state: ElementState::Pressed,\n repeat: false,\n ..\n },\n ..\n }\n ) {\n self.show_debug = !self.show_debug;\n return true;\n }\n\n false\n }\n\n pub fn update(&mut self, _dt: std::time::Duration) {\n puffin::profile_function!();\n\n // Run any in-progress tasks from the async executor\n // self.executor.run_until_stall(&mut self.internal_state);\n }\n\n pub fn render(&mut self) -> Result<(), RenderError> {\n puffin::profile_function!();\n\n // Any resources only used for the rendering process go here\n let (egui_output, paint_jobs) = self.gui_egui();\n let text_data = TextSystemData::extract();\n\n self.text.prepare(&text_data);\n\n let camera_text_data_info: Vec<_> =\n self.text.produce_camera(&text_data).into_iter().collect();\n let camera_text_data = camera_text_data_info\n .iter()\n .map(|(buf, mapper)| mapper.produce(buf))\n .collect();\n\n let world_text_data_info: Vec<_> =\n self.text.produce_world(&text_data).into_iter().collect();\n let world_text_data = world_text_data_info\n .iter()\n .map(|(buf, mapper)| mapper.produce(buf))\n .collect();\n\n // Build the renderer input\n let input = RenderInput {\n paint_jobs: &paint_jobs,\n textures_delta: &egui_output.textures_delta,\n font_system: &mut self.text.fonts,\n swash_cache: &mut self.text.swash,\n camera: &mut self.internal_state.camera,\n render_options: &self.internal_state.render_options,\n camera_text_data,\n world_text_data,\n document: &self.internal_state.document,\n };\n\n self.screen.render(input)\n }\n\n // methods here might query the world to produce\n // rendering data ready for Screen to use\n}\n"}]}},{"FileDel":{"deleted_names":[{"basename":"document","metadata":576}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":15},"to":{"change":2,"start":22638,"end":22657},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":22657},"to":{"change":2,"start":22658,"end":22658},"introduced_by":2}],"inode":{"change":2,"pos":22658}}},"content_edges":null,"content":[]}},{"FileDel":{"deleted_names":[{"basename":"mode.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":22658},"to":{"change":2,"start":22660,"end":22691},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":22691},"to":{"change":2,"start":22692,"end":22692},"introduced_by":2}],"inode":{"change":2,"pos":22692}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":22692},"to":{"change":2,"start":22693,"end":25896},"introduced_by":2}],"inode":{"change":2,"pos":22692}},"content":[{"Del":"//! Scenes describe all the resources required to display the current game state.\n//!\n//! Only 1 scene can be active at any given moment.\n\nuse winit::event::WindowEvent;\n\nuse super::GameView;\n\npub trait Mode {\n /// Activates the scene\n fn on_enter(&mut self, game: &mut GameView);\n /// De-activates the scene\n fn on_exit(&mut self, game: &mut GameView);\n\n /// Scene input handing, true if handled\n fn input(&mut self, event: &WindowEvent, game: &mut GameView) -> bool;\n /// Updates the scene (and can return a SceneReference to go to another scene)\n fn update(&mut self, dt: std::time::Duration, game: &mut GameView) -> Option;\n /// Renders to egui's gui\n fn gui_egui(&mut self, ctx: &egui::Context, game: &mut GameView);\n\n // Notice there's no \"render\" method? Yeah, the scene's responsibility is to adjust Game::world (and Game)\n // so that when the renderer comes around to rendering the world, the desired state is present to be rendered.\n}\n\n/// Scenes that can be referenced\n#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]\npub enum ModeReference {\n /// Initial scene that starts the game\n Init,\n}\n\n/// Library of all scenes that exist\npub struct ModeLibrary;\n\nimpl ModeLibrary {\n pub fn get_scene(&self, game: &mut GameView, scene: ModeReference) -> Box {\n let _ = game;\n match scene {\n ModeReference::Init => Box::::default(),\n }\n }\n}\n\n#[derive(Default)]\npub struct DefaultMode {\n voop: String,\n}\n\nimpl Mode for DefaultMode {\n fn on_enter(&mut self, game: &mut GameView<'_>) {\n let _ = game;\n // todo!()\n }\n\n fn on_exit(&mut self, game: &mut GameView<'_>) {\n let _ = game;\n todo!()\n }\n\n fn input(&mut self, event: &WindowEvent, game: &mut GameView<'_>) -> bool {\n let _ = game;\n let _ = event;\n false\n }\n\n fn update(\n &mut self,\n dt: std::time::Duration,\n game: &mut GameView<'_>,\n ) -> Option {\n let dt_secs = dt.as_secs_f32();\n\n let negative = self.voop.starts_with('-');\n let negativity = if negative { -1.0 } else { 1.0 };\n if self.voop.to_lowercase().ends_with(\"camera\") {\n if self.voop.contains(\"rot\") {\n game.camera.transform *= glam::Affine3A::from_axis_angle(\n glam::Vec3::Z,\n negativity * std::f32::consts::FRAC_PI_4 * dt_secs,\n );\n } else {\n game.camera.transform.translation.x += negativity * dt_secs * 0.0025;\n }\n }\n\n None\n }\n\n fn gui_egui(&mut self, ctx: &egui::Context, game: &mut GameView) {\n let _ = game;\n\n egui::Window::new(\"gama\")\n .default_pos((10.0, 200.0))\n .show(ctx, |ui| {\n ui.label(\">> Welcome to Cat Waiter <<\");\n if ui\n .text_edit_singleline(&mut self.voop)\n .on_hover_text(\"the best textbox of your life\")\n .changed()\n {\n log::info!(\">> new text: {}\", self.voop);\n }\n });\n }\n}\n"}]}},{"FileDel":{"deleted_names":[{"basename":"document.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":34},"to":{"change":2,"start":0,"end":35},"introduced_by":2},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":2,"pos":35},"to":{"change":2,"start":36,"end":36},"introduced_by":2}],"inode":{"change":2,"pos":36}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":36},"to":{"change":2,"start":37,"end":16960},"introduced_by":2}],"inode":{"change":2,"pos":36}},"content":[{"Del":"use std::{collections::HashMap, sync::atomic::AtomicBool};\n\nuse encase::{ShaderType, UniformBuffer};\nuse naga_oil::compose;\nuse wgpu::util::DeviceExt;\nuse winit::window::Window;\n\nuse crate::{\n document::Document,\n screen::{Camera, RenderOptions},\n};\n\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\npub struct DocumentRenderer {\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 prepared: AtomicBool,\n}\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)]\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/// All document cells must fit within this area\npub const MAX_DOCUMENT_SIZE: glam::UVec2 = glam::UVec2::new(2048, 2048);\n\nimpl DocumentRenderer {\n 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() -> Result {\n let 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 ) -> color_eyre::Result {\n let _ = device;\n let _ = texture_format;\n let num_world_indices = Self::INDICES.len() as u32;\n let mut composer = Self::create_composer()?;\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 = 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: MAX_DOCUMENT_SIZE.x,\n height: MAX_DOCUMENT_SIZE.y,\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 | 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 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 prepared: AtomicBool::new(false),\n })\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 _document: &Document,\n ) {\n self.prepared\n .store(true, std::sync::atomic::Ordering::SeqCst);\n\n if let Some((w, h)) = camera.update_aspect(window.inner_size()) {\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\n 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 could be updated.\");\n }\n\n 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"}]}}],"owner":"Jengamon","repo":"catwaiter","token":"XPQge3jRtb+RjIRAwaYzYNz9Yyw1MG1FZm/fP3ukxs0=","login":null}

…

Dependencies

Change contents