-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Display rectangles and bounding boxes for the sprites of each entity. - Highlight the center of each bounding box and create an axis to facilitate alignment verification. - Implement a mode where billboards always faces the current camera. - Reduce the billboard size for the player entity. - Refactor the code to reuse existing functions. - Convert sRGB to linear color inside AABB/Circle/Rectangle pipeline.
- Loading branch information
Showing
14 changed files
with
559 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| use std::num::NonZeroU64; | ||
|
|
||
| use bytemuck::{Pod, Zeroable}; | ||
| use cgmath::Point3; | ||
| use wgpu::util::StagingBelt; | ||
| use wgpu::{ | ||
| include_wgsl, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor, BindGroupLayoutEntry, | ||
| BindingType, BufferBindingType, BufferUsages, ColorTargetState, ColorWrites, CommandEncoder, CompareFunction, DepthBiasState, | ||
| DepthStencilState, Device, FragmentState, IndexFormat, MultisampleState, PipelineCompilationOptions, PipelineLayoutDescriptor, | ||
| PrimitiveState, PrimitiveTopology, Queue, RenderPass, RenderPipeline, RenderPipelineDescriptor, ShaderModuleDescriptor, ShaderStages, | ||
| StencilState, VertexState, | ||
| }; | ||
|
|
||
| use crate::graphics::passes::{ | ||
| BindGroupCount, ColorAttachmentCount, DepthAttachmentCount, Drawer, ForwardRenderPassContext, RenderPassContext, | ||
| }; | ||
| use crate::graphics::{Capabilities, GlobalContext, Prepare, RenderInstruction, SimpleVertex}; | ||
| use crate::Buffer; | ||
|
|
||
| const SHADER: ShaderModuleDescriptor = include_wgsl!("shader/rectangle.wgsl"); | ||
| const DRAWER_NAME: &str = "screen rectangle"; | ||
| const INITIAL_INSTRUCTION_SIZE: usize = 256; | ||
| const INDEX_COUNT: usize = 8; | ||
|
|
||
| #[derive(Copy, Clone, Pod, Zeroable)] | ||
| #[repr(C)] | ||
| struct InstanceData { | ||
| world: [[f32; 4]; 4], | ||
| color: [f32; 4], | ||
| } | ||
|
|
||
| pub(crate) struct ForwardRectangleDrawer { | ||
| vertex_buffer: Buffer<SimpleVertex>, | ||
| index_buffer: Buffer<u16>, | ||
| instance_data_buffer: Buffer<InstanceData>, | ||
| bind_group_layout: BindGroupLayout, | ||
| bind_group: BindGroup, | ||
| pipeline: RenderPipeline, | ||
| draw_count: usize, | ||
| instance_data: Vec<InstanceData>, | ||
| } | ||
|
|
||
| impl Drawer<{ BindGroupCount::Two }, { ColorAttachmentCount::One }, { DepthAttachmentCount::One }> for ForwardRectangleDrawer { | ||
| type Context = ForwardRenderPassContext; | ||
| type DrawData<'data> = Option<()>; | ||
|
|
||
| fn new( | ||
| _capabilities: &Capabilities, | ||
| device: &Device, | ||
| queue: &Queue, | ||
| global_context: &GlobalContext, | ||
| render_pass_context: &Self::Context, | ||
| ) -> Self { | ||
| let shader_module = device.create_shader_module(SHADER); | ||
|
|
||
| // Vertices are defined in world coordinates (Same as WGPU's NDC). | ||
| let vertex_data = [ | ||
| SimpleVertex::new(Point3::new(-1.0, 0.0, 1.0)), | ||
| SimpleVertex::new(Point3::new(-1.0, 2.0, 1.0)), | ||
| SimpleVertex::new(Point3::new(1.0, 0.0, 1.0)), | ||
| SimpleVertex::new(Point3::new(1.0, 2.0, 1.0)), | ||
| ]; | ||
|
|
||
| let index_data: [u16; INDEX_COUNT] = [0, 1, 2, 3, 1, 3, 0, 2]; | ||
|
|
||
| let vertex_buffer = Buffer::with_data( | ||
| device, | ||
| queue, | ||
| format!("{DRAWER_NAME} box vertex"), | ||
| BufferUsages::VERTEX | BufferUsages::COPY_DST, | ||
| &vertex_data, | ||
| ); | ||
|
|
||
| let index_buffer = Buffer::with_data( | ||
| device, | ||
| queue, | ||
| format!("{DRAWER_NAME} box index"), | ||
| BufferUsages::INDEX | BufferUsages::COPY_DST, | ||
| &index_data, | ||
| ); | ||
|
|
||
| let instance_data_buffer = Buffer::with_capacity( | ||
| device, | ||
| format!("{DRAWER_NAME} instance data"), | ||
| BufferUsages::COPY_DST | BufferUsages::STORAGE, | ||
| (size_of::<InstanceData>() * INITIAL_INSTRUCTION_SIZE) as _, | ||
| ); | ||
|
|
||
| let bind_group_layout = device.create_bind_group_layout(&BindGroupLayoutDescriptor { | ||
| label: Some(DRAWER_NAME), | ||
| entries: &[BindGroupLayoutEntry { | ||
| binding: 0, | ||
| visibility: ShaderStages::VERTEX_FRAGMENT, | ||
| ty: BindingType::Buffer { | ||
| ty: BufferBindingType::Storage { read_only: true }, | ||
| has_dynamic_offset: false, | ||
| min_binding_size: NonZeroU64::new(size_of::<InstanceData>() as _), | ||
| }, | ||
| count: None, | ||
| }], | ||
| }); | ||
|
|
||
| let bind_group = Self::create_bind_group(device, &bind_group_layout, &instance_data_buffer); | ||
|
|
||
| let bind_group_layouts = Self::Context::bind_group_layout(device); | ||
|
|
||
| let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor { | ||
| label: Some(DRAWER_NAME), | ||
| bind_group_layouts: &[bind_group_layouts[0], bind_group_layouts[1], &bind_group_layout], | ||
| push_constant_ranges: &[], | ||
| }); | ||
|
|
||
| let pipeline = device.create_render_pipeline(&RenderPipelineDescriptor { | ||
| label: Some(DRAWER_NAME), | ||
| layout: Some(&pipeline_layout), | ||
| vertex: VertexState { | ||
| module: &shader_module, | ||
| entry_point: Some("vs_main"), | ||
| compilation_options: PipelineCompilationOptions::default(), | ||
| buffers: &[SimpleVertex::buffer_layout()], | ||
| }, | ||
| fragment: Some(FragmentState { | ||
| module: &shader_module, | ||
| entry_point: Some("fs_main"), | ||
| compilation_options: PipelineCompilationOptions::default(), | ||
| targets: &[Some(ColorTargetState { | ||
| format: render_pass_context.color_attachment_formats()[0], | ||
| blend: None, | ||
| write_mask: ColorWrites::default(), | ||
| })], | ||
| }), | ||
| multiview: None, | ||
| primitive: PrimitiveState { | ||
| topology: PrimitiveTopology::LineList, | ||
| ..Default::default() | ||
| }, | ||
| depth_stencil: Some(DepthStencilState { | ||
| format: render_pass_context.depth_attachment_output_format()[0], | ||
| depth_write_enabled: false, | ||
| depth_compare: CompareFunction::Always, | ||
| stencil: StencilState::default(), | ||
| bias: DepthBiasState::default(), | ||
| }), | ||
| multisample: MultisampleState { | ||
| count: global_context.msaa.sample_count(), | ||
| ..Default::default() | ||
| }, | ||
| cache: None, | ||
| }); | ||
|
|
||
| Self { | ||
| vertex_buffer, | ||
| index_buffer, | ||
| instance_data_buffer, | ||
| bind_group_layout, | ||
| bind_group, | ||
| pipeline, | ||
| draw_count: 0, | ||
| instance_data: Vec::default(), | ||
| } | ||
| } | ||
|
|
||
| fn draw(&mut self, pass: &mut RenderPass<'_>, _draw_data: Self::DrawData<'_>) { | ||
| if self.draw_count == 0 { | ||
| return; | ||
| } | ||
|
|
||
| pass.set_pipeline(&self.pipeline); | ||
| pass.set_bind_group(2, &self.bind_group, &[]); | ||
| pass.set_vertex_buffer(0, self.vertex_buffer.slice(..)); | ||
| pass.set_index_buffer(self.index_buffer.slice(..), IndexFormat::Uint16); | ||
| pass.draw_indexed(0..INDEX_COUNT as u32, 0, 0..self.draw_count as u32); | ||
| } | ||
| } | ||
|
|
||
| impl Prepare for ForwardRectangleDrawer { | ||
| fn prepare(&mut self, _device: &Device, instructions: &RenderInstruction) { | ||
| self.draw_count = instructions.rectangles.len(); | ||
|
|
||
| if self.draw_count == 0 { | ||
| return; | ||
| } | ||
|
|
||
| self.instance_data.clear(); | ||
|
|
||
| for instruction in instructions.rectangles.iter() { | ||
| self.instance_data.push(InstanceData { | ||
| world: instruction.world.into(), | ||
| color: instruction.color.components_linear(), | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| fn upload(&mut self, device: &Device, staging_belt: &mut StagingBelt, command_encoder: &mut CommandEncoder) { | ||
| let recreated = self | ||
| .instance_data_buffer | ||
| .write(device, staging_belt, command_encoder, &self.instance_data); | ||
|
|
||
| if recreated { | ||
| self.bind_group = Self::create_bind_group(device, &self.bind_group_layout, &self.instance_data_buffer); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ForwardRectangleDrawer { | ||
| fn create_bind_group(device: &Device, bind_group_layout: &BindGroupLayout, instance_data_buffer: &Buffer<InstanceData>) -> BindGroup { | ||
| device.create_bind_group(&BindGroupDescriptor { | ||
| label: Some(DRAWER_NAME), | ||
| layout: bind_group_layout, | ||
| entries: &[BindGroupEntry { | ||
| binding: 0, | ||
| resource: instance_data_buffer.as_entire_binding(), | ||
| }], | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.