eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 19:09:20 +02:00
Code Issues 122 Wiki Activity

Merge branch 'gfx-work' into nodecloner

Browse Source
This commit is contained in:
milek7
2019-03-01 00:10:31 +01:00
parent 41548af003 1bb700c1ec
commit e09b6fd747
22 changed files with 234 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uilayer.cpp
View File

@@ -216,8 +216,6 @@ void ui_layer::update()
void ui_layer::render()
{
Timer::subsystem.gfx_gui.start();
render_background();
render_progress();
@@ -232,8 +230,6 @@ void ui_layer::render()
gl::buffer::unbind(gl::buffer::ARRAY_BUFFER);
ImGui::Render();
Timer::subsystem.gfx_gui.stop();
#ifdef EU07_USEIMGUIIMPLOPENGL2
ImGui_ImplOpenGL2_RenderDrawData(ImGui::GetDrawData());
ImGui_ImplOpenGL2_NewFrame();