Using std::format also in examples, fmt::format no longer

cg-tuwien · Dec 1, 2023 · d0b27ec · d0b27ec
1 parent 2591d43
commit d0b27ec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/examples/multi_invokee_rendering/source/multi_invokee_rendering.cpp b/examples/multi_invokee_rendering/source/multi_invokee_rendering.cpp
@@ -160,7 +160,7 @@ int main() // <== Starting point ==
 
 			for (auto* app : apps) {
 				bool isEnabled = app->is_enabled();
-				std::string name = fmt::format("Disable/Enable Invokee [{}]", app->name());
+				std::string name = std::format("Disable/Enable Invokee [{}]", app->name());
 				ImGui::Checkbox(name.c_str(), &isEnabled);
 				if (isEnabled != app->is_enabled())
 				{

diff --git a/examples/orca_loader/source/orca_loader.cpp b/examples/orca_loader/source/orca_loader.cpp
@@ -161,12 +161,12 @@ class orca_loader_app : public avk::invokee
 		startPart = avk::context().get_time();
 
 		for (auto& t : times) {
-			LOG_INFO(fmt::format("{} took {}", std::get<0>(t), std::get<1>(t)));
+			LOG_INFO(std::format("{} took {}", std::get<0>(t), std::get<1>(t)));
 		}
 
 		auto end = avk::context().get_time();
 		auto diff = end - start;
-		LOG_INFO(fmt::format("load_orca_scene took {} in total", diff));
+		LOG_INFO(std::format("load_orca_scene took {} in total", diff));
 
 
 		auto swapChainFormat = avk::context().main_window()->swap_chain_image_format();
@@ -360,12 +360,12 @@ class orca_loader_app : public avk::invokee
 		startPart = avk::context().get_time();
 
 		for (auto& t : times) {
-			LOG_INFO(fmt::format("{} took {}", std::get<0>(t), std::get<1>(t)));
+			LOG_INFO(std::format("{} took {}", std::get<0>(t), std::get<1>(t)));
 		}
 
 		auto end = avk::context().get_time();
 		auto diff = end - start;
-		LOG_INFO(fmt::format("load_orca_scene_cached took {} in total", diff));
+		LOG_INFO(std::format("load_orca_scene_cached took {} in total", diff));
 
 		auto swapChainFormat = avk::context().main_window()->swap_chain_image_format();
 		// Create our rasterization graphics pipeline with the required configuration:

diff --git a/examples/ray_query_in_ray_tracing_shaders/source/ray_query_in_ray_tracing_shaders.cpp b/examples/ray_query_in_ray_tracing_shaders/source/ray_query_in_ray_tracing_shaders.cpp
@@ -244,7 +244,7 @@ class ray_query_in_ray_tracing_shaders_invokee : public avk::invokee
 		if (avk::input().key_pressed(avk::key_code::space)) {
 			// Print the current camera position
 			auto pos = mQuakeCam.translation();
-			LOG_INFO(fmt::format("Current camera position: {}", avk::to_string(pos)));
+			LOG_INFO(std::format("Current camera position: {}", avk::to_string(pos)));
 		}
 		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:

diff --git a/examples/ray_tracing_custom_intersection/source/ray_tracing_custom_intersection.cpp b/examples/ray_tracing_custom_intersection/source/ray_tracing_custom_intersection.cpp
@@ -216,15 +216,15 @@ class ray_tracing_custom_intersection_app : public avk::invokee
 				ImGui::Separator();
 				ImGui::TextColored(ImVec4(0.f, 0.8f, 0.6f, 1.f), "Modify Bottom Level Acceleration Structures:");
 				for (int i=0; i < mAabbs.size(); ++i) {
-					ImGui::DragFloat3(fmt::format("AABB[{}].min", i).c_str(), *reinterpret_cast<float(*)[3]>(&mAabbs[i].minX), 0.01f);
-					ImGui::DragFloat3(fmt::format("AABB[{}].max", i).c_str(), *reinterpret_cast<float(*)[3]>(&mAabbs[i].maxX), 0.01f);
+					ImGui::DragFloat3(std::format("AABB[{}].min", i).c_str(), *reinterpret_cast<float(*)[3]>(&mAabbs[i].minX), 0.01f);
+					ImGui::DragFloat3(std::format("AABB[{}].max", i).c_str(), *reinterpret_cast<float(*)[3]>(&mAabbs[i].maxX), 0.01f);
 				}
 				ImGui::DragFloat3("Pyramid Spire", *reinterpret_cast<float(*)[3]>(&mPyramidVertices[0].mPosition), 0.01f);
 
 				ImGui::Separator();
 				ImGui::TextColored(ImVec4(0.8f, 0.0f, 0.6f, 1.f), "Modify Top Level Acceleration Structures:");
 				for (int i=0; i < mTranslations.size(); ++i) {
-					ImGui::DragFloat3(fmt::format("Instance[{}].translation", i).c_str(), *reinterpret_cast<float(*)[3]>(&mTranslations[i]), 0.01f);
+					ImGui::DragFloat3(std::format("Instance[{}].translation", i).c_str(), *reinterpret_cast<float(*)[3]>(&mTranslations[i]), 0.01f);
 				}
 
 				ImGui::Separator();
@@ -311,7 +311,7 @@ class ray_tracing_custom_intersection_app : public avk::invokee
 		if (avk::input().key_pressed(avk::key_code::space)) {
 			// Print the current camera position
 			auto pos = mQuakeCam.translation();
-			LOG_INFO(fmt::format("Current camera position: {}", avk::to_string(pos)));
+			LOG_INFO(std::format("Current camera position: {}", avk::to_string(pos)));
 		}
 		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:

diff --git a/examples/ray_tracing_with_shadows_and_ao/source/ray_tracing_with_shadows_and_ao.cpp b/examples/ray_tracing_with_shadows_and_ao/source/ray_tracing_with_shadows_and_ao.cpp
@@ -245,7 +245,7 @@ class ray_tracing_with_shadows_and_ao_invokee : public avk::invokee
 		if (avk::input().key_pressed(avk::key_code::space)) {
 			// Print the current camera position
 			auto pos = mQuakeCam.translation();
-			LOG_INFO(fmt::format("Current camera position: {}", avk::to_string(pos)));
+			LOG_INFO(std::format("Current camera position: {}", avk::to_string(pos)));
 		}
 		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition: