diff --git a/crates/comet_renderer/src/draw_info.rs b/crates/comet_renderer/src/draw_info.rs new file mode 100644 index 0000000..ffa6fff --- /dev/null +++ b/crates/comet_renderer/src/draw_info.rs @@ -0,0 +1,152 @@ +use wgpu::{BindGroupLayout, BufferUsages, Device}; +use wgpu::util::DeviceExt; +use comet_resources::{Texture, Vertex}; +use comet_log::*; + +pub struct DrawInfo { + name: String, + texture: wgpu::BindGroup, + vertex_data: Vec, + index_data: Vec, + vertex_buffer: wgpu::Buffer, + index_buffer: wgpu::Buffer, + num_indices: u32, +} + +impl DrawInfo { + pub fn new( + name: String, + device: &Device, + texture: &Texture, + texture_bind_group_layout: &BindGroupLayout, + texture_sampler: &wgpu::Sampler, + vertex_data: Vec, + index_data: Vec + ) -> Self { + let texture_bind = device.create_bind_group(&wgpu::BindGroupDescriptor { + layout: &texture_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&texture.view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::Sampler(&texture_sampler), + }, + ], + label: Some(format!("{} Texture", name).as_str()), + }); + + let vertex_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some(format!("{} Vertex Buffer", &name).as_str()), + contents: bytemuck::cast_slice(&vertex_data), + usage: BufferUsages::VERTEX | BufferUsages::COPY_DST, + }); + + let num_indices = index_data.len() as u32; + + let index_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some(format!("{} Index Buffer", &name).as_str()), + contents: bytemuck::cast_slice(&index_data), + usage: BufferUsages::INDEX | BufferUsages::COPY_DST, + }); + + Self { + name, + texture: texture_bind, + vertex_data, + index_data, + vertex_buffer, + index_buffer, + num_indices + } + } + + pub fn name(&self) -> &String { + &self.name + } + + pub fn texture(&self) -> &wgpu::BindGroup { + &self.texture + } + + pub fn vertex_buffer(&self) -> &wgpu::Buffer { + &self.vertex_buffer + } + + pub fn vertex_data(&self) -> &Vec { + &self.vertex_data + } + + pub fn index_buffer(&self) -> &wgpu::Buffer { + &self.index_buffer + } + + pub fn index_data(&self) -> &Vec { + &self.index_data + } + + pub fn num_indices(&self) -> u32 { + self.num_indices + } + + pub fn update_vertex_buffer(&mut self, device: &Device, queue: &wgpu::Queue, vertex_data: Vec) { + let new_vertex_size = vertex_data.len() as u64 * size_of::() as u64; + match vertex_data == self.vertex_data { + true => {}, + false => { + match new_vertex_size > self.vertex_buffer.size() { + false => queue.write_buffer(&self.vertex_buffer, 0, bytemuck::cast_slice(&vertex_data)), + true => { + self.vertex_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some(format!("{} Vertex Buffer", self.name).as_str()), + contents: bytemuck::cast_slice(&vertex_data), + usage: BufferUsages::VERTEX | BufferUsages::COPY_DST, + }); + } + } + self.vertex_data = vertex_data; + } + } + } + + pub fn update_index_buffer(&mut self, device: &Device, queue: &wgpu::Queue, index_data: Vec) { + let new_index_size = index_data.len() as u64 * size_of::() as u64; + match index_data == self.index_data { + true => {}, + false => { + match new_index_size > self.index_buffer.size() { + false => queue.write_buffer(&self.index_buffer, 0, bytemuck::cast_slice(&index_data)), + true => { + self.index_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some(format!("{} Index Buffer", self.name).as_str()), + contents: bytemuck::cast_slice(&index_data), + usage: BufferUsages::INDEX | BufferUsages::COPY_DST, + }); + } + } + self.num_indices = index_data.len() as u32; + warn!("indices: {}", index_data.len()); + self.index_data = index_data; + } + } + } + + pub fn set_texture(&mut self, device: &Device, layout: &BindGroupLayout, texture: &Texture) { + self.texture = device.create_bind_group(&wgpu::BindGroupDescriptor { + layout: &layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&texture.view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::Sampler(&texture.sampler), + }, + ], + label: Some(format!("{} Texture Bind Group", self.name).as_str()), + }); + } +} \ No newline at end of file diff --git a/crates/comet_renderer/src/lib.rs b/crates/comet_renderer/src/lib.rs index 5d2d607..6b26511 100644 --- a/crates/comet_renderer/src/lib.rs +++ b/crates/comet_renderer/src/lib.rs @@ -2,4 +2,5 @@ mod camera; pub mod renderer; pub mod renderer2d; mod render_pass; -mod render_group; \ No newline at end of file +mod render_group; +mod draw_info; \ No newline at end of file diff --git a/crates/comet_renderer/src/renderer2d.rs b/crates/comet_renderer/src/renderer2d.rs index 24fe931..ac092ff 100644 --- a/crates/comet_renderer/src/renderer2d.rs +++ b/crates/comet_renderer/src/renderer2d.rs @@ -3,18 +3,20 @@ use std::path::PathBuf; use std::sync::Arc; use std::time::Instant; use wgpu::BufferUsages; +use wgpu::core::command::DrawKind::Draw; use wgpu::naga::ShaderStage; use wgpu::util::DeviceExt; use winit::dpi::PhysicalSize; use winit::window::Window; use comet_colors::Color; -use comet_ecs::{Camera2D, Component, Position2D, Render, Render2D, Transform2D, Scene}; +use comet_ecs::{Camera2D, Component, Position2D, Render, Render2D, Transform2D, Scene, Text}; use comet_log::*; use comet_math::{p2, p3, v2, v3}; use comet_resources::{graphic_resource_manager::GraphicResourceManager, Texture, Vertex}; use comet_resources::texture_atlas::TextureRegion; use comet_structs::ComponentSet; use crate::camera::{RenderCamera, CameraUniform}; +use crate::draw_info::DrawInfo; use crate::render_pass::{RenderPassInfo, RenderPassType}; use crate::renderer::Renderer; @@ -34,6 +36,7 @@ pub struct Renderer2D<'a> { camera_buffer: wgpu::Buffer, camera_bind_group: wgpu::BindGroup, render_pass: Vec, + draw_info: Vec, graphic_resource_manager: GraphicResourceManager, delta_time: f32, last_frame_time: Instant, @@ -164,7 +167,6 @@ impl<'a> Renderer2D<'a> { bind_group_layouts: &[ &texture_bind_group_layout, &camera_bind_group_layout, - &texture_bind_group_layout, ], push_constant_ranges: &[], }); @@ -218,15 +220,15 @@ impl<'a> Renderer2D<'a> { cache: None, }); - let mut render_pass = Vec::new(); - render_pass.push(RenderPassInfo::new_engine_pass( + let mut render_pass: Vec = Vec::new(); + /*render_pass.push(RenderPassInfo::new_engine_pass( &device, "Standard Render Pass".to_string(), &texture_bind_group_layout, &diffuse_texture, vec![], vec![], - )); + ));*/ let clear_color = match clear_color { Some(color) => color.to_wgpu(), @@ -282,6 +284,8 @@ impl<'a> Renderer2D<'a> { ], label: Some("dummy_texture_bind_group"), }); + + let mut draw_info: Vec = Vec::new(); Self { surface, @@ -299,6 +303,7 @@ impl<'a> Renderer2D<'a> { camera_buffer, camera_bind_group, render_pass, + draw_info, graphic_resource_manager, delta_time: 0.0, last_frame_time: Instant::now(), @@ -342,6 +347,19 @@ impl<'a> Renderer2D<'a> { ); self.render_pass.push(render_pass); } + + pub fn add_draw_call(&mut self, draw_call: String, texture: Texture) { + let draw_info = DrawInfo::new( + draw_call, + &self.device, + &texture, + &self.texture_bind_group_layout, + &self.texture_sampler, + vec![], + vec![], + ); + self.draw_info.push(draw_info); + } /// A function that loads a shader from the resources/shaders folder given the full name of the shader file. pub fn load_shader(&mut self, file_name: &str, shader_stage: Option) { @@ -377,22 +395,25 @@ impl<'a> Renderer2D<'a> { pub fn load_font(&mut self, path: &str, size: f32) { self.graphic_resource_manager.load_font(path, size); let atlas = self.graphic_resource_manager.fonts().iter().find(|f| f.name() == path).unwrap().glyphs().atlas(); - let font_pass = RenderPassInfo::new_engine_pass( + let font_info = DrawInfo::new( + format!("{}", path), &self.device, - format!("Font Render Pass {}", path), - &self.texture_bind_group_layout, &Texture::from_image(&self.device, &self.queue, atlas, None, false).unwrap(), + &self.texture_bind_group_layout, + &self.texture_sampler, vec![], vec![], ); - self.render_pass.push(font_pass); + self.draw_info.push(font_info); } /// An interface for getting the location of the texture in the texture atlas. - pub fn get_texture_region(&self, texture_path: String) -> &TextureRegion { - assert!(self.graphic_resource_manager.texture_atlas().textures().contains_key(&texture_path), "Texture not found in atlas"); - self.graphic_resource_manager.texture_atlas().textures().get(&texture_path).unwrap() + pub fn get_texture_region(&self, texture_path: String) -> Option<&TextureRegion> { + if !self.graphic_resource_manager.texture_atlas().textures().contains_key(&texture_path) { + error!("Texture {} not found in atlas", &texture_path); + } + self.graphic_resource_manager.texture_atlas().textures().get(&texture_path) } pub fn get_glyph_region(&self, glyph: char, font: String) -> &TextureRegion { @@ -404,11 +425,27 @@ impl<'a> Renderer2D<'a> { /// The old texture atlas will be replaced with the new one. pub fn set_texture_atlas_by_paths(&mut self, paths: Vec) { self.graphic_resource_manager.create_texture_atlas(paths); - self.render_pass[0].set_texture(&self.device, &self.texture_bind_group_layout, &Texture::from_image(&self.device, &self.queue, self.graphic_resource_manager.texture_atlas().atlas(), None, false).unwrap()); + let universal_draw = DrawInfo::new( + "Universal Draw".to_string(), + &self.device, + &Texture::from_image(&self.device, &self.queue, self.graphic_resource_manager.texture_atlas().atlas(), None, false).unwrap(), + &self.texture_bind_group_layout, + &self.texture_sampler, + vec![], + vec![], + ); + + self.draw_info.push(universal_draw); + //self.render_pass[0].set_texture(&self.device, &self.texture_bind_group_layout, &Texture::from_image(&self.device, &self.queue, self.graphic_resource_manager.texture_atlas().atlas(), None, false).unwrap()); } fn set_texture_atlas(&mut self, texture_atlas: Texture) { - self.render_pass[0].set_texture( + self.draw_info[0].set_texture( + &self.device, + &self.texture_bind_group_layout, + &texture_atlas, + ); + /*self.render_pass[0].set_texture( &self.device, &self.texture_bind_group_layout, &Texture::from_image( @@ -418,7 +455,7 @@ impl<'a> Renderer2D<'a> { None, false ).unwrap() - ); + );*/ } fn get_project_root() -> std::io::Result { @@ -451,8 +488,10 @@ impl<'a> Renderer2D<'a> { /// A function that writes on the buffers and sets the geometry and index buffer of the `Renderer2D` with the given data. fn set_buffers(&mut self, new_geometry_buffer: Vec, new_index_buffer: Vec) { - self.render_pass[0].set_vertex_buffer(&self.device, &self.queue, new_geometry_buffer); - self.render_pass[0].set_index_buffer(&self.device, &self.queue, new_index_buffer); + self.draw_info[0].update_vertex_buffer(&self.device, &self.queue, new_geometry_buffer); + self.draw_info[0].update_index_buffer(&self.device, &self.queue, new_index_buffer); + //self.render_pass[0].set_vertex_buffer(&self.device, &self.queue, new_geometry_buffer); + //self.render_pass[0].set_index_buffer(&self.device, &self.queue, new_index_buffer); } /// A function that adds data to the already existing geometry and index buffers of the `Renderer2D`. @@ -546,7 +585,7 @@ impl<'a> Renderer2D<'a> { } } - fn add_text_to_buffers(&self, text: String, font: String, size: f32, position: p2, color: wgpu::Color) -> (Vec, Vec) { + fn add_text_to_buffers(&self, draw_index: usize, text: String, font: String, size: f32, position: p2, color: wgpu::Color) -> (Vec, Vec) { let vert_color = [color.r as f32, color.g as f32, color.b as f32, color.a as f32]; let screen_position = p2::new(position.x()/self.config.width as f32, position.y()/self.config.height as f32); @@ -584,7 +623,7 @@ impl<'a> Renderer2D<'a> { Vertex::new([ glyph_right, glyph_top, 0.0 ], [region.u1(), region.v0()], vert_color), ]; - let buffer_size = self.render_pass[1].vertex_data().len() as u16; + let buffer_size = vertex_data.len() as u16; let indices: &mut Vec = &mut vec![ buffer_size, buffer_size + 1, buffer_size + 3, buffer_size + 1, buffer_size + 2, buffer_size + 3, @@ -682,7 +721,7 @@ impl<'a> Renderer2D<'a> { } let entities = scene.get_entities_with(ComponentSet::from_ids(vec![Transform2D::type_id(), Render2D::type_id()])); - //let texts = scene.get_entities_with(ComponentSet::from_ids(vec![Transform2D::type_id(), comet_ecs::Text::type_id()])); + let texts = scene.get_entities_with(ComponentSet::from_ids(vec![Transform2D::type_id(), comet_ecs::Text::type_id()])); self.setup_camera(cameras, scene); @@ -697,7 +736,14 @@ impl<'a> Renderer2D<'a> { let mut position = transform_component.position().clone(); position.set_x(position.x() / self.config().width as f32); position.set_y(position.y() / self.config().height as f32); - let region = self.get_texture_region(renderer_component.get_texture().to_string()); + let mut t_region: Option<&TextureRegion> = None; + match self.get_texture_region(renderer_component.get_texture().to_string()) { + Some(texture_region) => { + t_region = Some(texture_region); + }, + None => continue, + } + let region = t_region.unwrap(); let (dim_x, dim_y) = region.dimensions(); let (bound_x, bound_y) = @@ -719,17 +765,18 @@ impl<'a> Renderer2D<'a> { } } - /*for text in texts { - let component = scene.get_component::(text).unwrap(); + for text in texts { + let component = scene.get_component::(text).unwrap(); let transform = scene.get_component::(text).unwrap(); if component.is_visible() { - let (vertices, indices) = self.add_text_to_buffers(component.content().to_string(), component.font().to_string(), component.font_size(), Point2::from_vec(transform.position().as_vec()), component.color().to_wgpu()); - let render_pass = self.render_pass.iter_mut().find(|r| r.pass_name() == format!("Font Render Pass {}", component.font())).unwrap(); - render_pass.set_vertex_buffer(&self.device, &self.queue, vertices); - render_pass.set_index_buffer(&self.device, &self.queue, indices); + let draw_index = self.draw_info.iter().enumerate().find(|(_, d)| d.name() == &format!("{}", component.font())).unwrap().0; + let (vertices, indices) = self.add_text_to_buffers(draw_index, component.content().to_string(), component.font().to_string(), component.font_size(), p2::from_vec(transform.position().as_vec()), component.color().to_wgpu()); + let draw = self.draw_info.iter_mut().find(|d| d.name() == &format!("{}", component.font())).unwrap(); + draw.update_vertex_buffer(&self.device, &self.queue, vertices); + draw.update_index_buffer(&self.device, &self.queue, indices); } - }*/ + } self.set_buffers(vertex_buffer, index_buffer); } @@ -806,7 +853,7 @@ impl<'a> Renderer2D<'a> { let mut position = transform_component.unwrap().position().clone(); position.set_x(position.x() / self.config().width as f32); position.set_y(position.y() / self.config().height as f32); - let region = self.get_texture_region(renderer_component.unwrap().get_texture().to_string()); + let region = self.get_texture_region(renderer_component.unwrap().get_texture().to_string()).unwrap(); let (dim_x, dim_y) = region.dimensions(); let (bound_x, bound_y) = @@ -847,157 +894,33 @@ impl<'a> Renderer2D<'a> { .create_command_encoder(&wgpu::CommandEncoderDescriptor { label: Some("Render Encoder"), }); - - if self.render_pass.len() < 2 { - { - let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { - label: Some("Render Pass"), - color_attachments: &[Some(wgpu::RenderPassColorAttachment { - view: &output_view, - resolve_target: None, - ops: wgpu::Operations { - load: wgpu::LoadOp::Clear(self.clear_color), - store: wgpu::StoreOp::Store, - }, - })], - depth_stencil_attachment: None, - occlusion_query_set: None, - timestamp_writes: None, - }); - - render_pass.set_pipeline(&self.universal_render_pipeline); - render_pass.set_bind_group(0, self.render_pass[0].texture_bind_group(), &[]); - render_pass.set_bind_group(1, &self.camera_bind_group, &[]); - render_pass.set_bind_group(2, &self.dummy_texture_bind_group, &[]); - render_pass.set_vertex_buffer(0, self.render_pass[0].vertex_buffer().slice(..)); - render_pass.set_index_buffer(self.render_pass[0].index_buffer().slice(..), wgpu::IndexFormat::Uint16); - render_pass.draw_indexed(0..self.render_pass[0].num_indices(), 0, 0..1); - } - } - else { - let texture = self.device.create_texture(&wgpu::TextureDescriptor { - label: Some("Intermediary Texture"), - size: wgpu::Extent3d { - width: self.config.width, - height: self.config.height, - depth_or_array_layers: 1, - }, - mip_level_count: 1, - sample_count: 1, - dimension: wgpu::TextureDimension::D2, - format: self.config.format, - usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::COPY_SRC | wgpu::TextureUsages::TEXTURE_BINDING, - view_formats: &[wgpu::TextureFormat::Bgra8UnormSrgb], + + { + let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), + color_attachments: &[Some(wgpu::RenderPassColorAttachment { + view: &output_view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Clear(self.clear_color), + store: wgpu::StoreOp::Store, + }, + })], + depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); - let intermediary_texture_view = texture.create_view(&wgpu::TextureViewDescriptor::default()); - - let (middle, last) = self.render_pass.split_at(self.render_pass.len() - 1); - let first_pass = &middle[0]; - let last_pass = &last[0]; - - { - let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { - label: Some("Render Pass"), - color_attachments: &[Some(wgpu::RenderPassColorAttachment { - view: &intermediary_texture_view, - resolve_target: None, - ops: wgpu::Operations { - load: wgpu::LoadOp::Clear(self.clear_color), - store: wgpu::StoreOp::Store, - }, - })], - depth_stencil_attachment: None, - occlusion_query_set: None, - timestamp_writes: None, - }); - + for i in 0..self.draw_info.len() { render_pass.set_pipeline(&self.universal_render_pipeline); - render_pass.set_bind_group(0, first_pass.texture_bind_group(), &[]); + render_pass.set_bind_group(0, self.draw_info[i].texture(), &[]); render_pass.set_bind_group(1, &self.camera_bind_group, &[]); - render_pass.set_bind_group(2, &self.dummy_texture_bind_group, &[]); - render_pass.set_vertex_buffer(0, first_pass.vertex_buffer().slice(..)); - render_pass.set_index_buffer(first_pass.index_buffer().slice(..), wgpu::IndexFormat::Uint16); - render_pass.draw_indexed(0..first_pass.num_indices(), 0, 0..1); + render_pass.set_vertex_buffer(0, self.draw_info[i].vertex_buffer().slice(..)); + render_pass.set_index_buffer(self.draw_info[i].index_buffer().slice(..), wgpu::IndexFormat::Uint16); + render_pass.draw_indexed(0..self.draw_info[i].num_indices(), 0, 0..1); } - - /*if middle.iter().skip(1).len() > 0 { - let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { - label: Some("Middle Render Pass"), - color_attachments: &[Some(wgpu::RenderPassColorAttachment { - view: &intermediary_texture_view, - resolve_target: None, - ops: wgpu::Operations { - load: wgpu::LoadOp::Load, - store: wgpu::StoreOp::Store, - }, - })], - depth_stencil_attachment: None, - occlusion_query_set: None, - timestamp_writes: None, - }); - - for pass in &middle[1..] { - render_pass.set_pipeline(match pass.pass_type() { - RenderPassType::Engine => &self.universal_render_pipeline, - RenderPassType::User => pass.pipeline().unwrap(), - }); - - render_pass.set_bind_group(0, pass.texture_bind_group(), &[]); - render_pass.set_bind_group(1, &self.camera_bind_group, &[]); - render_pass.set_bind_group(2, &self.dummy_texture_bind_group, &[]); - render_pass.set_vertex_buffer(0, pass.vertex_buffer().slice(..)); - render_pass.set_index_buffer(pass.index_buffer().slice(..), wgpu::IndexFormat::Uint16); - render_pass.draw_indexed(0..pass.num_indices(), 0, 0..1); - } - }*/ - - let intermediary_bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { - layout: &self.texture_bind_group_layout, - entries: &[ - wgpu::BindGroupEntry { - binding: 0, - resource: wgpu::BindingResource::TextureView(&intermediary_texture_view), - }, - wgpu::BindGroupEntry { - binding: 1, - resource: wgpu::BindingResource::Sampler(&self.texture_sampler), - }, - ], - label: Some("intermediary_bind_group"), - }); - - { - let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { - label: Some("Last Render Pass"), - color_attachments: &[Some(wgpu::RenderPassColorAttachment { - view: &output_view, - resolve_target: None, - ops: wgpu::Operations { - load: wgpu::LoadOp::Clear(self.clear_color), - store: wgpu::StoreOp::Store, - }, - })], - depth_stencil_attachment: None, - occlusion_query_set: None, - timestamp_writes: None, - }); - - render_pass.set_pipeline(match last_pass.pass_type() { - RenderPassType::Engine => &self.universal_render_pipeline, - RenderPassType::User => last_pass.pipeline().unwrap(), - }); - - render_pass.set_bind_group(0, last_pass.texture_bind_group(), &[]); - render_pass.set_bind_group(1, &self.camera_bind_group, &[]); - render_pass.set_bind_group(2, &intermediary_bind_group, &[]); - render_pass.set_vertex_buffer(0, last_pass.vertex_buffer().slice(..)); - render_pass.set_index_buffer(last_pass.index_buffer().slice(..), wgpu::IndexFormat::Uint16); - render_pass.draw_indexed(0..last_pass.num_indices(), 0, 0..1); - } - } - + self.queue.submit(iter::once(encoder.finish())); output.present(); Ok(()) diff --git a/crates/comet_resources/src/lib.rs b/crates/comet_resources/src/lib.rs index e2e81f2..dd5bb2e 100644 --- a/crates/comet_resources/src/lib.rs +++ b/crates/comet_resources/src/lib.rs @@ -8,7 +8,7 @@ pub mod vertex; pub mod texture_atlas; pub mod graphic_resource_manager; mod material; -mod font; +pub mod font; /*use std::io::{BufReader, Cursor}; use wgpu::util::DeviceExt; diff --git a/crates/comet_resources/src/texture_atlas.rs b/crates/comet_resources/src/texture_atlas.rs index 20f8060..2e8ec7c 100644 --- a/crates/comet_resources/src/texture_atlas.rs +++ b/crates/comet_resources/src/texture_atlas.rs @@ -249,27 +249,30 @@ impl TextureAtlas { &glyphs.iter().map(|g| g.render.clone()).collect::>() ); - let mut base = DynamicImage::new_rgba8(width, height); + let padding = (glyphs.len() * 3) as u32; + + let mut base = DynamicImage::new_rgba8(width + padding, height); let mut regions = HashMap::new(); let mut current_row_height = glyphs[0].render.height(); let mut x_offset: u32 = 0; let mut y_offset: u32 = 0; + for g in glyphs.iter() { let glyph_w = g.render.width(); let glyph_h = g.render.height(); if glyph_h != current_row_height { - y_offset += current_row_height; + y_offset += current_row_height + 3; x_offset = 0; current_row_height = glyph_h; } Self::insert_texture_at(&mut base, &g.render, x_offset, y_offset); - let u0 = x_offset as f32 / width as f32; + let u0 = x_offset as f32 / (width + padding) as f32; let v0 = y_offset as f32 / height as f32; - let u1 = (x_offset + glyph_w) as f32 / width as f32; + let u1 = (x_offset + glyph_w) as f32 / (width + padding) as f32; let v1 = (y_offset + glyph_h) as f32 / height as f32; let region = TextureRegion::new( @@ -282,7 +285,7 @@ impl TextureAtlas { regions.insert(g.name.clone(), region); - x_offset += glyph_w; + x_offset += glyph_w + 3; } TextureAtlas { diff --git a/src/lib.rs b/src/lib.rs index c2740ce..f475694 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,8 +15,19 @@ pub mod prelude { pub use comet_input::keyboard::Key; pub use winit_input_helper::WinitInputHelper as InputManager; pub use comet_log::*; - pub use comet_colors::*; - pub use comet_colors::Color; + pub use comet_colors::{ + LinearRgba, + sRgba, + Hsla, + Hsva, + Hwba, + Laba, + Lcha, + Oklaba, + Oklcha, + Xyza, + Color as CometColor + }; pub use comet_ecs::*; pub use comet_math::*; } \ No newline at end of file