vermiculate

CMakeLists.txt

@@ -52,6 +52,7 @@ target_sources(cloudlife PUBLIC
     cloudlife.cpp
     mtron.cpp
     timer.cpp
-    ifs.cpp)
+    ifs.cpp
+    vermiculate.cpp)
 target_link_libraries(cloudlife IMGUI glfw GL colormap)
 set_target_properties(cloudlife PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

art.hpp

@@ -4,6 +4,13 @@
 #include <string>
 #include <vector>
 
+
+template <typename T>
+static inline void
+fill0(T &container) {
+    std::fill(container.begin(), container.end(), 0);
+}
+
 class Art {
 public:
     Art(std::string _name)
@@ -31,20 +38,30 @@ class Art {
 
     virtual void reinit() { resize(w, h); }
 
+    virtual ~Art() = default;
+
 protected:
     void default_resize(int _w, int _h) {
         w = _w;
         h = _h;
         //data = (uint8_t *)xrealloc(data, w*h*sizeof(uint32_t));
         pixels.resize(w*h);
         clear();
+        /* TODO: fill square in drawdot() if pscale > 1
+        pscale = 1;
+        if (xgwa.width > 2560 || xgwa.height > 2560)
+            pscale = 3; // Retina displays
+        */
+
     }
     void clear() {
-        std::fill(pixels.begin(), pixels.end(), 0);
+        fill0(pixels);
+        //std::fill(pixels.begin(), pixels.end(), 0);
     }
     int w, h;
     //uint8_t *data() { return reinterpret_cast<uint8_t*>(pixels.data()); }
     uint32_t *data() { return pixels.data(); }
     std::vector<uint32_t> pixels;
     std::string m_name;
 };
+

main.cpp

@@ -23,6 +23,7 @@
 #include "cloudlife.hpp"
 #include "mtron.hpp"
 #include "ifs.h"
+#include "vermiculate.h"
 
 std::unique_ptr<Art> art;
 
@@ -162,7 +163,8 @@ int main(int argc, char *argv[])
 
     //art.reset(new Cloudlife);
     //art.reset(new Minskytron);
-    art.reset(new IFS);
+    //art.reset(new IFS);
+    art.reset(new Vermiculate);
 
 
     IMGUI_CHECKVERSION();

settings.cpp

@@ -36,3 +36,16 @@ bool PaletteSetting::RenderGui() {
     }
     return ret;
 }
+
+void PaletteSetting::rescale(uint32_t ncolours) {
+    value = value.rescale(0., ncolours);
+}
+
+uint32_t PaletteSetting::get_color(uint32_t color_n) {
+      auto c = value(color_n);
+      return 0xff000000 |
+              c.getRed().getValue() << 0 |
+              c.getGreen().getValue() << 8 |
+              c.getBlue().getValue() << 16;
+
+}

settings.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include <string>
 
+#include <stdint.h>
+
 class Setting {
 public:
     virtual bool RenderGui() = 0;
@@ -26,8 +28,11 @@ class PaletteSetting : public Setting {
     pal_t & operator*() {return value;}
 
     pal_t value = colormap::palettes.at("inferno");
+
+    void rescale(uint32_t ncolours);
+    uint32_t get_color(uint32_t color_n);
+
 private:
     int item_current_idx = 0;
-
 };