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

update color at picking and cleanup code from some warnings

Browse Source
This commit is contained in:
omigamedev
2019-03-11 15:35:59 +01:00
parent 373e7ad0e9
commit fda399f7dd
16 changed files with 56 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/canvas_modes.cpp
View File

@@ -84,12 +84,16 @@ void CanvasModeBasicCamera::on_GestureEvent(GestureEvent* ge)
m_camera_fov = Canvas::I->m_cam_fov;
break;
case kEventType::GestureMove:
{
Canvas::I->m_pan = m_pan_start + ge->m_pos_delta * glm::vec2(-1, -1) * 0.3f * (Canvas::I->m_cam_fov / 85.f);
Canvas::I->m_cam_fov = m_camera_fov - ge->m_distance_delta * .05f;
auto angle = Canvas::I->m_pan * 0.003f;
Canvas::I->m_cam_rot = glm::eulerAngleXY(angle.y, angle.x);
App::I.brush_update();
break;
}
default:
break;
}
}
@@ -127,7 +131,7 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
Canvas::I->pick_start();
glm::vec4 pix = Canvas::I->pick_get(loc);
Canvas::I->m_current_brush->m_tip_color = pix;
App::I.color->set_color(pix);
App::I.brush_update();
}
else
{
@@ -147,7 +151,7 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
node->mouse_release();
glm::vec4 pix = Canvas::I->pick_get(loc);
Canvas::I->m_current_brush->m_tip_color = pix;
App::I.color->set_color(pix);
App::I.brush_update();
Canvas::I->pick_end();
}
m_dragging = false;
@@ -179,7 +183,7 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
{
glm::vec4 pix = Canvas::I->pick_get(loc);
Canvas::I->m_current_brush->m_tip_color = pix;
App::I.color->set_color(pix);
App::I.brush_update();
}
if (m_dragging && m_resizing)
{
@@ -1017,7 +1021,7 @@ void CanvasModeTransform::enter(kCanvasMode prev)
vertex_t(corners[3], { 0, 1 }),
});
auto shape3d = triangulate(m_points_face[0]);
m_shape[0].update_vertices(shape3d.data(), shape3d.size());
m_shape[0].update_vertices(shape3d.data(), (int)shape3d.size());
m_commit_on_leave = true;
@@ -1123,7 +1127,7 @@ void CanvasModeTransform::enter(kCanvasMode prev)
}
auto shape3d = triangulate(m_points_face[plane]);
m_shape[plane].update_vertices(shape3d.data(), shape3d.size());
m_shape[plane].update_vertices(shape3d.data(), (int)shape3d.size());
Canvas::I->m_layers[Canvas::I->m_current_layer_idx]->m_rtt[plane].bindFramebuffer();
m_tex[plane].create(bb_sz.x, bb_sz.y);