ObservableSetting

src/data/setting.h

@@ -34,42 +34,66 @@ public:
 using observer_handler = std::shared_ptr<int>;
 
 template<class T>
-class Observers {
+class ObservableSetting : public Setting {
     int nextid = 1;
     std::unordered_map<int, consumer<T>> observers;
+protected:
+    T initial;
+    T value;
 public:
-    observer_handler observe(consumer<T> callback) {
+    ObservableSetting(T value, setting_format format) 
+    : Setting(format), initial(value), value(value) {}
+
+    observer_handler observe(consumer<T> callback, bool callOnStart=false) {
         const int id = nextid++;
         observers.emplace(id, callback);
+        if (callOnStart) {
+            callback(value);
+        }
         return std::shared_ptr<int>(new int(id), [this](int* id) {
             observers.erase(*id);
             delete id;
         });
     }
 
+    T get() const {
+        return value;
+    }
+
+    T& operator*() {
+        return value;
+    }
+
     void notify(T value) {
         for (auto& entry : observers) {
             entry.second(value);
         }
     }
+
+    void set(T value) {
+        if (value == this->value) {
+            return;
+        }
+        this->value = value;
+        notify(value);
+    }
+
+    virtual void resetToDefault() override {
+        set(initial);
+    }
 };
 
-class NumberSetting : public Setting {
+class NumberSetting : public ObservableSetting<number_t> {
 protected:
-    number_t initial;
-    number_t value;
     number_t min;
     number_t max;
-    Observers<number_t> observers;
 public:
     NumberSetting(
         number_t value, 
         number_t min=std::numeric_limits<number_t>::min(), 
         number_t max=std::numeric_limits<number_t>::max(),
         setting_format format=setting_format::simple
-    ) : Setting(format), 
+    ) : ObservableSetting(value, format), 
-        initial(value), 
-        value(value), 
         min(min), 
         max(max)
     {}
@@ -82,14 +106,6 @@ public:
         return value;
     }
 
-    void set(number_t value) {
-        if (value == this->value) {
-            return;
-        }
-        this->value = value;
-        observers.notify(value);
-    }
-
     number_t getMin() const {
         return min;
     }
@@ -102,14 +118,6 @@ public:
         return (value - min) / (max - min);
     }
 
-    observer_handler observe(consumer<number_t> callback) {
-        return observers.observe(callback);
-    }
-
-    virtual void resetToDefault() override {
-        set(initial);
-    }
-
     virtual std::string toString() const override;
 
     static inline NumberSetting createPercent(number_t def) {
@@ -117,42 +125,21 @@ public:
     }
 };
 
-class IntegerSetting : public Setting {
+class IntegerSetting : public ObservableSetting<integer_t> {
 protected:
-    integer_t initial;
-    integer_t value;
     integer_t min;
     integer_t max;
-    Observers<integer_t> observers;
 public:
     IntegerSetting(
         integer_t value, 
         integer_t min=std::numeric_limits<integer_t>::min(), 
         integer_t max=std::numeric_limits<integer_t>::max(),
         setting_format format=setting_format::simple
-    ) : Setting(format), 
+    ) : ObservableSetting(value, format),
-        initial(value), 
-        value(value), 
         min(min), 
         max(max)
     {}
 
-    integer_t& operator*() {
-        return value;
-    }
-
-    integer_t get() const {
-        return value;
-    }
-
-    void set(integer_t value) {
-        if (value == this->value) {
-            return;
-        }
-        this->value = value;
-        observers.notify(value);
-    }
-
     integer_t getMin() const {
         return min;
     }
@@ -165,62 +152,21 @@ public:
         return (value - min) / (max - min);
     }
 
-    observer_handler observe(consumer<integer_t> callback) {
-        return observers.observe(callback);
-    }
-
-    virtual void resetToDefault() override {
-        set(initial);
-    }
-
     virtual std::string toString() const override;
 };
 
-class FlagSetting : public Setting {
+class FlagSetting : public ObservableSetting<bool> {
-protected:
-    bool initial;
-    bool value;
-    Observers<bool> observers;
 public:
     FlagSetting(
         bool value,
         setting_format format=setting_format::simple
-    ) : Setting(format),
+    ) : ObservableSetting(value, format)
-        initial(value),
-        value(value)
     {}
 
-    bool& operator*() {
-        return value;
-    }
-
-    bool get() const {
-        return value;
-    }
-
-    void set(bool value) {
-        if (value == this->value) {
-            return;
-        }
-        this->value = value;
-        observers.notify(value);
-    }
-
     void toggle() {
         set(!get());
     }
 
-    observer_handler observe(consumer<bool> callback, bool callOnStart=false) {
-        if (callOnStart) {
-            callback(value);
-        }
-        return observers.observe(callback);
-    }
-
-    virtual void resetToDefault() override {
-        set(initial);
-    }
-
     virtual std::string toString() const override;
 };
 

src/engine.cpp

@@ -107,11 +107,11 @@ void Engine::updateHotkeys() {
 }
 
 void Engine::saveScreenshot() {
-    std::unique_ptr<ImageData> image(Window::takeScreenshot());
+    auto image = Window::takeScreenshot();
     image->flipY();
     fs::path filename = paths->getScreenshotFile("png");
     imageio::write(filename.string(), image.get());
-    logger.info() << "saved screenshot as "+filename.u8string();
+    logger.info() << "saved screenshot as " << filename.u8string();
 }
 
 void Engine::mainloop() {

src/window/Window.cpp

@@ -312,11 +312,13 @@ DisplaySettings* Window::getSettings() {
     return settings;
 }
 
-ImageData* Window::takeScreenshot() {
+std::unique_ptr<ImageData> Window::takeScreenshot() {
-    ubyte* data = new ubyte[width * height * 3];
+    auto data = std::make_unique<ubyte[]>(width * height * 3);
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
-    glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, data);
+    glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, data.get());
-    return new ImageData(ImageFormat::rgb888, width, height, data);
+    return std::make_unique<ImageData>(
+        ImageFormat::rgb888, width, height, data.release()
+    );
 }
 
 const char* Window::getClipboardText() {

src/window/Window.h

@@ -5,7 +5,7 @@
 
 #include <stack>
 #include <vector>
-
+#include <memory>
 #include <glm/glm.hpp>
 
 class ImageData;
@@ -58,7 +58,7 @@ public:
         return glm::vec2(width, height);
     }
 
-    static ImageData* takeScreenshot();
+    static std::unique_ptr<ImageData> takeScreenshot();
 };
 
 #endif /* WINDOW_WINDOW_H_ */