From 58874803a371cf56eea3d8b18fbd6f6c9668bab8 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 20 Apr 2020 16:41:04 +0100
Subject: [PATCH] Disabled chunk mesh sorting for now

---
 voxygen/src/mesh/terrain.rs | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/voxygen/src/mesh/terrain.rs b/voxygen/src/mesh/terrain.rs
index 43ee5261d4..116210d37b 100644
--- a/voxygen/src/mesh/terrain.rs
+++ b/voxygen/src/mesh/terrain.rs
@@ -298,9 +298,10 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
         }
         .min(range.size().d - 1);
 
-        // We use multiple meshes and then combine them later such that we can group similar z
-        // levels together (better rendering performance)
-        let mut opaque_meshes = vec![Mesh::new(); ((z_end + 1 - z_start).clamped(1, 60) as usize / 10).max(1)];
+        // // We use multiple meshes and then combine them later such that we can group similar z
+        // // levels together (better rendering performance)
+        // let mut opaque_meshes = vec![Mesh::new(); ((z_end + 1 - z_start).clamped(1, 60) as usize / 10).max(1)];
+        let mut opaque_mesh = Mesh::new();
         let mut fluid_mesh = Mesh::new();
 
         for x in 1..range.size().w - 1 {
@@ -379,12 +380,12 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
                         [[[get_color(blocks[1][1][1].as_ref(), false); 3]; 3]; 3]
                     };
 
-                    let opaque_mesh_index = ((z - z_start) * opaque_meshes.len() as i32 / (z_end + 1 - z_start).max(1)) as usize;
-                    let selected_opaque_mesh = &mut opaque_meshes[opaque_mesh_index];
+                    // let opaque_mesh_index = ((z - z_start) * opaque_meshes.len() as i32 / (z_end + 1 - z_start).max(1)) as usize;
+                    // let selected_opaque_mesh = &mut opaque_meshes[opaque_mesh_index];
                     // Create mesh polygons
                     if block.map_or(false, |vox| vox.is_opaque()) {
                         vol::push_vox_verts(
-                            selected_opaque_mesh,
+                            &mut opaque_mesh,//selected_opaque_mesh,
                             faces_to_make(&blocks, false, |vox| !vox.is_opaque()),
                             offs,
                             &colors,
@@ -419,17 +420,17 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
             }
         }
 
-        let opaque_mesh = opaque_meshes
-            .into_iter()
-            .rev()
-            .fold(Mesh::new(), |mut opaque_mesh, m: Mesh<Self::Pipeline>| {
-                m.verts().chunks_exact(3).rev().for_each(|vs| {
-                    opaque_mesh.push(vs[0]);
-                    opaque_mesh.push(vs[1]);
-                    opaque_mesh.push(vs[2]);
-                });
-                opaque_mesh
-            });
+        // let opaque_mesh = opaque_meshes
+        //     .into_iter()
+        //     .rev()
+        //     .fold(Mesh::new(), |mut opaque_mesh, m: Mesh<Self::Pipeline>| {
+        //         m.verts().chunks_exact(3).rev().for_each(|vs| {
+        //             opaque_mesh.push(vs[0]);
+        //             opaque_mesh.push(vs[1]);
+        //             opaque_mesh.push(vs[2]);
+        //         });
+        //         opaque_mesh
+        //     });
 
         (opaque_mesh, fluid_mesh)
     }