mirrors/imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL example: further cleanup to match other examples (#233 #226)

Browse Source
This commit is contained in:
ocornut 2015-07-08 10:20:08 -06:00
parent 4167528001
commit 22e099366f
3 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/sdl_opengl_example/imgui_impl_sdl.cpp
View File

@ -1,15 +1,6 @@
#ifdef _MSC_VER
#include <Windows.h>
#include <gl/GL.h>
#include <gl/GLU.h>
#endif
#ifdef MACOSX
#include <OpenGL/gl.h>
#endif
#include <SDL.h>
#include <SDL_syswm.h>
#include <SDL_OpenGL.h>
#include <imgui.h>
#include "imgui_impl_sdl.h"

1
examples/sdl_opengl_example/imgui_impl_sdl.h
View File

@ -8,4 +8,3 @@ bool ImGui_ImplSdl_EventCallback(const SDL_Event& event);
void ImGui_ImplSdl_InvalidateDeviceObjects();
bool ImGui_ImplSdl_CreateDeviceObjects();

23
examples/sdl_opengl_example/main.cpp
View File

@ -1,41 +1,26 @@
// ImGui - standalone example application for SDL2
// ImGui - standalone example application for SDL2 + OpenGL
#include <imgui.h>
#include "imgui_impl_sdl.h"
#include <stdio.h>
#ifdef WIN32
#include <Windows.h>
#include <gl/GL.h>
#include <gl/GLU.h>
#endif
#ifdef MACOSX
#include <OpenGL/gl.h>
#endif
#include <SDL.h>
#include <SDL_OpenGL.h>
int SDL_main(int /*argc*/, char* /*argv*/[])
int SDL_main(int, char**)
{
// Setup SDL
if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
return -1;
// Init OpenGL
// Setup window
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
// SDL window
SDL_DisplayMode current;
SDL_GetCurrentDisplayMode(0, &current);
SDL_Window *window = SDL_CreateWindow("ImGui SDL2+OpenGL example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, SDL_WINDOW_OPENGL|SDL_WINDOW_RESIZABLE);
// Create an OpenGL context associated with the window.
SDL_GLContext glcontext = SDL_GL_CreateContext(window);
// Setup ImGui binding
@ -103,10 +88,8 @@ int SDL_main(int /*argc*/, char* /*argv*/[])
// Cleanup
ImGui_ImplSdl_Shutdown();
SDL_GL_DeleteContext(glcontext);
SDL_DestroyWindow(window);
SDL_Quit();
return 0;