anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Examples: Emscripten+GLFW: revert to use a shell_minimal.html closer to vanilla one, as our fullscreen + misc tweaks to Emscripten+SDL example to match other version.

Browse Source
features/potocpav-newer-lines-2
ocornut ago%!(EXTRA string=2 years)
parent 0370856d78
commit b51919dce1
5 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 7
      examples/example_emscripten_glfw_opengl3/Makefile
  3. 5
      examples/example_emscripten_glfw_opengl3/shell_minimal.html
  4. 3
      examples/example_emscripten_opengl3/Makefile
  5. 14
      examples/example_emscripten_opengl3/main.cpp

1
.gitignore vendored
Unescape View File

@ -40,6 +40,7 @@ xcuserdata
examples/*.o.tmp examples/*.o.tmp
examples/*.out.js examples/*.out.js
examples/*.out.wasm examples/*.out.wasm
examples/example_emscripten_glfw_opengl3/web/*
examples/example_emscripten_opengl3/web/* examples/example_emscripten_opengl3/web/*
examples/example_emscripten_wgpu/web/* examples/example_emscripten_wgpu/web/*

7
examples/example_emscripten_glfw_opengl3/Makefile
Unescape View File

@ -32,9 +32,9 @@ EMS =
##--------------------------------------------------------------------- ##---------------------------------------------------------------------
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only) # ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
EMS += -s USE_GLFW=3
EMS += -s DISABLE_EXCEPTION_CATCHING=1 EMS += -s DISABLE_EXCEPTION_CATCHING=1
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1 LDFLAGS += -s USE_GLFW=3 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
# Uncomment next line to fix possible rendering bugs with Emscripten version older then 1.39.0 (https://github.com/ocornut/imgui/issues/2877) # Uncomment next line to fix possible rendering bugs with Emscripten version older then 1.39.0 (https://github.com/ocornut/imgui/issues/2877)
#EMS += -s BINARYEN_TRAP_MODE=clamp #EMS += -s BINARYEN_TRAP_MODE=clamp
@ -60,7 +60,8 @@ endif
CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
#CPPFLAGS += -g #CPPFLAGS += -g
CPPFLAGS += -Wall -Wformat -Os $(EMS) CPPFLAGS += -Wall -Wformat -Os $(EMS)
LDFLAGS += --shell-file shell_minimal.html $(EMS) LDFLAGS += --shell-file shell_minimal.html
LDFLAGS += $(EMS)
##--------------------------------------------------------------------- ##---------------------------------------------------------------------
## BUILD RULES ## BUILD RULES

5
examples/example_emscripten_glfw_opengl3/shell_minimal.html
Unescape View File

@ -6,7 +6,7 @@
<title>Dear ImGui GLFW+Emscripten example</title> <title>Dear ImGui GLFW+Emscripten example</title>
<style> <style>
body { margin: 0; background-color: black } body { margin: 0; background-color: black }
.emscripten { /*.emscripten {
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
@ -24,7 +24,8 @@
image-rendering: crisp-edges; image-rendering: crisp-edges;
image-rendering: pixelated; image-rendering: pixelated;
-ms-interpolation-mode: nearest-neighbor; -ms-interpolation-mode: nearest-neighbor;
} }*/
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
</style> </style>
</head> </head>
<body> <body>

3
examples/example_emscripten_opengl3/Makefile
Unescape View File

@ -60,7 +60,8 @@ endif
CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
#CPPFLAGS += -g #CPPFLAGS += -g
CPPFLAGS += -Wall -Wformat -Os $(EMS) CPPFLAGS += -Wall -Wformat -Os $(EMS)
LDFLAGS += --shell-file shell_minimal.html $(EMS) LDFLAGS += --shell-file shell_minimal.html
LDFLAGS += $(EMS)
##--------------------------------------------------------------------- ##---------------------------------------------------------------------
## BUILD RULES ## BUILD RULES

14
examples/example_emscripten_opengl3/main.cpp
Unescape View File

@ -18,7 +18,6 @@
// Emscripten requires to have full control over the main loop. We're going to store our SDL book-keeping variables globally. // Emscripten requires to have full control over the main loop. We're going to store our SDL book-keeping variables globally.
// Having a single function that acts as a loop prevents us to store state in the stack of said function. So we need some location for this. // Having a single function that acts as a loop prevents us to store state in the stack of said function. So we need some location for this.
SDL_Window* g_Window = NULL; SDL_Window* g_Window = NULL;
SDL_GLContext g_GLContext = NULL;
// For clarity, our main loop code is declared at the end. // For clarity, our main loop code is declared at the end.
static void main_loop(void*); static void main_loop(void*);
@ -49,13 +48,14 @@ int main(int, char**)
SDL_DisplayMode current; SDL_DisplayMode current;
SDL_GetCurrentDisplayMode(0, &current); SDL_GetCurrentDisplayMode(0, &current);
SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
g_Window = SDL_CreateWindow("Dear ImGui SDL+Emscripten example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags); SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL+Emscripten example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
g_GLContext = SDL_GL_CreateContext(g_Window); SDL_GLContext gl_context = SDL_GL_CreateContext(window);
if (!g_GLContext) if (!gl_context)
{ {
fprintf(stderr, "Failed to initialize WebGL context!\n"); fprintf(stderr, "Failed to initialize GL context!\n");
return 1; return 1;
} }
SDL_GL_MakeCurrent(window, gl_context);
SDL_GL_SetSwapInterval(1); // Enable vsync SDL_GL_SetSwapInterval(1); // Enable vsync
// Setup Dear ImGui context // Setup Dear ImGui context
@ -74,7 +74,7 @@ int main(int, char**)
//ImGui::StyleColorsLight(); //ImGui::StyleColorsLight();
// Setup Platform/Renderer backends // Setup Platform/Renderer backends
ImGui_ImplSDL2_InitForOpenGL(g_Window, g_GLContext); ImGui_ImplSDL2_InitForOpenGL(window, gl_context);
ImGui_ImplOpenGL3_Init(glsl_version); ImGui_ImplOpenGL3_Init(glsl_version);
// Load Fonts // Load Fonts
@ -98,6 +98,7 @@ int main(int, char**)
#endif #endif
// This function call won't return, and will engage in an infinite loop, processing events from the browser, and dispatching them. // This function call won't return, and will engage in an infinite loop, processing events from the browser, and dispatching them.
g_Window = window;
emscripten_set_main_loop_arg(main_loop, NULL, 0, true); emscripten_set_main_loop_arg(main_loop, NULL, 0, true);
} }
@ -167,7 +168,6 @@ static void main_loop(void* arg)
// Rendering // Rendering
ImGui::Render(); ImGui::Render();
SDL_GL_MakeCurrent(g_Window, g_GLContext);
glViewport(0, 0, (int)io.DisplaySize.x, (int)io.DisplaySize.y); glViewport(0, 0, (int)io.DisplaySize.x, (int)io.DisplaySize.y);
glClearColor(clear_color.x * clear_color.w, clear_color.y * clear_color.w, clear_color.z * clear_color.w, clear_color.w); glClearColor(clear_color.x * clear_color.w, clear_color.y * clear_color.w, clear_color.z * clear_color.w, clear_color.w);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);

Write Preview
Loading…
Cancel
Save