move Event (and related classes) to core

Author: jube

bin/gf2_tmx_display.cc

@@ -10,6 +10,7 @@
 #include <gf2/core/ResourceRegistry.h>
 #include <gf2/core/RichMapResource.h>
 #include <gf2/core/TiledMap.h>
+#include <gf2/core/Zoom.h>
 
 #include <gf2/graphics/Entity.h>
 #include <gf2/graphics/RenderManager.h>
@@ -18,7 +19,6 @@
 #include <gf2/graphics/RichMapRenderer.h>
 #include <gf2/graphics/Scene.h>
 #include <gf2/graphics/SceneManager.h>
-#include <gf2/graphics/Zoom.h>
 
 namespace {
   constexpr auto ViewSize = gf::vec(1600, 900);

docs/snippets/graphics_event.cc

@@ -1,9 +1,9 @@
-#include <gf2/graphics/Event.h>
+#include <gf2/graphics/Events.h>
 
 void doc_Event() {
 
   // tag::loop[]
-  while (auto event = gf::Event::poll()) {
+  while (auto event = gf::Events::poll()) {
     switch (event->type()) {
       case gf::EventType::Quit:
         // close the window
@@ -17,7 +17,7 @@ void doc_Event() {
   // end::loop[]
 
   // tag::specific[]
-  while (auto event = gf::Event::poll()) {
+  while (auto event = gf::Events::poll()) {
     switch (event->type()) {
       case gf::EventType::Quit:
         // close the window

docs/snippets/graphics_window.cc

@@ -1,5 +1,5 @@
 #include <gf2/graphics/Window.h>
-#include <gf2/graphics/Event.h>
+#include <gf2/graphics/Events.h>
 
 void doc_Window() {
 
@@ -8,7 +8,7 @@ void doc_Window() {
 
   while (!window.should_close()) {
 
-    while (auto event = gf::Event::poll()) {
+    while (auto event = gf::Events::poll()) {
       switch (event->type()) {
         case gf::EventType::Quit:
           window.close(); // don't forget this!

examples/19-gridmap.cc

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Zlib
 // Copyright (c) 2023-2025 Julien Bernard
 
+#include <gf2/core/ActionGroup.h>
 #include <gf2/core/Color.h>
 #include <gf2/core/GridMap.h>
 #include <gf2/core/Log.h>
 #include <gf2/core/Range.h>
 #include <gf2/core/ShapeBuffer.h>
 
-#include <gf2/graphics/ActionGroup.h>
 #include <gf2/graphics/Entity.h>
 #include <gf2/graphics/RenderObject.h>
 #include <gf2/graphics/RenderRecorder.h>

games/HOME/bits/SplashScene.h

@@ -1,9 +1,9 @@
 #ifndef HOME_SPLASH_SCENE_H
 #define HOME_SPLASH_SCENE_H
 
+#include <gf2/core/ActionGroup.h>
 #include <gf2/core/ResourceBundle.h>
 
-#include <gf2/graphics/ActionGroup.h>
 #include <gf2/graphics/Scene.h>
 #include <gf2/graphics/SpriteEntity.h>
 #include <gf2/graphics/TextEntity.h>

games/HOME/bits/WorldScene.h

@@ -1,12 +1,12 @@
 #ifndef HOME_WORLD_SCENE_H
 #define HOME_WORLD_SCENE_H
 
+#include <gf2/core/ActionGroup.h>
 #include <gf2/core/ResourceBundle.h>
 
 #include <gf2/audio/Music.h>
 #include <gf2/audio/Sound.h>
 #include <gf2/framework/GraphicsPhysicsDebug.h>
-#include <gf2/graphics/ActionGroup.h>
 #include <gf2/graphics/Scene.h>
 #include <gf2/graphics/TextEntity.h>
 #include <gf2/physics/PhysicsWorld.h>

include/gf2/graphics/Action.h renamed to include/gf2/core/Action.h

@@ -5,14 +5,13 @@
 
 #include <vector>
 
-#include <gf2/core/ActionSettings.h>
-
+#include "ActionSettings.h"
 #include "Control.h"
-#include "GraphicsApi.h"
+#include "CoreApi.h"
 
 namespace gf {
 
-  class GF_GRAPHICS_API Action {
+  class GF_CORE_API Action {
   public:
     Action(ActionType type = ActionType::Instantaneous);
     Action(const ActionSettings& settings);

include/gf2/graphics/ActionGroup.h renamed to include/gf2/core/ActionGroup.h

@@ -5,15 +5,14 @@
 
 #include <string_view>
 
-#include <gf2/core/ActionSettings.h>
-#include <gf2/core/Id.h>
-
 #include "Action.h"
-#include "GraphicsApi.h"
+#include "ActionSettings.h"
+#include "CoreApi.h"
+#include "Id.h"
 
 namespace gf {
 
-  class GF_GRAPHICS_API ActionGroup {
+  class GF_CORE_API ActionGroup {
   public:
     ActionGroup() = default;
     ActionGroup(const ActionGroupSettings& settings);

include/gf2/graphics/Control.h renamed to include/gf2/core/Control.h

@@ -3,14 +3,13 @@
 #ifndef GF_CONTROL_H
 #define GF_CONTROL_H
 
-#include <gf2/core/ControlSettings.h>
-
+#include "ControlSettings.h"
+#include "CoreApi.h"
 #include "Event.h"
-#include "GraphicsApi.h"
 
 namespace gf {
 
-  class GF_GRAPHICS_API Control {
+  class GF_CORE_API Control {
   public:
     Control(const ControlSettings& settings);
 

include/gf2/graphics/Event.h renamed to include/gf2/core/Event.h

@@ -17,7 +17,7 @@
 #include <gf2/core/TouchTypes.h>
 #include <gf2/core/Vec2.h>
 
-#include "GraphicsApi.h"
+#include "CoreApi.h"
 
 namespace gf {
 
@@ -66,166 +66,166 @@ namespace gf {
   };
 
   // clang-format off
-  struct GF_GRAPHICS_API QuitEvent {
+  struct GF_CORE_API QuitEvent {
   };
   // clang-format on
 
-  struct GF_GRAPHICS_API WindowShownEvent {
+  struct GF_CORE_API WindowShownEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API WindowHiddenEvent {
+  struct GF_CORE_API WindowHiddenEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API WindowExposedEvent {
+  struct GF_CORE_API WindowExposedEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API WindowMovedEvent {
+  struct GF_CORE_API WindowMovedEvent {
     uint32_t window_id;
     Vec2I position;
   };
 
-  struct GF_GRAPHICS_API WindowResizedEvent {
+  struct GF_CORE_API WindowResizedEvent {
     uint32_t window_id;
     Vec2I size;
   };
 
-  // struct GF_GRAPHICS_API WindowPixelSizeChangedEvent {
+  // struct GF_CORE_API WindowPixelSizeChangedEvent {
   //   uint32_t window_id;
   //   Vec2I size;
   // };
 
-  struct GF_GRAPHICS_API WindowMinimizedEvent {
+  struct GF_CORE_API WindowMinimizedEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API WindowMaximizedEvent {
+  struct GF_CORE_API WindowMaximizedEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API WindowRestoredEvent {
+  struct GF_CORE_API WindowRestoredEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API MouseFocusGainedEvent {
+  struct GF_CORE_API MouseFocusGainedEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API MouseFocusLostEvent {
+  struct GF_CORE_API MouseFocusLostEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API KeyboardFocusGainedEvent {
+  struct GF_CORE_API KeyboardFocusGainedEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API KeyboardFocusLostEvent {
+  struct GF_CORE_API KeyboardFocusLostEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API WindowCloseRequestedEvent {
+  struct GF_CORE_API WindowCloseRequestedEvent {
     uint32_t window_id;
   };
 
-  struct GF_GRAPHICS_API KeyPressedEvent {
+  struct GF_CORE_API KeyPressedEvent {
     uint32_t window_id;
     Keycode keycode;
     Scancode scancode;
     Flags<Modifier> modifiers;
   };
 
-  struct GF_GRAPHICS_API KeyRepeatedEvent {
+  struct GF_CORE_API KeyRepeatedEvent {
     uint32_t window_id;
     Keycode keycode;
     Scancode scancode;
     Flags<Modifier> modifiers;
     uint8_t repeat;
   };
 
-  struct GF_GRAPHICS_API KeyReleasedEvent {
+  struct GF_CORE_API KeyReleasedEvent {
     uint32_t window_id;
     Keycode keycode;
     Scancode scancode;
     Flags<Modifier> modifiers;
   };
 
-  // struct GF_GRAPHICS_API TextEditedEvent {
+  // struct GF_CORE_API TextEditedEvent {
   //   uint32_t window_id;
   //   std::string_view text;
   //   int32_t start;
   //   int32_t length;
   // };
 
-  struct GF_GRAPHICS_API TextEnteredEvent {
+  struct GF_CORE_API TextEnteredEvent {
     uint32_t window_id;
     std::array<char, 32> text; // TODO: SDL3: changed to a std::string_view
   };
 
-  // struct GF_GRAPHICS_API TextCandidatesShownEvent {
+  // struct GF_CORE_API TextCandidatesShownEvent {
   //   uint32_t window_id;
   //   std::array<std::string_view, 10> candidates;
   //   int32_t count;
   //   int32_t selected;
   //   bool horizontal;
   // };
 
-  struct GF_GRAPHICS_API MouseMovedEvent {
+  struct GF_CORE_API MouseMovedEvent {
     uint32_t window_id;
     MouseId mouse_id;
     Vec2I position;
     Vec2I motion;
   };
 
-  struct GF_GRAPHICS_API MouseButtonPressedEvent {
+  struct GF_CORE_API MouseButtonPressedEvent {
     uint32_t window_id;
     MouseId mouse_id;
     MouseButton button;
     Vec2I position;
     uint8_t clicks;
   };
 
-  struct GF_GRAPHICS_API MouseButtonReleasedEvent {
+  struct GF_CORE_API MouseButtonReleasedEvent {
     uint32_t window_id;
     MouseId mouse_id;
     MouseButton button;
     Vec2I position;
     uint8_t clicks;
   };
 
-  struct GF_GRAPHICS_API MouseWheelScrolledEvent {
+  struct GF_CORE_API MouseWheelScrolledEvent {
     uint32_t window_id;
     MouseId mouse_id;
     Vec2I offset;
     MouseWheelDirection direction;
   };
 
-  struct GF_GRAPHICS_API GamepadAxisMovedEvent {
+  struct GF_CORE_API GamepadAxisMovedEvent {
     GamepadId gamepad_id;
     GamepadAxis axis;
     int16_t value;
   };
 
-  struct GF_GRAPHICS_API GamepadButtonPressedEvent {
+  struct GF_CORE_API GamepadButtonPressedEvent {
     GamepadId gamepad_id;
     GamepadButton button;
   };
 
-  struct GF_GRAPHICS_API GamepadButtonReleasedEvent {
+  struct GF_CORE_API GamepadButtonReleasedEvent {
     GamepadId gamepad_id;
     GamepadButton button;
   };
 
-  struct GF_GRAPHICS_API GamepadConnectedEvent {
+  struct GF_CORE_API GamepadConnectedEvent {
     GamepadHwId gamepad_hw_id;
   };
 
-  struct GF_GRAPHICS_API GamepadDisconnectedEvent {
+  struct GF_CORE_API GamepadDisconnectedEvent {
     GamepadId gamepad_id;
   };
 
-  struct GF_GRAPHICS_API TouchPressedEvent {
+  struct GF_CORE_API TouchPressedEvent {
     uint32_t window_id;
     TouchId touch_id;
     FingerId finger;
@@ -234,7 +234,7 @@ namespace gf {
     float pressure;
   };
 
-  struct GF_GRAPHICS_API TouchReleasedEvent {
+  struct GF_CORE_API TouchReleasedEvent {
     uint32_t window_id;
     TouchId touch_id;
     FingerId finger;
@@ -243,7 +243,7 @@ namespace gf {
     float pressure;
   };
 
-  struct GF_GRAPHICS_API TouchMovedEvent {
+  struct GF_CORE_API TouchMovedEvent {
     uint32_t window_id;
     TouchId touch_id;
     FingerId finger;
@@ -252,7 +252,7 @@ namespace gf {
     float pressure;
   };
 
-  class GF_GRAPHICS_API Event {
+  class GF_CORE_API Event {
   public:
     constexpr Event() = default;
 
@@ -303,9 +303,6 @@ namespace gf {
       return std::get<static_cast<std::size_t>(E)>(m_data);
     }
 
-    static std::optional<Event> poll();
-    static Event wait();
-
   private:
     uint64_t m_timestamp = 0;