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

fix layer draw order, change layout menu to toolbar and more space on top status bar

Browse Source
This commit is contained in:
omigamedev
2017-08-12 00:30:14 +01:00
parent 1550dfff03
commit 3df8cb4fa5
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/node_canvas.cpp
View File

@@ -101,14 +101,15 @@ void NodeCanvas::draw()
glEnable(GL_DEPTH_TEST);
glClear(GL_DEPTH_BUFFER_BIT);
for (auto layer_index : m_canvas->m_order)
for (size_t i = 0; i < m_canvas->m_order.size(); i++)
{
auto layer_index = m_canvas->m_order[i];
for (int plane_index = 0; plane_index < 6; plane_index++)
{
if (m_canvas->m_layers[layer_index].m_opacity == .0f)
continue;
int z = (int)m_canvas->m_order.size() - layer_index;
int z = (int)m_canvas->m_order.size() - i;
auto plane_mvp_z = proj * camera *
glm::scale(glm::vec3(z + 1)) *
m_canvas->m_plane_transform[plane_index] *