color wheel and picker

2017-12-05 22:25:38 +00:00
parent 8a21f3f78a
commit 9978709645
12 changed files with 226 additions and 42 deletions
--- a/engine/app.cpp
+++ b/engine/app.cpp
@@ -259,8 +259,8 @@ void App::update(float dt)
    stroke->update_controls();
    auto pix = ui::Canvas::I->m_current_brush.m_tip_color;
    auto hsv = convert_rgb2hsv(glm::vec3(pix[0], pix[1], pix[2]));
-    color->m_hue->set_value(hsv.x);
-    color->m_quad->set_value(hsv.y, 1.f - hsv.z);
+    color->m_hue->m_value.y = hsv.x;
+    color->m_quad->m_value = glm::vec2(hsv.y, 1.f - hsv.z);

    auto observer = [this](Node* n)
    {