|
|
|
@ -75,6 +75,7 @@ namespace lunarium
|
|
|
|
mbShowDemo = true;
|
|
|
|
mbShowDemo = true;
|
|
|
|
|
|
|
|
|
|
|
|
Logger::Log(LogCategory::GRAPHICS, LogLevel::INFO, "ImGui setup");
|
|
|
|
Logger::Log(LogCategory::GRAPHICS, LogLevel::INFO, "ImGui setup");
|
|
|
|
|
|
|
|
mbIsInit = true;
|
|
|
|
return OpRes::OK();
|
|
|
|
return OpRes::OK();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -102,16 +103,17 @@ namespace lunarium
|
|
|
|
if (!mbIsInit)
|
|
|
|
if (!mbIsInit)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ImGui::ShowDemoWindow(&mbShowDemo);
|
|
|
|
ImGui::ShowDemoWindow(&mbShowDemo);
|
|
|
|
ImGui::Render();
|
|
|
|
ImGui::Render();
|
|
|
|
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
|
|
|
|
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
|
|
|
|
|
|
|
|
|
|
|
|
if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
|
|
|
|
if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
GLFWwindow* backup_current_context = glfwGetCurrentContext();
|
|
|
|
//GLFWwindow* backup_current_context = glfwGetCurrentContext();
|
|
|
|
ImGui::UpdatePlatformWindows();
|
|
|
|
ImGui::UpdatePlatformWindows();
|
|
|
|
ImGui::RenderPlatformWindowsDefault();
|
|
|
|
ImGui::RenderPlatformWindowsDefault();
|
|
|
|
glfwMakeContextCurrent(backup_current_context);
|
|
|
|
//glfwMakeContextCurrent(backup_current_context);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|