refactor: removed useless field from block struct

Author: syntaxerror-9

src/blocks/block.rs

@@ -14,7 +14,7 @@ pub struct BlockFace {
 pub struct Block {
     pub position: glam::Vec3,
     pub absolute_position: glam::Vec3,
-    pub faces: Option<Vec<BlockFace>>,
+    pub faces: Option<Vec<FaceDirections>>,
     pub block_type: BlockType,
     pub is_translucent: bool,
 }
@@ -45,23 +45,12 @@ pub enum FaceDirections {
     Top,
     Bottom,
 }
-
-#[repr(C)]
-#[derive(Pod, Copy, Clone, Zeroable)]
-pub struct BlockVertexData {
-    pub position: [f32; 3],
-    pub normal: [f32; 3],
-    pub tex_coords: [f32; 2],
-}
-
-impl BlockFace {
+impl FaceDirections {
     pub fn create_face_data(
         &self,
-        block: &MutexGuard<'_, Block>, // To prevent deadlocks
+        block: &MutexGuard<'_, Block>,
     ) -> (Vec<BlockVertexData>, Vec<u32>) {
-        let face_direction = self.face_direction;
-
-        let indices = face_direction.get_indices();
+        let indices = self.get_indices();
 
         let mut unique_indices: Vec<u32> = Vec::with_capacity(4);
 
@@ -85,8 +74,8 @@ impl BlockFace {
             *indices_map = index_of as u32;
         }
 
-        let face_texcoords = block.block_type.get_texcoords(face_direction);
-        let normals = face_direction.get_normal_vector();
+        let face_texcoords = block.block_type.get_texcoords(*self);
+        let normals = self.get_normal_vector();
 
         unique_indices.iter().enumerate().for_each(|(i, index)| {
             vertex_data.push(BlockVertexData {
@@ -107,9 +96,7 @@ impl BlockFace {
         &self,
         block: &MutexGuard<'_, Block>, // To prevent deadlocks
     ) -> (Vec<BlockVertexData>, Vec<u32>) {
-        let face_direction = self.face_direction;
-
-        let indices = face_direction.get_indices();
+        let indices = self.get_indices();
 
         let mut unique_indices: Vec<u32> = Vec::with_capacity(4);
 
@@ -133,8 +120,8 @@ impl BlockFace {
             *indices_map = index_of as u32;
         }
 
-        let face_texcoords = block.block_type.get_texcoords(face_direction);
-        let normals = face_direction.get_normal_vector();
+        let face_texcoords = block.block_type.get_texcoords(*self);
+        let normals = self.get_normal_vector();
 
         unique_indices.iter().enumerate().for_each(|(i, index)| {
             vertex_data.push(BlockVertexData {
@@ -151,6 +138,15 @@ impl BlockFace {
         (vertex_data, indices_map)
     }
 }
+
+#[repr(C)]
+#[derive(Pod, Copy, Clone, Zeroable)]
+pub struct BlockVertexData {
+    pub position: [f32; 3],
+    pub normal: [f32; 3],
+    pub tex_coords: [f32; 2],
+}
+
 impl Block {
     pub fn get_vertex_data_layout() -> wgpu::VertexBufferLayout<'static> {
         wgpu::VertexBufferLayout {

src/chunk.rs

@@ -88,7 +88,7 @@ impl Chunk {
 
                     for face in faces.iter() {
                         let mut is_visible = true;
-                        let face_position = face.face_direction.get_normal_vector() + position;
+                        let face_position = face.get_normal_vector() + position;
 
                         if Chunk::is_outside_bounds(&face_position) {
                             is_visible = false;
@@ -213,13 +213,8 @@ impl Chunk {
                         is_translucent: false,
                     }));
 
-                    let face_directions = FaceDirections::all()
-                        .iter()
-                        .map(|face_dir| BlockFace {
-                            block: Arc::downgrade(&block),
-                            face_direction: *face_dir,
-                        })
-                        .collect::<Vec<_>>();
+                    let face_directions =
+                        FaceDirections::all().iter().map(|f| *f).collect::<Vec<_>>();
 
                     block.lock().unwrap().faces = Some(face_directions);
                     let curr = &mut blocks[((x * CHUNK_SIZE) + z) as usize];

src/ui.rs

@@ -47,7 +47,7 @@ impl UI {
                 .as_ref()
                 .unwrap()
                 .iter()
-                .find(|f| f.face_direction == player.facing_face.unwrap())
+                .find(|f| **f == player.facing_face.unwrap())
                 .unwrap()
                 .create_face_data_abs(&block);