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

add history to layer create, delete, move, rename, and merge

Browse Source
This commit is contained in:
omigamedev
2019-06-18 17:39:35 +02:00
parent c48a6da8a6
commit 9ee4bc42b9
12 changed files with 259 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app_vr.cpp
View File

@@ -203,7 +203,7 @@ void App::vr_draw(const glm::mat4& proj, const glm::mat4& camera, const glm::mat
for (int plane_index = 0; plane_index < 6; plane_index++)
{
auto plane_mvp = proj * camera *
glm::scale(glm::vec3(canvas->m_canvas->m_order.size() * 20)) *
glm::scale(glm::vec3(canvas->m_canvas->m_layers.size() * 20)) *
canvas->m_canvas->m_plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1));
@@ -217,9 +217,9 @@ void App::vr_draw(const glm::mat4& proj, const glm::mat4& camera, const glm::mat
glEnable(GL_DEPTH_TEST);
glClear(GL_DEPTH_BUFFER_BIT);
for (size_t i = 0; i < canvas->m_canvas->m_order.size(); i++)
for (size_t i = 0; i < canvas->m_canvas->m_layers.size(); i++)
{
auto layer_index = canvas->m_canvas->m_order[i];
auto layer_index = i;
for (int plane_index = 0; plane_index < 6; plane_index++)
{
if (!(canvas->m_canvas->m_show_tmp && canvas->m_canvas->m_current_layer_idx == layer_index) &&
@@ -228,7 +228,7 @@ void App::vr_draw(const glm::mat4& proj, const glm::mat4& camera, const glm::mat
!canvas->m_canvas->m_layers[layer_index]->m_dirty_face[plane_index]))
continue;
int z = (int)(canvas->m_canvas->m_order.size() - i);
int z = (int)(canvas->m_canvas->m_layers.size() - i);
auto plane_mvp_z = proj * camera *
glm::scale(glm::vec3(z) * 20.f) *
//glm::eulerAngleYXZ(yaw, pitch, roll) *