omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix color picking

Browse Source
This commit is contained in:
omigamedev
2017-08-02 23:06:46 +01:00
parent 235862c9d1
commit 95c00701f7
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
engine/canvas_modes.cpp
View File

@@ -80,20 +80,18 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
else
{
canvas->stroke_start(loc, me->m_pressure, node->m_brush);
m_dragging = true;
}
m_dragging = true;
node->mouse_capture();
break;
case kEventType::MouseUpL:
if (m_dragging)
if (m_dragging && !m_picking)
{
canvas->stroke_end();
m_dragging = false;
node->mouse_release();
canvas->stroke_end();
}
if (m_picking)
if (m_dragging && m_picking)
{
m_picking = false;
node->mouse_release();
glm::vec4 pix = canvas->pick_get(loc);
@@ -136,11 +134,13 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
App::I.color->m_quad->set_value(1.f - hsv.y, 1.f - hsv.z);
*/
}
m_dragging = false;
m_picking = false;
break;
case kEventType::MouseMove:
if (m_dragging)
if (m_dragging && !m_picking)
canvas->stroke_update(loc, me->m_pressure);
if (m_picking)
if (m_dragging && m_picking)
{
glm::vec4 pix = canvas->pick_get(loc);
auto hsv = convert_rgb2hsv(glm::vec3(pix[0], pix[1], pix[2]));
@@ -158,7 +158,6 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
if (m_picking)
{
m_picking = false;
node->mouse_release();
}
break;
default: