From c8ff61fa4c0b1226d14aecde67675b3360bf564e Mon Sep 17 00:00:00 2001 From: gomkyung2 Date: Tue, 1 Oct 2024 18:17:35 +0900 Subject: [PATCH] Added parentheses to the parameterless lambda functions (MSVC does not support it yet) --- impl/control/ImGui.cpp | 18 +++++++++--------- interface/vulkan/Gpu.cppm | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/impl/control/ImGui.cpp b/impl/control/ImGui.cpp index 800da015..7cab2989 100644 --- a/impl/control/ImGui.cpp +++ b/impl/control/ImGui.cpp @@ -351,7 +351,7 @@ auto vk_gltf_viewer::control::imgui::assetBufferViews(AppState &appState) -> voi if (ImGui::BeginItemTooltip()) { ImGui::TextUnformatted(visit_as(nonempty_or( appState.gltfAsset->asset.buffers[bufferView.bufferIndex].name, - [&] { return std::format("", bufferView.bufferIndex); }))); + [&]() { return std::format("", bufferView.bufferIndex); }))); ImGui::EndTooltip(); } }, ImGuiTableColumnFlags_WidthFixed }, @@ -503,7 +503,7 @@ auto vk_gltf_viewer::control::imgui::assetMaterials(AppState &appState, std::spa else if (gltfAsset.assetInspectorMaterialIndex) { return ImGui::BeginCombo("Material", visit_as(nonempty_or( gltfAsset.asset.materials[*gltfAsset.assetInspectorMaterialIndex].name, - [&] { return std::format("", *gltfAsset.assetInspectorMaterialIndex); })).c_str()); + [&]() { return std::format("", *gltfAsset.assetInspectorMaterialIndex); })).c_str()); } else { return ImGui::BeginCombo("Material", ""); @@ -512,7 +512,7 @@ auto vk_gltf_viewer::control::imgui::assetMaterials(AppState &appState, std::spa if (isComboBoxOpened) { for (const auto &[i, material] : gltfAsset.asset.materials | ranges::views::enumerate) { const bool isSelected = i == gltfAsset.assetInspectorMaterialIndex; - if (ImGui::Selectable(visit_as(nonempty_or(material.name, [&] { return std::format("", i); })).c_str(), isSelected)) { + if (ImGui::Selectable(visit_as(nonempty_or(material.name, [&]() { return std::format("", i); })).c_str(), isSelected)) { gltfAsset.assetInspectorMaterialIndex = i; } if (isSelected) { @@ -662,12 +662,12 @@ auto vk_gltf_viewer::control::imgui::assetSceneHierarchies(AppState &appState) - AppState::GltfAsset &gltfAsset = *appState.gltfAsset; if (ImGui::BeginCombo("Scene", visit_as(nonempty_or( gltfAsset.getScene().name, - [&] { return std::format("", gltfAsset.getSceneIndex()); })).c_str())) { + [&]() { return std::format("", gltfAsset.getSceneIndex()); })).c_str())) { for (const auto &[i, scene] : gltfAsset.asset.scenes | ranges::views::enumerate) { const bool isSelected = i == gltfAsset.getSceneIndex(); if (ImGui::Selectable(visit_as(nonempty_or( scene.name, - [&] { return std::format("", i); })).c_str(), isSelected)) { + [&]() { return std::format("", i); })).c_str(), isSelected)) { gltfAsset.setScene(i); } if (isSelected) { @@ -844,7 +844,7 @@ auto vk_gltf_viewer::control::imgui::assetSceneHierarchies(AppState &appState) - ImGui::TableSetColumnIndex(3); if (ImGui::TextLink(visit_as(nonempty_or( gltfAsset.asset.meshes[*meshIndex].name, - [&] { return std::format("", *meshIndex); })).c_str())) { + [&]() { return std::format("", *meshIndex); })).c_str())) { // TODO } } @@ -853,7 +853,7 @@ auto vk_gltf_viewer::control::imgui::assetSceneHierarchies(AppState &appState) - ImGui::TableSetColumnIndex(4); if (ImGui::TextLink(visit_as(nonempty_or( gltfAsset.asset.lights[*lightIndex].name, - [&] { return std::format("", *lightIndex); })).c_str())) { + [&]() { return std::format("", *lightIndex); })).c_str())) { // TODO } } @@ -862,7 +862,7 @@ auto vk_gltf_viewer::control::imgui::assetSceneHierarchies(AppState &appState) - ImGui::TableSetColumnIndex(5); if (ImGui::TextLink(visit_as(nonempty_or( gltfAsset.asset.cameras[*cameraIndex].name, - [&] { return std::format("", *cameraIndex); })).c_str())) { + [&]() { return std::format("", *cameraIndex); })).c_str())) { // TODO } } @@ -977,7 +977,7 @@ auto vk_gltf_viewer::control::imgui::nodeInspector( if (ImGui::WithLabel("Material"sv, [&]() { return ImGui::TextLink(visit_as(nonempty_or( gltfAsset.asset.materials[*primitive.materialIndex].name, - [&] { return std::format("", *primitive.materialIndex); })).c_str()); + [&]() { return std::format("", *primitive.materialIndex); })).c_str()); })) { // TODO. } diff --git a/interface/vulkan/Gpu.cppm b/interface/vulkan/Gpu.cppm index 7a2b3c03..845735a7 100644 --- a/interface/vulkan/Gpu.cppm +++ b/interface/vulkan/Gpu.cppm @@ -14,7 +14,7 @@ namespace vk_gltf_viewer::vulkan { QueueFamilies(vk::PhysicalDevice physicalDevice, vk::SurfaceKHR surface) { const std::vector queueFamilyProperties = physicalDevice.getQueueFamilyProperties(); compute = vku::getComputeSpecializedQueueFamily(queueFamilyProperties) - .or_else([&] { return vku::getComputeQueueFamily(queueFamilyProperties); }) + .or_else([&]() { return vku::getComputeQueueFamily(queueFamilyProperties); }) .value(); graphicsPresent = vku::getGraphicsPresentQueueFamily(physicalDevice, surface, queueFamilyProperties).value(); transfer = vku::getTransferSpecializedQueueFamily(queueFamilyProperties).value_or(compute);