noggit: texture_set: use std::unique_ptr for temp edit values and alphamaps to avoid unnecessary memory allocations

Author: Adspartan

src/noggit/texture_set.cpp

@@ -45,7 +45,7 @@ TextureSet::TextureSet (MapChunkHeader const& header, MPQFile* f, size_t base, M
       if (_layers_info[layer].flags & 0x100)
       {
         f->seek (alpha_base + _layers_info[layer].ofsAlpha);
-        alphamaps[layer - 1] = boost::in_place (f, _layers_info[layer].flags, use_big_alphamaps, do_not_fix_alpha_map);
+        alphamaps[layer - 1] = std::make_unique<Alphamap> (f, _layers_info[layer].flags, use_big_alphamaps, do_not_fix_alpha_map);
       }
     }
 
@@ -73,12 +73,12 @@ int TextureSet::addTexture (scoped_blp_texture_reference texture)
 
     if (texLevel)
     {
-      alphamaps[texLevel - 1] = boost::in_place();
+      alphamaps[texLevel - 1] = std::make_unique<Alphamap>();
     }
 
     if (tmp_edit_values && nTextures == 1)
     {
-      tmp_edit_values.get()[0].fill(255.f);
+      tmp_edit_values.get()->map[0].fill(255.f);
     }
   }
 
@@ -175,7 +175,7 @@ void TextureSet::eraseTextures()
   {
     if (i > 0)
     {
-      alphamaps[i - 1] = boost::none;
+      alphamaps[i - 1].reset();
     }
     _layers_info[i] = ENTRY_MCLY();
   }
@@ -188,7 +188,7 @@ void TextureSet::eraseTextures()
   _need_amap_update = true;
   _need_lod_texture_map_update = true;
 
-  tmp_edit_values = boost::none;
+  tmp_edit_values.reset();
 }
 
 void TextureSet::eraseTexture(size_t id)
@@ -203,21 +203,21 @@ void TextureSet::eraseTexture(size_t id)
   {
     if (i)
     {
-      alphamaps[i - 1] = boost::none;
+      alphamaps[i - 1].reset();
       std::swap (alphamaps[i - 1], alphamaps[i]);
     }
 
     if (tmp_edit_values)
     {
-      tmp_edit_values.get()[i].swap(tmp_edit_values.get()[i+1]);
+      tmp_edit_values.get()->map[i].swap(tmp_edit_values.get()->map[i+1]);
     }
 
     _layers_info[i] = _layers_info[i + 1];
   }
 
   if (nTextures > 1)
   {
-    alphamaps[nTextures - 2] = boost::none;
+    alphamaps[nTextures - 2].reset();
   }
 
   textures.erase(textures.begin()+id);
@@ -229,7 +229,7 @@ void TextureSet::eraseTexture(size_t id)
   // set the default values for the temporary alphamap too
   if (tmp_edit_values)
   {
-    tmp_edit_values.get()[nTextures].fill(0.f);
+    tmp_edit_values.get()->map[nTextures].fill(0.f);
   }
 
   _need_amap_update = true;
@@ -295,7 +295,7 @@ bool TextureSet::eraseUnusedTextures()
 
   if (tmp_edit_values)
   {
-    auto& amaps = tmp_edit_values.get();
+    auto& amaps = *tmp_edit_values.get();
 
     for (int i = 0; i < 4096 && visible_tex.size() < nTextures; ++i)
     {
@@ -394,7 +394,7 @@ bool TextureSet::paintTexture(float xbase, float zbase, float x, float z, Brush*
   }
 
   create_temporary_alphamaps_if_needed();
-  auto& amaps = tmp_edit_values.get();
+  auto& amaps = *tmp_edit_values.get();
 
   zPos = zbase;
 
@@ -582,7 +582,7 @@ bool TextureSet::replace_texture( float xbase
   }
 
   create_temporary_alphamaps_if_needed();
-  auto& amap = tmp_edit_values.get();
+  auto& amap = *tmp_edit_values.get();
 
   for (int j = 0; j < 64; j++)
   {
@@ -701,7 +701,7 @@ std::vector<std::vector<uint8_t>> TextureSet::save_alpha(bool big_alphamap)
       {
         alphas_to_old_alpha(tab);
       }
-      
+
 
       auto const combine_nibble
       (
@@ -857,7 +857,7 @@ void TextureSet::merge_layers(size_t id1, size_t id2)
 
   create_temporary_alphamaps_if_needed();
 
-  auto& amap = tmp_edit_values.get();
+  auto& amap = *tmp_edit_values.get();
 
   for (int i = 0; i < 64 * 64; ++i)
   {
@@ -902,7 +902,7 @@ void TextureSet::bind_alpha(std::size_t id)
       if (tmp_edit_values)
       {
         std::vector<float> amap(3 * 64 * 64);
-        auto& tmp_amaps = tmp_edit_values.get();
+        auto& tmp_amaps = *tmp_edit_values.get();
 
         for (int i = 0; i < 64 * 64; ++i)
         {
@@ -951,12 +951,12 @@ void TextureSet::bind_alpha(std::size_t id)
 namespace
 {
   misc::max_capacity_stack_vector<std::size_t, 4> current_layer_values
-    (std::uint8_t nTextures, boost::optional<Alphamap> const* alphamaps, std::size_t pz, std::size_t px)
+    (std::uint8_t nTextures, std::unique_ptr<Alphamap> const* alphamaps, std::size_t pz, std::size_t px)
   {
     misc::max_capacity_stack_vector<std::size_t, 4> values (nTextures, 0xFF);
     for (std::uint8_t i = 1; i < nTextures; ++i)
     {
-      values[i] = alphamaps[i - 1].get().getAlpha(64 * pz + px);
+      values[i] = alphamaps[i - 1].get()->getAlpha(64 * pz + px);
       values[0] -= values[i];
     }
     return values;
@@ -1028,11 +1028,11 @@ bool TextureSet::apply_alpha_changes()
 {
   if (!tmp_edit_values || nTextures < 2)
   {
-    tmp_edit_values = boost::none;
+    tmp_edit_values.reset();
     return false;
   }
 
-  auto& new_amaps = tmp_edit_values.get();
+  auto& new_amaps = *tmp_edit_values.get();
   std::array<std::uint16_t, 64 * 64> totals;
   totals.fill(0);
 
@@ -1059,7 +1059,7 @@ bool TextureSet::apply_alpha_changes()
   _need_amap_update = true;
   _need_lod_texture_map_update = true;
 
-  tmp_edit_values = boost::none;
+  tmp_edit_values.reset();
 
   return true;
 }
@@ -1071,9 +1071,9 @@ void TextureSet::create_temporary_alphamaps_if_needed()
     return;
   }
 
-  tmp_edit_values.emplace();
+  tmp_edit_values = std::make_unique<tmp_edit_alpha_values>();
 
-  tmp_edit_alpha_values& values = tmp_edit_values.get();
+  tmp_edit_alpha_values& values = *tmp_edit_values.get();
 
   for (int i = 0; i < 64 * 64; ++i)
   {

src/noggit/texture_set.hpp

@@ -76,10 +76,10 @@ class TextureSet
   std::vector<uint8_t> lod_texture_map();
 
   bool apply_alpha_changes();
-  
+
   void create_temporary_alphamaps_if_needed();
   size_t nTextures;
-  boost::optional<tmp_edit_alpha_values> tmp_edit_values;
+  std::unique_ptr<tmp_edit_alpha_values> tmp_edit_values;
 private:
   int get_texture_index_or_add (scoped_blp_texture_reference texture, float target);
 
@@ -91,7 +91,7 @@ class TextureSet
   void update_lod_texture_map();
 
   std::vector<scoped_blp_texture_reference> textures;
-  std::array<boost::optional<Alphamap>, 3> alphamaps;
+  std::array<std::unique_ptr<Alphamap>, 3> alphamaps;
   opengl::texture amap_gl_tex;
   bool _need_amap_update = true;