eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-09-20 22:07:56 +02:00
parent 7c6501bb07 d9020b5881
commit f5d7b1bfa9
39 changed files with 2994 additions and 2168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
uilayer.cpp
View File

@@ -130,7 +130,7 @@ bool ui_layer::init(GLFWwindow *Window)
m_map = std::make_unique<map>();
ImGui_ImplGlfw_InitForOpenGL(m_window);
ImGui_ImplOpenGL3_Init("#version 140");
ImGui_ImplOpenGL3_Init("#version 130");
ImGui::StyleColorsClassic();
ImGui_ImplOpenGL3_NewFrame();
@@ -143,6 +143,7 @@ bool ui_layer::init(GLFWwindow *Window)
void ui_layer::shutdown()
{
ImGui::EndFrame();
ImGui_ImplOpenGL3_Shutdown();
ImGui_ImplGlfw_Shutdown();
ImGui::DestroyContext();