get Ink pen data like pressure, buttons

This commit is contained in:
2017-04-12 00:44:26 +01:00
parent a82c76ce41
commit d230bc7a99
4 changed files with 68 additions and 15 deletions

View File

@@ -1929,12 +1929,12 @@ public:
glm::vec2 sz = { m_canvas->m_width, m_canvas->m_height };
m_canvas->m_mvp = glm::ortho(0.f, box.z, 0.f, box.w, -1.f, 1.f) *
glm::translate(glm::vec3(m_pan + m_size * 0.5f, 0)) * // pan
glm::translate(glm::vec3(m_pan + m_size * 0.5f * zoom, 0)) * // pan
glm::scale(glm::vec3(zoom * m_zoom_canvas, zoom * m_zoom_canvas, 1)) *
glm::translate(glm::vec3(-sz/2.f, 0));
auto plane_mvp = glm::ortho(0.f, box.z, 0.f, box.w, -1.f, 1.f) *
glm::translate(glm::vec3(m_pan + m_size * 0.5f, 0)) * // pan
glm::translate(glm::vec3(m_pan + m_size * 0.5f * zoom, 0)) * // pan
glm::scale(glm::vec3(sz * zoom * m_zoom_canvas, 1));
m_sampler.bind(0);
@@ -1971,11 +1971,11 @@ public:
}
virtual void handle_resize(glm::vec2 old_size, glm::vec2 new_size) override
{
// if (new_size.x > m_canvas->m_width)
// {
// m_canvas->resize((int)new_size.x, (int)new_size.y);
// m_canvas->clear();
// }
if (new_size.x > m_canvas->m_width)
{
m_canvas->resize((int)new_size.x, (int)new_size.y);
m_canvas->clear();
}
}
virtual kEventResult handle_event(Event* e) override
{