From 16461cfcba04b4fddf7de29f5afc0e03ae259a27 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Mon, 27 Jun 2022 04:22:22 -0400
Subject: [PATCH] Cleanup atlas allocator work, remaining TODO: * refactor
 meshing and trait API to replace guillotiere types * associated config type
 on atlas trait * investigate other areas of sprite performance like LOD
 scaling (i.e.   there are now significant gaps in between meshing)

---
 voxygen/src/main.rs        |  5 +---
 voxygen/src/mesh/greedy.rs | 53 ++++++++++++--------------------------
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs
index 6ceb32e2aa..f7e57e9a9b 100644
--- a/voxygen/src/main.rs
+++ b/voxygen/src/main.rs
@@ -268,10 +268,7 @@ fn main() {
 
     let clipboard = iced_winit::Clipboard::connect(window.window());
 
-    let mut lazy_init = SpriteRenderContext::new(window.renderer_mut());
-    let _t = lazy_init(window.renderer_mut());
-    std::thread::sleep(std::time::Duration::from_millis(1000));
-    std::process::exit(0);
+    let lazy_init = SpriteRenderContext::new(window.renderer_mut());
 
     #[cfg(feature = "egui-ui")]
     let egui_state = EguiState::new(&window);
diff --git a/voxygen/src/mesh/greedy.rs b/voxygen/src/mesh/greedy.rs
index 8996394e03..3dc8ee3f65 100644
--- a/voxygen/src/mesh/greedy.rs
+++ b/voxygen/src/mesh/greedy.rs
@@ -136,17 +136,7 @@ impl AtlasAllocator for guillotiere::SimpleAtlasAllocator {
     fn size(&self) -> Vec2<i32> { self.size().to_array().into() }
 
     /// Grows the size of the atlas to the provided size.
-    fn grow(&mut self, new_size: Vec2<i32>) {
-        {
-            prof_span!("debug");
-            let free_space = self.free_space();
-            //let (lw, lh) = self.largest_free_size();
-            let area = self.size().width * self.size().height; // - lw * lh;
-            let used = area - free_space;
-            dbg!((used, free_space, area, area as f32 / used as f32,));
-        }
-        self.grow(guillotiere_size(new_size))
-    }
+    fn grow(&mut self, new_size: Vec2<i32>) { self.grow(guillotiere_size(new_size)) }
 }
 
 pub struct GuillotiereTiled {
@@ -167,28 +157,23 @@ pub struct GuillotiereTiled {
 }
 
 impl GuillotiereTiled {
+    // We can potentially further optimize packing by deferring the allocations
+    // until all rectangles are available for packing.
+    //
     // Tested with sprites:
     // 64 1.63s 1.109 packing
     // 128 1.65s 1.083 packing
     // 256 1.77s 1.070 packing
     // 512 2.27s 1.055 packing
-    // 1024 5.32s 1.045 packing (didn't fill up)
+    // 1024 5.32s 1.045 packing
     // 2048 10.49s n/a packing (didn't fill up)
-    const TILE_SIZE: u16 = 256;
+    const TILE_SIZE: u16 = 512;
 
     fn allocator_options() -> guillotiere::AllocatorOptions {
-        // TODO: Collect information to see if we can choose a good value here.
-        let large_size_threshold = 8; //256.min(min_max_dim / 2 + 1);
-        let small_size_threshold = 3; //33.min(large_size_threshold / 2 + 1);
-
-        // (12, 3) 24.5
-        // (12, 2) 33.2
-        // (12, 4) 27.2
-        // (14, 3) 25.6
-        // (10, 3) 20.9
-        // (8, 3) 17.9
-        // (6, 3) 18.0
-        // (5, 3) 18.0
+        // TODO: Collect information to see if we can choose a better value here (these
+        // values were picked before switching to this tiled implementation).
+        let large_size_threshold = 8;
+        let small_size_threshold = 3;
 
         guillotiere::AllocatorOptions {
             alignment: guillotiere::Size::new(1, 1),
@@ -261,7 +246,6 @@ impl AtlasAllocator for GuillotiereTiled {
                 None => self.next_tile(),
             }
         }
-        dbg!(size);
 
         None
     }
@@ -275,10 +259,8 @@ impl AtlasAllocator for GuillotiereTiled {
 
     /// Grows the size of the atlas to the provided size.
     fn grow(&mut self, new_size: Vec2<i32>) {
-        {
-            prof_span!("debug");
-            tracing::error!("here");
-            println!(
+        if tracing::enabled!(tracing::Level::TRACE) {
+            tracing::trace!(
                 "Tile count: {}",
                 self.history.len() + self.free_tiles.len() + self.current.is_some() as usize
             );
@@ -288,21 +270,18 @@ impl AtlasAllocator for GuillotiereTiled {
                 total_area += area;
                 total_used += used;
             }
-            dbg!(total_area as f32 / total_used as f32);
+            tracing::trace!("Packing ratio: {}", total_area as f32 / total_used as f32);
         }
 
         let diff = (new_size - self.size()).map(|e| e.max(0));
-        dbg!(self.size());
-        dbg!(new_size);
-        dbg!(diff);
-        // TODO: as cast
+        // NOTE: `e` should fit in usize since it is a postive i32 (and we aren't
+        // targeting 16-bit platforms, although this will probably hit the max
+        // texture size limit first regardless)
         // NOTE: growing only occurs in increments of tiles size so any remaining size
         // is ignored.
         let diff_tiles = diff.map(|e| e as usize / usize::from(Self::TILE_SIZE));
-        dbg!(diff_tiles);
         let old_size = self.size;
         self.size += diff_tiles;
-        dbg!(self.size);
 
         // Add new tiles to free tile list
         for x in old_size.x..self.size.x {