JustForFun/vulkano_test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup

Browse source
This commit is contained in:
Florian RICHER 2025-06-09 16:53:59 +02:00
parent c2b9c2363b
commit 8b982ba089
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
4 changed files with 10 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/render/primitives/command.rs
View file

@ -52,10 +52,10 @@ pub trait AsRecordable {
} }
pub trait AsRenderableMesh { pub trait AsRenderableMesh {
type VertexBufferContents: BufferContents + Clone; type VertexBufferData: BufferContents + Clone;
type IndexBuffer: Into<IndexBuffer> + Clone; type IndexBuffer: Into<IndexBuffer> + Clone;
fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]>; fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferData]>;
fn vertex_count(&self) -> u32; fn vertex_count(&self) -> u32;
@ -81,9 +81,9 @@ pub trait AsRenderableMesh {
} }
pub trait AsRenderableMeshInstance { pub trait AsRenderableMeshInstance {
type InstanceBufferContents: BufferContents + Clone; type InstanceBufferData: BufferContents + Clone;
fn instance_buffer(&self) -> &Subbuffer<[Self::InstanceBufferContents]>; fn instance_buffer(&self) -> &Subbuffer<[Self::InstanceBufferData]>;
fn instance_count(&self) -> u32; fn instance_count(&self) -> u32;

24
src/core/render/primitives/transform.rs
View file

@ -119,26 +119,6 @@ impl From<&Transform> for TransformRaw {
} }
} }
impl From<Mat4> for TransformRaw {
fn from(matrix: Mat4) -> Self {
Self {
model: matrix.to_cols_array_2d(),
}
}
}
impl TransformRaw {
pub fn from_matrix(matrix: Mat4) -> Self {
Self {
model: matrix.to_cols_array_2d(),
}
}
pub fn to_matrix(&self) -> Mat4 {
Mat4::from_cols_array_2d(&self.model)
}
}
impl AsBindableBuffer for TransformRaw { impl AsBindableBuffer for TransformRaw {
type BufferData = TransformRaw; type BufferData = TransformRaw;
@ -165,9 +145,9 @@ impl AsBindableBuffer for TransformRaw {
impl AsVertexBuffer for TransformRaw {} impl AsVertexBuffer for TransformRaw {}
impl AsRenderableMeshInstance for Subbuffer<[TransformRaw]> { impl AsRenderableMeshInstance for Subbuffer<[TransformRaw]> {
type InstanceBufferContents = TransformRaw; type InstanceBufferData = TransformRaw;
fn instance_buffer(&self) -> &Subbuffer<[Self::InstanceBufferContents]> { fn instance_buffer(&self) -> &Subbuffer<[Self::InstanceBufferData]> {
self self
} }

4
src/core/render/resources/meshes/obj.rs
View file

@ -58,10 +58,10 @@ impl ObjMesh {
} }
impl AsRenderableMesh for ObjMesh { impl AsRenderableMesh for ObjMesh {
type VertexBufferContents = Vertex3D; type VertexBufferData = Vertex3D;
type IndexBuffer = Subbuffer<[u32]>; type IndexBuffer = Subbuffer<[u32]>;
fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]> { fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferData]> {
&self.vertex_buffer &self.vertex_buffer
} }

4
src/core/render/resources/meshes/square.rs
View file

@ -45,10 +45,10 @@ impl SquareMesh {
} }
impl AsRenderableMesh for SquareMesh { impl AsRenderableMesh for SquareMesh {
type VertexBufferContents = Vertex3D; type VertexBufferData = Vertex3D;
type IndexBuffer = Subbuffer<[u32]>; type IndexBuffer = Subbuffer<[u32]>;
fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]> { fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferData]> {
&self.vertex_buffer &self.vertex_buffer
} }