diff options
Diffstat (limited to 'include/mbgl/platform')
-rw-r--r-- | include/mbgl/platform/default/glfw_view.hpp | 13 | ||||
-rw-r--r-- | include/mbgl/platform/default/headless_view.hpp | 11 |
2 files changed, 10 insertions, 14 deletions
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index 8f5cfb7281..234568e4b7 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -13,12 +13,11 @@ public: GLFWView(bool fullscreen = false); ~GLFWView(); - void initialize(mbgl::Map *map); - void swap(); - void activate(); - void deactivate(); - void notify(); - void notifyMapChange(mbgl::MapChange change, std::chrono::steady_clock::duration delay = std::chrono::steady_clock::duration::zero()); + void initialize(mbgl::Map *map) override; + void activate() override; + void deactivate() override; + void notify() override; + void invalidate() override; static void onKey(GLFWwindow *window, int key, int scancode, int action, int mods); static void onScroll(GLFWwindow *window, double xoffset, double yoffset); @@ -26,8 +25,6 @@ public: static void onMouseClick(GLFWwindow *window, int button, int action, int modifiers); static void onMouseMove(GLFWwindow *window, double x, double y); - static void eventloop(void *arg); - int run(); void fps(); diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index 5d0e55d69a..5ba6709a4f 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -13,7 +13,7 @@ typedef long unsigned int XID; typedef XID GLXPbuffer; #endif -#include <mbgl/map/view.hpp> +#include <mbgl/mbgl.hpp> #include <mbgl/platform/gl.hpp> #include <memory> @@ -34,11 +34,10 @@ public: void resize(uint16_t width, uint16_t height, float pixelRatio); std::unique_ptr<uint32_t[]> readPixels(); - void notify(); - void notifyMapChange(MapChange change, std::chrono::steady_clock::duration delay = std::chrono::steady_clock::duration::zero()); - void activate(); - void deactivate(); - void swap(); + void activate() override; + void deactivate() override; + void notify() override; + void invalidate() override; private: void clearBuffers(); |