Begin move mesh + Vertex and Camera into core
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 20m30s
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 20m30s
This commit is contained in:
parent
2fbf4e6ce2
commit
852d72d716
11 changed files with 64 additions and 3 deletions
19
src/core/camera/mod.rs
Normal file
19
src/core/camera/mod.rs
Normal file
|
@ -0,0 +1,19 @@
|
|||
use bevy_ecs::component::Component;
|
||||
use glam::{Mat4, Quat, Vec3};
|
||||
|
||||
pub trait Camera: Into<Mat4> + Component {}
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct Camera3D {
|
||||
pub projection: Mat4,
|
||||
pub position: Vec3,
|
||||
pub rotation: Quat,
|
||||
}
|
||||
|
||||
impl Into<Mat4> for Camera3D {
|
||||
fn into(self) -> Mat4 {
|
||||
Mat4::from_rotation_translation(self.rotation, self.position) * self.projection
|
||||
}
|
||||
}
|
||||
|
||||
impl Camera for Camera3D {}
|
|
@ -1 +1,4 @@
|
|||
pub mod app;
|
||||
pub mod camera;
|
||||
pub mod render;
|
||||
pub mod scene;
|
||||
|
|
14
src/core/render/mesh.rs
Normal file
14
src/core/render/mesh.rs
Normal file
|
@ -0,0 +1,14 @@
|
|||
use bevy_ecs::component::Component;
|
||||
|
||||
use super::vertex::Vertex2D;
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct Mesh2D {
|
||||
pub vertices: Vec<Vertex2D>,
|
||||
}
|
||||
|
||||
impl Mesh2D {
|
||||
pub fn new(vertices: Vec<Vertex2D>) -> Self {
|
||||
Self { vertices }
|
||||
}
|
||||
}
|
2
src/core/render/mod.rs
Normal file
2
src/core/render/mod.rs
Normal file
|
@ -0,0 +1,2 @@
|
|||
pub mod mesh;
|
||||
pub mod vertex;
|
38
src/core/render/vertex.rs
Normal file
38
src/core/render/vertex.rs
Normal file
|
@ -0,0 +1,38 @@
|
|||
use std::sync::Arc;
|
||||
use vulkano::buffer::{
|
||||
AllocateBufferError, Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer,
|
||||
};
|
||||
use vulkano::memory::allocator::{AllocationCreateInfo, MemoryTypeFilter, StandardMemoryAllocator};
|
||||
use vulkano::pipeline::graphics::vertex_input::Vertex;
|
||||
use vulkano::Validated;
|
||||
|
||||
#[derive(BufferContents, Vertex)]
|
||||
#[repr(C)]
|
||||
pub struct Vertex2D {
|
||||
#[format(R32G32_SFLOAT)]
|
||||
pub position: [f32; 2],
|
||||
|
||||
#[format(R32G32B32_SFLOAT)]
|
||||
pub color: [f32; 3],
|
||||
}
|
||||
|
||||
impl Vertex2D {
|
||||
pub fn create_buffer(
|
||||
vertices: Vec<Vertex2D>,
|
||||
memory_allocator: &Arc<StandardMemoryAllocator>,
|
||||
) -> Result<Subbuffer<[Vertex2D]>, Validated<AllocateBufferError>> {
|
||||
Buffer::from_iter(
|
||||
memory_allocator.clone(),
|
||||
BufferCreateInfo {
|
||||
usage: BufferUsage::VERTEX_BUFFER,
|
||||
..Default::default()
|
||||
},
|
||||
AllocationCreateInfo {
|
||||
memory_type_filter: MemoryTypeFilter::PREFER_DEVICE
|
||||
| MemoryTypeFilter::HOST_SEQUENTIAL_WRITE,
|
||||
..Default::default()
|
||||
},
|
||||
vertices,
|
||||
)
|
||||
}
|
||||
}
|
21
src/core/scene.rs
Normal file
21
src/core/scene.rs
Normal file
|
@ -0,0 +1,21 @@
|
|||
use bevy_ecs::world::World;
|
||||
|
||||
pub struct Scene {
|
||||
world: World,
|
||||
}
|
||||
|
||||
impl Scene {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
world: World::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn world(&self) -> &World {
|
||||
&self.world
|
||||
}
|
||||
|
||||
pub fn world_mut(&mut self) -> &mut World {
|
||||
&mut self.world
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue