Update visual sample dependencies

ci/warning-suppresions.txt

@@ -1,8 +1 @@
 # Suppress warnings in external code from submodules
-
-[nontrivial-memcall]
-src:*/modules/imgui/*
-
-[deprecated-literal-operator]
-src:*/modules/corrade/*
-src:*/modules/magnum/*

src/fluid/main.cpp

@@ -118,12 +118,12 @@ class FluidSimulationApp : public Magnum::Platform::Application {
  private:
   void keyPressEvent(KeyEvent& event) override final {
     // Reset fluid container to empty if SPACE key is pressed.
-    if (event.key() == KeyEvent::Key::Space) {
+    if (event.key() == Sdl2Application::Key::Space) {
       fluid_.Reset();
     }
   }
 
-  void mouseMoveEvent(MouseMoveEvent& event) override final {
+  void pointerMoveEvent(PointerMoveEvent& event) override final {
     // Get mouse position as fraction of window size.
     auto x{event.position().x() / float(windowSize().x())};
     auto y{1.0f - event.position().y() / float(windowSize().y())};

src/game_of_life/CMakeLists.txt

@@ -5,5 +5,7 @@ target_link_libraries(GameOfLife PRIVATE
                                  Magnum::Magnum Magnum::GL Magnum::Application
                                  Magnum::Shaders Magnum::Primitives)
 
-target_compile_options(GameOfLife PUBLIC ${SYCL_FLAGS})
+# `using enum` is apparently a C++ 20 extension, but is widely supported,
+# so we can use it without a feature test (and this skips the warning).
+target_compile_options(GameOfLife PUBLIC ${SYCL_FLAGS} -Wno-c++20-extensions)
 target_link_options(GameOfLife PUBLIC ${SYCL_FLAGS})

src/game_of_life/main.cpp

@@ -166,18 +166,19 @@ class GameOfLifeApp : public Magnum::Platform::Application {
     }
   }
 
-  void mousePressEvent(MouseEvent& event) override {
+  void pointerPressEvent(PointerEvent& event) override {
     handleMouse(event.position().x(), event.position().y());
   }
 
-  void mouseMoveEvent(MouseMoveEvent& event) override {
+  void pointerMoveEvent(PointerMoveEvent& event) override {
     // Drag only if left button clicked
-    if ((event.buttons() & MouseMoveEvent::Button::Left)) {
+    using enum Magnum::Platform::Sdl2Application::Pointer;
+    if ((event.pointers() & MouseLeft)) {
       handleMouse(event.position().x(), event.position().y());
     }
   }
 
-  void mouseScrollEvent(MouseScrollEvent& event) override {
+  void scrollEvent(ScrollEvent& event) override {
     auto prevZoom = m_zoom;
     auto inc = event.offset().y();
     if (inc > 0) {
@@ -198,7 +199,7 @@ class GameOfLifeApp : public Magnum::Platform::Application {
 
   void keyPressEvent(KeyEvent& event) override {
     // (Un)pause on SPACE
-    if (event.key() == KeyEvent::Key::Space) {
+    if (event.key() == Sdl2Application::Key::Space) {
       m_paused = !m_paused;
     }
   }

src/mandelbrot/CMakeLists.txt

@@ -6,5 +6,7 @@ target_link_libraries(Mandelbrot PRIVATE
                                  Magnum::Magnum Magnum::GL Magnum::Application
                                  Magnum::Shaders Magnum::Primitives)
 
-target_compile_options(Mandelbrot PUBLIC ${SYCL_FLAGS})
+# `using enum` is apparently a C++ 20 extension, but is widely supported,
+# so we can use it without a feature test (and this skips the warning).
+target_compile_options(Mandelbrot PUBLIC ${SYCL_FLAGS} -Wno-c++20-extensions)
 target_link_options(Mandelbrot PUBLIC ${SYCL_FLAGS})

src/mandelbrot/main.cpp

@@ -121,7 +121,7 @@ class MandelbrotApp : public Magnum::Platform::Application {
     swapBuffers();
   }
 
-  void mouseScrollEvent(MouseScrollEvent& event) override {
+  void scrollEvent(ScrollEvent& event) override {
     // Zoom in or out on the plane
     auto inc = event.offset().y();
     if (inc > 0) {
@@ -131,9 +131,10 @@ class MandelbrotApp : public Magnum::Platform::Application {
     }
   }
 
-  void mouseMoveEvent(MouseMoveEvent& event) override {
+  void pointerMoveEvent(PointerMoveEvent& event) override {
     // Drag only if left button clicked
-    if (!(event.buttons() & MouseMoveEvent::Button::Left)) {
+    using enum Magnum::Platform::Sdl2Application::Pointer;
+    if (!(event.pointers() & Pointer::MouseLeft)) {
       return;
     }
     // Calculate normalized coordinates
@@ -148,12 +149,12 @@ class MandelbrotApp : public Magnum::Platform::Application {
     // If the difference is big enough, drag the center point
     // and with it the viewable part of the plane. The epsilon
     // is necessary to avoid noisy jumps
-    constexpr double EPS = .1;
+    constexpr auto EPS = .1;
     if (dx < EPS && dx > -EPS) {
       m_ctr_x += dx * m_range;
     }
     if (dy < EPS && dy > -EPS) {
-      m_ctr_y += dy * m_range * double(WIDTH) / double(HEIGHT);
+      m_ctr_y += dy * m_range * WIDTH / HEIGHT;
     }
 
     m_prev_mx = x;

src/nbody/main.cpp

@@ -572,17 +572,17 @@ class NBodyApp : public Magnum::Platform::Application {
     m_imgui.handleKeyReleaseEvent(event);
   }
 
-  void mousePressEvent(MouseEvent& event) override {
-    m_imgui.handleMousePressEvent(event);
+  void pointerPressEvent(PointerEvent& event) override {
+    m_imgui.handlePointerPressEvent(event);
   }
-  void mouseReleaseEvent(MouseEvent& event) override {
-    m_imgui.handleMouseReleaseEvent(event);
+  void pointerReleaseEvent(PointerEvent& event) override {
+    m_imgui.handlePointerReleaseEvent(event);
   }
-  void mouseMoveEvent(MouseMoveEvent& event) override {
-    m_imgui.handleMouseMoveEvent(event);
+  void pointerMoveEvent(PointerMoveEvent& event) override {
+    m_imgui.handlePointerMoveEvent(event);
   }
-  void mouseScrollEvent(MouseScrollEvent& event) override {
-    if (m_imgui.handleMouseScrollEvent(event)) {
+  void scrollEvent(ScrollEvent& event) override {
+    if (m_imgui.handleScrollEvent(event)) {
       /* Prevent scrolling the page */
       event.setAccepted();
       return;