chore: minor emplace() refactor

Author: Tom94

src/BackgroundImagesLoader.cpp

@@ -46,7 +46,7 @@ void BackgroundImagesLoader::enqueue(const fs::path& path, string_view channelSe
         vector<fs::directory_entry> entries;
         forEachFileInDir(mRecursiveDirectories, canonicalPath, [&](const auto& entry) {
             if (!entry.is_directory()) {
-                mFilesFoundInDirectories.emplace(PathAndChannelSelector{entry, string{channelSelector}});
+                mFilesFoundInDirectories.emplace(entry, string{channelSelector});
                 entries.emplace_back(entry);
             }
         });

src/Image.cpp

@@ -834,29 +834,33 @@ Texture* Image::texture(span<const string> channelNames, EInterpolationMode minF
         default: throw runtime_error{"Unsupported number of channels for texture."};
     }
 
-    Texture::ComponentFormat componentFormat = Texture::ComponentFormat::Float16;
-    for (const auto& chanName : channelNames) {
-        const Channel* chan = channel(chanName);
-        if (chan && chan->desiredPixelFormat() == EPixelFormat::F32) {
-            componentFormat = Texture::ComponentFormat::Float32;
-            break; // No need to check further, we already have a channel that requires F32.
-        }
-    }
+    const Texture::ComponentFormat componentFormat = ranges::any_of(
+                                                         channelNames | views::transform([this](const auto& c) { return channel(c); }),
+                                                         [](const auto& c) { return c && c->desiredPixelFormat() == EPixelFormat::F32; }
+                                                     ) ?
+        Texture::ComponentFormat::Float32 :
+        Texture::ComponentFormat::Float16;
 
     mTextures.emplace(
-        lookup,
-        ImageTexture{
+        piecewise_construct,
+        tuple{
+            lookup
+    },
+        tuple{
             new Texture{
-                        pixelFormat, componentFormat,
-                        {size().x(), size().y()},
-                        toNanogui(minFilter),
-                        toNanogui(magFilter),
-                        Texture::WrapMode::ClampToEdge,
-                        1, Texture::TextureFlags::ShaderRead,
-                        true, },
-            {channelNames.begin(), channelNames.end()},
+                pixelFormat,
+                componentFormat,
+                {size().x(), size().y()},
+                toNanogui(minFilter),
+                toNanogui(magFilter),
+                Texture::WrapMode::ClampToEdge,
+                1,
+                Texture::TextureFlags::ShaderRead,
+                true,
+            },
+            channelNames | toVector,
             false,
-    }
+        }
     );
 
     auto& texture = mTextures.at(lookup).nanoguiTexture;

src/ImageViewer.cpp

@@ -2403,7 +2403,7 @@ void ImageViewer::openImageDialog() {
                 allImages.push_back(filter.first);
             }
 
-            filters.emplace(filters.begin(), pair<string, string>{join(allImages, ","), "All images"});
+            filters.emplace(filters.begin(), pair{join(allImages, ","), "All images"});
             const auto paths = file_dialog(this, FileDialogType::OpenMultiple, filters);
 
             for (size_t i = 0; i < paths.size(); ++i) {