impl(icons, set_title): window icons implemented & set_title window method implemented

Author: beryll1um

README.md

@@ -13,7 +13,7 @@ class Example : public Application
 {
 public:
 
-    virtual bool OnUpdate(Time&) override {
+    virtual bool OnUpdate(Time) override {
         return poll_events();
     }
 

examples/interfaces/interfaces.cpp

@@ -66,6 +66,8 @@ class ExampleInterfaces : public Application
         push_layer<TriangleLayer>(this, triangle);
         push_layer<ImGuiLayer>(triangle);
 
+        Icons icons("../texture/image.png");
+
         set_frame_limit(60);
     }
 

include/unified/application/window/icons/icons.hpp

@@ -0,0 +1,39 @@
+#ifndef _UNIFIED_APPLICATION_WINDOW_ICONS_ICONS_HPP
+#define _UNIFIED_APPLICATION_WINDOW_ICONS_ICONS_HPP
+
+# include <unified/core/int_types.hpp>
+# include <unified/core/string.hpp>
+
+# include <initializer_list>
+
+UNIFIED_BEGIN_NAMESPACE
+
+class Icons
+{
+protected:
+
+    struct glfw_images_wrapper;
+
+public:
+
+    Icons();
+    Icons(const string &icon);
+    Icons(std::initializer_list<string> icons);
+
+    virtual ~Icons();
+
+    void add_icon(const string &icon);
+
+    u32 count() const;
+
+    void *data();
+
+protected:
+
+    glfw_images_wrapper *_images;
+
+};
+
+UNIFIED_END_NAMESPACE
+
+#endif

include/unified/application/window/window.hpp

@@ -10,6 +10,8 @@
 # include <unified/application/event/cursor_move.hpp>
 # include <unified/application/event/key_press.hpp>
 
+# include <unified/application/window/icons/icons.hpp>
+
 # include <functional>
 
 UNIFIED_BEGIN_NAMESPACE
@@ -41,10 +43,13 @@ class Window
 
     Window(string title, VideoMode mode, u32 style);
 
-    virtual ~Window() { }
+    virtual ~Window();
 
     bool poll_events() const;
 
+    void set_title(string title);
+    void set_icons(Icons icons);
+
     UNIFIED_NODISCARD Point2i get_size() const;
     void set_size(Point2i size);
 

src/application/window/icons/icons.cpp

@@ -0,0 +1,46 @@
+#include <unified/application/window/icons/icons.hpp>
+
+# include <GLFW/glfw3.h>
+# include <stb_image.h>
+# include <vector>
+
+UNIFIED_BEGIN_NAMESPACE
+
+struct Icons::glfw_images_wrapper
+{
+    std::vector<GLFWimage> handle;
+};
+
+Icons::Icons() : _images(new glfw_images_wrapper) { }
+
+Icons::Icons(const string &icon) : _images(new glfw_images_wrapper) {
+    add_icon(icon);
+}
+
+Icons::Icons(std::initializer_list<string> icons) : _images(new glfw_images_wrapper) {
+    for (const auto &icon : icons) {
+        add_icon(icon);
+    }
+}
+
+Icons::~Icons() {
+    for (const auto &icon : _images->handle) {
+        stbi_image_free(icon.pixels);
+    }
+    delete _images;
+}
+
+void Icons::add_icon(const string &icon) {
+    GLFWimage image = { .pixels = stbi_load(icon.c_str(), &image.width, &image.height, 0, 4) };
+    _images->handle.push_back(image);
+}
+
+u32 Icons::count() const {
+    return _images->handle.size();
+}
+
+void *Icons::data() {
+    return _images->handle.data();
+}
+
+UNIFIED_END_NAMESPACE

src/application/window/window.cpp

@@ -80,11 +80,23 @@ Window::Window(string title, VideoMode video_mode, u32 style) : _title(title), _
     });
 }
 
+Window::~Window() {
+    delete _window;
+}
+
 bool Window::poll_events() const {
     glfwPollEvents();
     return !glfwWindowShouldClose(_window->glfw_handle);
 }
 
+void Window::set_title(string title) {
+    glfwSetWindowTitle(_window->glfw_handle, (_title = title).c_str());
+}
+
+void Window::set_icons(Icons icons) {
+    glfwSetWindowIcon(_window->glfw_handle, icons.count(), static_cast<GLFWimage*>(icons.data()));
+}
+
 UNIFIED_NODISCARD Point2i Window::get_size() const {
     glfwGetWindowSize(_window->glfw_handle, (int*)&_video_mode.width, (int*)&_video_mode.height);
     return Point2i(_video_mode.width, _video_mode.height);