Own Web platform services and remove legacy web state

webgl/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(panopainter
     ../src/app_layout.cpp
     ../src/app_shaders.cpp
     ../src/app_vr.cpp
+    ../src/platform_web/web_platform_services.cpp
     ../src/brush.cpp
     ../src/canvas.cpp
     ../src/canvas_layer.cpp

webgl/src/main.cpp

@@ -5,9 +5,8 @@
 #include <thread>
 #include <chrono>
 #include <app.h>
-#include <platform_api/platform_services.h>
-#include <platform_legacy/legacy_platform_state.h>
 #include <platform_legacy/legacy_platform_services.h>
+#include <platform_web/web_platform_services.h>
 #include <fstream>
 #include <keymap.h>
 
@@ -17,8 +16,8 @@ App app;
 GLFWwindow* wnd;
 float theta = 0;
 glm::vec2 g_cursor_pos;
-std::unique_ptr<pp::platform::PlatformServices> g_platform_services;
 std::unique_ptr<pp::platform::WebPlatformServices> g_web_platform_services;
+std::unique_ptr<pp::platform::PlatformServices> g_platform_services;
 
 template<typename F>
 class TaskCallback
@@ -122,7 +121,6 @@ void CanvasOnWheel(float y)
 void StartApp()
 {
     App::I = &app;
-    pp::platform::set_injected_web_platform_services(g_web_platform_services.get());
     app.set_platform_services(g_platform_services.get());
     app.initLog();
     app.create();
@@ -203,11 +201,12 @@ int main()
     if (glfwInit() != GL_TRUE)
         printf("Failed to init GLFW");
     wnd = glfwCreateWindow(1024, 768, "PanoPainter", nullptr, nullptr);
-    g_web_platform_services = pp::platform::legacy::create_legacy_web_platform_services();
+    g_web_platform_services = pp::platform::web::create_web_platform_services();
     g_platform_services = pp::platform::legacy::create_platform_services({
         .glfw_shell = {
             .acquire_render_context = [wnd] { glfwMakeContextCurrent(wnd); },
             .present_render_context = [wnd] { glfwSwapBuffers(wnd); },
+            .request_app_close = [wnd] { glfwSetWindowShouldClose(wnd, GLFW_TRUE); },
         },
         .web_platform_services = g_web_platform_services.get(),
     });