lisk77/comet
1
0
Fork 0
mirror of https://github.com/lisk77/comet.git synced 2025-10-23 21:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: added 2D scene rendering and initialization of the texture atlas

Browse source
This commit is contained in:
lisk77 2024-10-28 15:17:59 +01:00
parent 878e220249
commit 780365aeb8
12 changed files with 280 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/comet_app/Cargo.toml
View file

@ -8,6 +8,7 @@ comet_ecs = { path = "../comet_ecs" }
comet_renderer = { path = "../comet_renderer" }
comet_resources = { path = "../comet_resources" }
comet_colors = { path = "../comet_colors" }
comet_log = { path = "../comet_log" }
winit = { version = "0.29", features = ["rwh_05"] }
env_logger = "0.10"
@ -16,6 +17,7 @@ wgpu = { version = "22.0"}
log = "0.4.22"
anyhow = "1.0.89"
bytemuck = "1.18.0"
chrono = "0.4.0"
[dependencies.image]
version = "0.24"

59
crates/comet_app/src/app.rs
View file

@ -1,6 +1,6 @@
use std::sync::Arc;
use comet_ecs::World;
use comet_resources::ResourceManager;
use comet_ecs::{Component, ComponentSet, Render, Renderer2D, Transform2D, World};
use comet_resources::{ResourceManager, Vertex};
use comet_renderer::{Renderer};
use winit::{
@ -11,7 +11,7 @@ use winit::{
};
use comet_colors::LinearRgba;
use comet_ecs::math::Point3;
use log::warn;
use comet_log::*;
use winit::dpi::{LogicalSize, PhysicalSize};
pub enum ApplicationType {
@ -74,6 +74,51 @@ impl<'a> App<'a> {
Some(Icon::from_rgba(rgba_image.into_raw(), width, height).unwrap())
}
pub fn render_scene_2d(&self, renderer: &mut Renderer) {
let entities = self.world.get_entities_with(ComponentSet::from_ids(vec![Renderer2D::type_id()]));
let mut vertex_buffer: Vec<Vertex> = Vec::new();
let mut index_buffer: Vec<u16> = Vec::new();
for entity in entities {
let renderer_component = self.world().get_component::<Renderer2D>(entity as usize);
let transform_component = self.world().get_component::<Transform2D>(entity as usize);
if renderer_component.is_visible() {
//renderer.draw_texture_at(renderer_component.get_texture(), Point3::new(transform_component.position().x(), transform_component.position().y(), 0.0));
let position = transform_component.position();
let region = renderer.get_texture(renderer_component.get_texture().to_string());
let (dim_x, dim_y) = region.dimensions();
let (bound_x, bound_y) =
((dim_x as f32/ renderer.config().width as f32) * 0.5, (dim_y as f32/ renderer.config().height as f32) * 0.5);
let buffer_size = vertex_buffer.len() as u16;
vertex_buffer.append(&mut vec![
Vertex :: new ( [-bound_x + position.x(), bound_y + position.y(), 0.0], [region.x0(), region.y0()] ),
Vertex :: new ( [-bound_x + position.x(), -bound_y + position.y(), 0.0], [region.x0(), region.y1()] ),
Vertex :: new ( [ bound_x + position.x(), -bound_y + position.y(), 0.0], [region.x1(), region.y1()] ) ,
Vertex :: new ( [ bound_x + position.x(), bound_y + position.y(), 0.0], [region.x1(), region.y0()] )
]);
index_buffer.append(&mut vec![
0 + buffer_size, 1 + buffer_size, 3 + buffer_size,
1 + buffer_size, 2 + buffer_size, 3 + buffer_size
]);
}
}
renderer.set_buffers(vertex_buffer, index_buffer);
/*for entity in entities {
let renderer_component = self.world.get_component::<Renderer2D>(entity as usize);
let position_component = self.world.get_component::<Transform2D>(entity as usize);
if renderer_component.is_visible() {
renderer.draw_texture_at(renderer_component.get_texture(), Point3::new(position_component.position().x(), position_component.position().y(), 0.0));
}
}*/
}
pub fn world(&self) -> &World {
&self.world
}
@ -116,12 +161,14 @@ impl<'a> App<'a> {
window.set_maximized(true);
renderer.initialize_atlas();
event_loop.run(|event, control_flow| {
if self.should_quit {
control_flow.exit()
}
game_manager(&mut self.world, &mut renderer);
self.render_scene_2d(&mut renderer);
match event {
Event::WindowEvent {
@ -161,7 +208,9 @@ impl<'a> App<'a> {
}
}
}
_ => { input_manager(event, &mut self, &mut renderer) }
_ => {
input_manager(event, &mut self, &mut renderer);
}
}
}
_ => {}