From 8b982ba0895b92d5a305eae08fc2e3fe63bf0bbf Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@protonmail.com>
Date: Mon, 9 Jun 2025 16:53:59 +0200
Subject: [PATCH] Cleanup

---
 src/core/render/primitives/command.rs      |  8 ++++----
 src/core/render/primitives/transform.rs    | 24 ++--------------------
 src/core/render/resources/meshes/obj.rs    |  4 ++--
 src/core/render/resources/meshes/square.rs |  4 ++--
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/core/render/primitives/command.rs b/src/core/render/primitives/command.rs
index 3adc63c..877d55f 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 VertexBufferContents: BufferContents + Clone;
+    type VertexBufferData: BufferContents + 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;
 
@@ -81,9 +81,9 @@ pub trait AsRenderableMesh {
 }
 
 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;
 
diff --git a/src/core/render/primitives/transform.rs b/src/core/render/primitives/transform.rs
index 8818fd3..506158c 100644
--- a/src/core/render/primitives/transform.rs
+++ b/src/core/render/primitives/transform.rs
@@ -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 {
     type BufferData = TransformRaw;
 
@@ -165,9 +145,9 @@ impl AsBindableBuffer for TransformRaw {
 impl AsVertexBuffer for 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
     }
 
diff --git a/src/core/render/resources/meshes/obj.rs b/src/core/render/resources/meshes/obj.rs
index 932ff17..7ca648f 100644
--- a/src/core/render/resources/meshes/obj.rs
+++ b/src/core/render/resources/meshes/obj.rs
@@ -58,10 +58,10 @@ impl ObjMesh {
 }
 
 impl AsRenderableMesh for ObjMesh {
-    type VertexBufferContents = Vertex3D;
+    type VertexBufferData = Vertex3D;
     type IndexBuffer = Subbuffer<[u32]>;
 
-    fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]> {
+    fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferData]> {
         &self.vertex_buffer
     }
 
diff --git a/src/core/render/resources/meshes/square.rs b/src/core/render/resources/meshes/square.rs
index 6989eb4..86f8cf9 100644
--- a/src/core/render/resources/meshes/square.rs
+++ b/src/core/render/resources/meshes/square.rs
@@ -45,10 +45,10 @@ impl SquareMesh {
 }
 
 impl AsRenderableMesh for SquareMesh {
-    type VertexBufferContents = Vertex3D;
+    type VertexBufferData = Vertex3D;
     type IndexBuffer = Subbuffer<[u32]>;
 
-    fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferContents]> {
+    fn vertex_buffer(&self) -> &Subbuffer<[Self::VertexBufferData]> {
         &self.vertex_buffer
     }