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

fix layer select after merge, add brush rotation

Browse Source
This commit is contained in:
omigamedev
2017-08-20 13:30:28 +01:00
parent 81a5fb10e3
commit eee574085b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/layout.xml
View File

@@ -120,7 +120,7 @@
</node> </node>
<border dir="col" align="center" grow="1" width="1"> <border dir="col" align="center" grow="1" width="1">
<node height="20" pad="1" width="100%"><slider-h id="tip-size" value=".25"/></node> <node height="20" pad="1" width="100%"><slider-h id="tip-size" value=".25"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-flow" value=".15"/></node> <node height="20" pad="1" width="100%"><slider-h id="tip-flow" value=".5"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-opacity" value="1"/></node> <node height="20" pad="1" width="100%"><slider-h id="tip-opacity" value="1"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-spacing" value=".25"/></node> <node height="20" pad="1" width="100%"><slider-h id="tip-spacing" value=".25"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-angle"/></node> <node height="20" pad="1" width="100%"><slider-h id="tip-angle"/></node>

2
engine/app_layout.cpp
View File

@@ -419,8 +419,10 @@ void App::init_menu_layer()
layers->clear(); layers->clear();
for (auto& i : canvas->m_canvas->m_order) for (auto& i : canvas->m_canvas->m_order)
layers->add_layer(canvas->m_canvas->m_layers[i].m_name.c_str()); layers->add_layer(canvas->m_canvas->m_layers[i].m_name.c_str());
layers->m_current_layer->m_selected = false;
layers->m_current_layer = layers->m_layers[current_idx_order - 1]; layers->m_current_layer = layers->m_layers[current_idx_order - 1];
layers->m_current_layer->m_selected = true; layers->m_current_layer->m_selected = true;
layers->m_current_layer->on_selected(layers->m_current_layer);
} }
popup->mouse_release(); popup->mouse_release();
popup->destroy(); popup->destroy();

2
engine/canvas.cpp
View File

@@ -258,7 +258,7 @@ void ui::Canvas::stroke_draw()
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)
{ {
glm::vec3 ray_origin, ray_dir; glm::vec3 ray_origin, ray_dir;
point_unproject(s.pos + off[j], { 0, 0, m_box.zw }, m_mv, m_proj, ray_origin, ray_dir); point_unproject(s.pos + off[j] * glm::orientate2(-s.angle), { 0, 0, m_box.zw }, m_mv, m_proj, ray_origin, ray_dir);
glm::vec3 hit; glm::vec3 hit;
if (ray_intersect(ray_origin, ray_dir, m_plane_origin[i], m_plane_normal[i], m_plane_tangent[i], hit)) if (ray_intersect(ray_origin, ray_dir, m_plane_origin[i], m_plane_normal[i], m_plane_tangent[i], hit))
{ {