From c2b9c2363b017434aa6f3a9ab2b8234dd192fcd0 Mon Sep 17 00:00:00 2001 From: Florian RICHER Date: Mon, 9 Jun 2025 16:51:24 +0200 Subject: [PATCH] Avoid suffixe type by Type --- src/core/render/primitives/command.rs | 8 ++++---- src/core/render/resources/meshes/obj.rs | 8 ++++---- src/core/render/resources/meshes/square.rs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/render/primitives/command.rs b/src/core/render/primitives/command.rs index 16967d7..3adc63c 100644 --- a/src/core/render/primitives/command.rs +++ b/src/core/render/primitives/command.rs @@ -52,10 +52,10 @@ pub trait AsRecordable { } pub trait AsRenderableMesh { - type VertexBufferContentsType: BufferContents + Clone; - type IndexBufferType: Into + Clone; + type VertexBufferContents: BufferContents + Clone; + type IndexBuffer: Into + Clone; - fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContentsType]>; + fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]>; fn vertex_count(&self) -> u32; @@ -67,7 +67,7 @@ pub trait AsRenderableMesh { 0 } - fn index_buffer(&self) -> Option<&Self::IndexBufferType> { + fn index_buffer(&self) -> Option<&Self::IndexBuffer> { None } diff --git a/src/core/render/resources/meshes/obj.rs b/src/core/render/resources/meshes/obj.rs index fe40db8..932ff17 100644 --- a/src/core/render/resources/meshes/obj.rs +++ b/src/core/render/resources/meshes/obj.rs @@ -58,14 +58,14 @@ impl ObjMesh { } impl AsRenderableMesh for ObjMesh { - type VertexBufferContentsType = Vertex3D; - type IndexBufferType = Subbuffer<[u32]>; + type VertexBufferContents = Vertex3D; + type IndexBuffer = Subbuffer<[u32]>; - fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContentsType]> { + fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]> { &self.vertex_buffer } - fn index_buffer(&self) -> Option<&Self::IndexBufferType> { + fn index_buffer(&self) -> Option<&Self::IndexBuffer> { Some(&self.index_buffer) } diff --git a/src/core/render/resources/meshes/square.rs b/src/core/render/resources/meshes/square.rs index 07b046c..6989eb4 100644 --- a/src/core/render/resources/meshes/square.rs +++ b/src/core/render/resources/meshes/square.rs @@ -45,14 +45,14 @@ impl SquareMesh { } impl AsRenderableMesh for SquareMesh { - type VertexBufferContentsType = Vertex3D; - type IndexBufferType = Subbuffer<[u32]>; + type VertexBufferContents = Vertex3D; + type IndexBuffer = Subbuffer<[u32]>; - fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContentsType]> { + fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]> { &self.vertex_buffer } - fn index_buffer(&self) -> Option<&Self::IndexBufferType> { + fn index_buffer(&self) -> Option<&Self::IndexBuffer> { Some(&self.index_buffer) }