move render thread to App class and add ui thread with ui tasks queue

2019-07-09 01:07:13 +02:00
parent f7ead8e157
commit cb6744be44
6 changed files with 239 additions and 194 deletions
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -2845,8 +2845,6 @@ void Canvas::draw_objects_direct(std::function<void(const glm::mat4& camera, con
        glViewport(vp[0], vp[1], vp[2], vp[3]);
        glClearColor(cc[0], cc[1], cc[2], cc[3]);
        glActiveTexture(GL_TEXTURE0);
-
-        draw_merge();
    });
 }

@@ -2940,8 +2938,6 @@ void Canvas::draw_objects(std::function<void(const glm::mat4& camera, const glm:
        glViewport(vp[0], vp[1], vp[2], vp[3]);
        glClearColor(cc[0], cc[1], cc[2], cc[3]);
        glActiveTexture(GL_TEXTURE0);
-
-        draw_merge();
    });
 }