feat: drop ultralight and use fw instead

code/client/CMakeLists.txt

@@ -13,10 +13,6 @@ set(MAFIAMP_CLIENT_FILES
     src/core/ui/devs/debug_world.cpp
     src/core/ui/devs/entity_browser.cpp
     src/core/ui/devs/network_stats.cpp
-    src/core/ui/web/manager.cpp
-    src/core/ui/web/clipboard.cpp
-    src/core/ui/web/sdk.cpp
-    src/core/ui/web/view.cpp
     src/core/states/initialize.cpp
     src/core/states/main_menu.cpp
     src/core/states/session_connected.cpp
@@ -131,7 +127,7 @@ set(MAFIAMP_SDK_FILES
 
 add_library(MafiaMPClient SHARED ${MAFIAMP_CLIENT_FILES} ${MAFIAMP_SDK_FILES})
 target_include_directories(MafiaMPClient PRIVATE src)
-target_link_libraries(MafiaMPClient Framework FrameworkClient shlwapi Lua54 DirectXTK UltralightSDK JavaScriptCorePP)
+target_link_libraries(MafiaMPClient Framework FrameworkClient shlwapi Lua54 DirectXTK)
 target_link_options(MafiaMPClient PRIVATE /SAFESEH:NO /MANIFEST:NO)
 
 add_custom_command(TARGET MafiaMPClient POST_BUILD

code/client/src/core/application.cpp

@@ -35,6 +35,8 @@
 #include "modules/human.h"
 #include "modules/vehicle.h"
 
+#include "game/module.h"
+
 namespace MafiaMP::Core {
     std::unique_ptr<Application> gApplication = nullptr;
 
@@ -62,10 +64,19 @@ namespace MafiaMP::Core {
         _input            = std::make_shared<MafiaMP::Game::GameInput>();
         _console          = std::make_shared<UI::Console>(_commandProcessor);
         _chat             = std::make_shared<UI::Chat>();
-        _webManager       = std::make_shared<UI::Web::Manager>();
+        _webManager       = std::make_shared<Framework::GUI::Manager>();
 
         if (_webManager) {
-            if (!_webManager->Init()) {
+            Framework::GUI::ViewportConfiguration vhConfiguration;
+            {
+                RECT vhRect;
+                GetClientRect(Game::gGlobals.window, &vhRect);
+                vhConfiguration = {
+                    vhRect.right - vhRect.left,
+                    vhRect.bottom - vhRect.top,
+                };
+            }
+            if (!_webManager->Init(gProjectPath, vhConfiguration, GetRenderer())) {
                 Framework::Logging::GetLogger("Web")->error("Failed to initialize web manager");
                 return false;
             }

code/client/src/core/application.h

@@ -10,7 +10,6 @@
 #include "luavm.h"
 #include "ui/chat.h"
 #include "ui/console.h"
-#include "ui/web/manager.h"
 
 #include "dev_features.h"
 
@@ -19,14 +18,15 @@
 #include <integrations/client/instance.h>
 #include <utils/command_processor.h>
 #include <utils/states/machine.h>
+#include <gui/manager.h>
 
 namespace MafiaMP::Core {
     class Application: public Framework::Integrations::Client::Instance {
       private:
         std::shared_ptr<Framework::Utils::States::Machine> _stateMachine;
         std::shared_ptr<UI::Console> _console;
         std::shared_ptr<UI::Chat> _chat;
-        std::shared_ptr<UI::Web::Manager> _webManager;
+        std::shared_ptr<Framework::GUI::Manager> _webManager;
         std::shared_ptr<Game::Streaming::EntityFactory> _entityFactory;
         std::shared_ptr<Framework::Utils::CommandProcessor> _commandProcessor;
         std::shared_ptr<MafiaMP::Game::GameInput> _input;
@@ -98,7 +98,7 @@ namespace MafiaMP::Core {
             return _luaVM;
         }
 
-        std::shared_ptr<UI::Web::Manager> GetWebManager() const {
+        std::shared_ptr<Framework::GUI::Manager> GetWebManager() const {
             return _webManager;
         }