Use C++20

ChrisThrasher · Jul 8, 2024 · c0fef4f · c0fef4f
1 parent f14a6a4
commit c0fef4f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,10 +11,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-        - { name: Windows,     os: windows-latest }
-        - { name: Linux GCC,   os: ubuntu-latest }
-        - { name: Linux Clang, os: ubuntu-latest, flags: -DCMAKE_CXX_COMPILER=clang++ }
-        - { name: macOS,       os: macos-latest }
+        - { name: Windows,     os: windows-2022 }
+        - { name: Linux GCC,   os: ubuntu-24.04 }
+        - { name: Linux Clang, os: ubuntu-24.04, flags: -DCMAKE_CXX_COMPILER=clang++ }
+        - { name: macOS,       os: macos-14 }
         config:
         - { name: Debug }
         - { name: Release }
@@ -24,7 +24,7 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt update
-        sudo apt install libxrandr-dev libxcursor-dev libxi-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev
+        sudo apt install libxrandr-dev libxcursor-dev libxi-dev libudev-dev libopenal-dev libfreetype-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev
 
     - name: Checkout
       uses: actions/checkout@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,7 @@ FetchContent_MakeAvailable(SFML)
 
 add_executable(mandelbrot src/Mandelbrot.cpp)
 target_link_libraries(mandelbrot PRIVATE SFML::Graphics SFML::Audio Threads::Threads)
+target_compile_features(mandelbrot PRIVATE cxx_std_20)
 
 add_custom_target(format
     COMMAND clang-format -i `git ls-files *.hpp *.cpp`

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ SFML-based Mandelbrot viewer program.
 </p>
 
 # Requirements
- * C++17
+ * C++20
  * CMake 3.22
 
 # Building & Running

diff --git a/src/Mandelbrot.cpp b/src/Mandelbrot.cpp
@@ -2,21 +2,21 @@
 #include <SFML/Graphics.hpp>
 
 #include <complex>
-#include <iomanip>
+#include <format>
 #include <thread>
 
 using Complex = std::complex<long double>;
 
 namespace {
-auto calculate(const Complex& c, const int iteration_limit) noexcept
+constexpr auto calculate(const Complex& c, const int iteration_limit) noexcept
 {
     auto iterations = 0;
     for (auto z = Complex(); std::norm(z) <= 4 && iterations < iteration_limit; ++iterations)
         z = z * z + c;
     return iterations;
 }
 
-auto color(const int iterations, const int iteration_limit) noexcept -> sf::Color
+constexpr auto color(const int iterations, const int iteration_limit) noexcept -> sf::Color
 {
     const auto hue = iterations % 360;
     const auto sat = 0.8f;
@@ -169,10 +169,8 @@ int main()
         window.draw(text);
         window.display();
 
-        auto text_builder = std::ostringstream();
-        text_builder << std::setw(2) << int(1 / clock.restart().asSeconds()) << " fps\n";
-        text_builder << iteration_limit << " iters\n";
-        text_builder << std::setprecision(1) << std::scientific << initial_extent / extent << '\n';
-        text.setString(text_builder.str());
+        const auto fps = int(1 / clock.restart().asSeconds());
+        const auto ratio = initial_extent / extent;
+        text.setString(std::format("{:2} fps\n{} iters\n{:1.1e}\n", fps, iteration_limit, ratio));
     }
 }