Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-18 06:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.

Browse Source
This commit is contained in:
ocornut 2015-03-22 14:14:23 +00:00
parent 136dbdfd95
commit ed94edfd8e
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View File

@ -352,15 +352,7 @@ void ImGui_ImplGlfwGL3_NewFrame()
g_MouseWheel = 0.0f; g_MouseWheel = 0.0f;
// Hide/show hardware mouse cursor // Hide/show hardware mouse cursor
if (io.MouseDrawCursor) glfwSetInputMode(g_Window, GLFW_CURSOR, io.MouseDrawCursor ? GLFW_CURSOR_HIDDEN : GLFW_CURSOR_NORMAL);
{
// imgui draws cursor itself
glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
}
else
{
glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
}
// Start the frame // Start the frame
ImGui::NewFrame(); ImGui::NewFrame();

11
examples/opengl_example/imgui_impl_glfw.cpp
View File

@ -41,6 +41,7 @@ static void ImGui_ImplGlfw_RenderDrawLists(ImDrawList** const cmd_lists, int cmd
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_COLOR_ARRAY);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
//glUseProgram(0); // You may want this if using this code in an OpenGL 3+ context
// Setup orthographic projection matrix // Setup orthographic projection matrix
const float width = ImGui::GetIO().DisplaySize.x; const float width = ImGui::GetIO().DisplaySize.x;
@ -256,15 +257,7 @@ void ImGui_ImplGlfw_NewFrame()
g_MouseWheel = 0.0f; g_MouseWheel = 0.0f;
// Hide/show hardware mouse cursor // Hide/show hardware mouse cursor
if (io.MouseDrawCursor) glfwSetInputMode(g_Window, GLFW_CURSOR, io.MouseDrawCursor ? GLFW_CURSOR_HIDDEN : GLFW_CURSOR_NORMAL);
{
// imgui draws cursor itself
glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
}
else
{
glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
}
// Start the frame // Start the frame
ImGui::NewFrame(); ImGui::NewFrame();