Multiplayer

.gitignore

@@ -14,8 +14,7 @@ VENV/
 env.bak/
 venv.bak/
 local.properties
-/build/
-/build_debug/
+/build*/
 /legobin/
 *.swp
 LEGO1PROGRESS.*

3rdparty/CMakeLists.txt

@@ -55,8 +55,8 @@ if(DOWNLOAD_DEPENDENCIES)
     include(FetchContent)
     FetchContent_Populate(
         libweaver
-        URL https://github.com/isledecomp/SIEdit/archive/afd4933844b95ef739a7e77b097deb7efe4ec576.tar.gz
-        URL_MD5 59fd3c36f4f380f730cd9bedfc846397
+        URL https://github.com/isledecomp/SIEdit/archive/17c7736a6ff31413f1e74ab4e989011b545b6926.tar.gz
+        URL_MD5 04edbc974df8884f283d920ded10f1f6
     )
     add_library(libweaver STATIC
         ${libweaver_SOURCE_DIR}/lib/core.cpp
@@ -72,3 +72,65 @@ if(DOWNLOAD_DEPENDENCIES)
     set_property(TARGET libweaver PROPERTY CXX_STANDARD_REQUIRED ON)
 endif()
 
+if(ISLE_USE_LWS)
+    if(DOWNLOAD_DEPENDENCIES)
+        include(FetchContent)
+
+        # Fetch mbedTLS for TLS/WSS support in libwebsockets
+        FetchContent_Declare(
+            mbedtls
+            URL https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.5/mbedtls-3.6.5.tar.bz2
+            URL_MD5 bc79602daf85f1cf35a686b53056de58
+            # Patch cmake_minimum_required to avoid deprecation error with -Werror=dev
+            PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/patch_mbedtls_cmake.cmake
+        )
+        block()
+            set(ENABLE_TESTING OFF CACHE BOOL "" FORCE)
+            set(ENABLE_PROGRAMS OFF CACHE BOOL "" FORCE)
+            set(MBEDTLS_FATAL_WARNINGS OFF CACHE BOOL "" FORCE)
+            set(BUILD_SHARED_LIBS OFF)
+            FetchContent_MakeAvailable(mbedtls)
+
+            # Point lws at the mbedTLS targets so it skips its own find logic
+            # Must be inside block() to access mbedtls_SOURCE_DIR/mbedtls_BINARY_DIR
+            set(LWS_MBEDTLS_INCLUDE_DIRS
+                "${mbedtls_SOURCE_DIR}/include;${mbedtls_BINARY_DIR}/include"
+                CACHE STRING "" FORCE
+            )
+            set(LWS_MBEDTLS_LIBRARIES
+                "mbedtls;mbedx509;mbedcrypto"
+                CACHE STRING "" FORCE
+            )
+        endblock()
+
+        FetchContent_Declare(
+            libwebsockets
+            GIT_REPOSITORY "https://github.com/warmcat/libwebsockets.git"
+            GIT_TAG "v4.5-stable"
+            EXCLUDE_FROM_ALL
+        )
+        block()
+            set(LWS_WITH_SSL ON CACHE BOOL "" FORCE)
+            set(LWS_WITH_MBEDTLS ON CACHE BOOL "" FORCE)
+            set(LWS_WITH_EXPORT_LWSTARGETS OFF CACHE BOOL "" FORCE)
+            # mbedTLS isn't built yet at configure time, so lws's check_function_exists
+            # calls fail. Pre-set the results for APIs that exist in mbedTLS 3.x.
+            set(LWS_HAVE_mbedtls_md_setup 1 CACHE INTERNAL "" FORCE)
+            set(LWS_HAVE_mbedtls_rsa_complete 1 CACHE INTERNAL "" FORCE)
+            set(LWS_WITH_SHARED OFF CACHE BOOL "" FORCE)
+            set(LWS_WITH_STATIC ON CACHE BOOL "" FORCE)
+            set(LWS_WITHOUT_TESTAPPS ON CACHE BOOL "" FORCE)
+            set(LWS_WITH_MINIMAL_EXAMPLES OFF CACHE BOOL "" FORCE)
+            # Disable treating warnings as errors in libwebsockets (GCC/Clang)
+            set(DISABLE_WERROR ON CACHE BOOL "" FORCE)
+            FetchContent_MakeAvailable(libwebsockets)
+        endblock()
+        # Disable MSVC /WX (warnings as errors) that lws sets unconditionally
+        if(TARGET websockets AND MSVC)
+            target_compile_options(websockets PRIVATE /WX-)
+        endif()
+    else()
+        find_package(Libwebsockets REQUIRED)
+    endif()
+endif()
+

3rdparty/patch_mbedtls_cmake.cmake

@@ -0,0 +1,7 @@
+file(READ "CMakeLists.txt" content)
+string(REGEX REPLACE
+    "cmake_minimum_required\\(VERSION [0-9]+\\.[0-9]+[0-9.]*\\)"
+    "cmake_minimum_required(VERSION 3.10)"
+    content "${content}"
+)
+file(WRITE "CMakeLists.txt" "${content}")

CMakeLists.txt

@@ -56,6 +56,7 @@ option(ISLE_WERROR "Treat warnings as errors" OFF)
 cmake_dependent_option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" "${NOT_MINGW}" "WIN32;CMAKE_SIZEOF_VOID_P EQUAL 4" OFF)
 cmake_dependent_option(ISLE_MINIWIN "Use miniwin" ON "NOT ISLE_USE_DX5" OFF)
 cmake_dependent_option(ISLE_EXTENSIONS "Use extensions" ON "NOT ISLE_USE_DX5;NOT WINDOWS_STORE" OFF)
+cmake_dependent_option(ISLE_USE_LWS "Use libwebsockets for native multiplayer" ON "ISLE_EXTENSIONS;NOT EMSCRIPTEN;NOT NINTENDO_3DS;NOT NINTENDO_SWITCH;NOT VITA" OFF)
 cmake_dependent_option(ISLE_BUILD_CONFIG "Build CONFIG.EXE application" ON "MSVC OR ISLE_MINIWIN;NOT NINTENDO_3DS;NOT NINTENDO_SWITCH;NOT WINDOWS_STORE;NOT VITA" OFF)
 cmake_dependent_option(ISLE_COMPILE_SHADERS "Compile shaders" ON "SDL_SHADERCROSS_BIN;TARGET Python3::Interpreter" OFF)
 cmake_dependent_option(CMAKE_POSITION_INDEPENDENT_CODE "Build with -fPIC" ON "NOT VITA" OFF)
@@ -531,7 +532,59 @@ if (ISLE_EXTENSIONS)
     extensions/src/extensions.cpp
     extensions/src/siloader.cpp
     extensions/src/textureloader.cpp
+
+    # Common shared code
+    extensions/src/common/charactertables.cpp
+    extensions/src/common/animutils.cpp
+    extensions/src/common/characteranimator.cpp
+    extensions/src/common/charactercloner.cpp
+    extensions/src/common/charactercustomizer.cpp
+    extensions/src/common/customizestate.cpp
+    extensions/src/common/pathutils.cpp
+
+    # Third person camera extension
+    extensions/src/thirdpersoncamera.cpp
+    extensions/src/thirdpersoncamera/controller.cpp
+    extensions/src/thirdpersoncamera/orbitcamera.cpp
+    extensions/src/thirdpersoncamera/inputhandler.cpp
+    extensions/src/thirdpersoncamera/displayactor.cpp
+
+    # Multiplayer extension
+    extensions/src/multiplayer/animation/catalog.cpp
+    extensions/src/multiplayer/animation/coordinator.cpp
+    extensions/src/multiplayer/animation/loader.cpp
+    extensions/src/multiplayer/animation/locationproximity.cpp
+    extensions/src/multiplayer/animation/sceneplayer.cpp
+    extensions/src/multiplayer/animation/sessionhost.cpp
+    extensions/src/multiplayer/animation/audioplayer.cpp
+    extensions/src/multiplayer/animation/phonemeplayer.cpp
+    extensions/src/multiplayer.cpp
+    extensions/src/multiplayer/namebubblerenderer.cpp
+    extensions/src/multiplayer/networkmanager.cpp
+    extensions/src/multiplayer/protocol.cpp
+    extensions/src/multiplayer/remoteplayer.cpp
+    extensions/src/multiplayer/sireader.cpp
+    extensions/src/multiplayer/worldstatesync.cpp
   )
+  if(EMSCRIPTEN)
+    target_sources(lego1 PRIVATE
+      extensions/src/multiplayer/platforms/emscripten/websockettransport.cpp
+      extensions/src/multiplayer/platforms/emscripten/callbacks.cpp
+    )
+  elseif(ISLE_USE_LWS)
+    target_sources(lego1 PRIVATE
+      extensions/src/multiplayer/platforms/native/lwstransport.cpp
+      extensions/src/multiplayer/platforms/native/nativecallbacks.cpp
+    )
+    # Skip precompiled headers for native transport files to avoid miniwin/windows.h conflicts
+    set_source_files_properties(
+      extensions/src/multiplayer/platforms/native/lwstransport.cpp
+      extensions/src/multiplayer/platforms/native/nativecallbacks.cpp
+      PROPERTIES SKIP_PRECOMPILE_HEADERS ON
+    )
+    target_compile_definitions(lego1 PRIVATE ISLE_USE_LWS)
+    target_link_libraries(lego1 PRIVATE websockets)
+  endif()
 endif()
 
 if (ISLE_BUILD_APP)
@@ -587,6 +640,11 @@ if (ISLE_BUILD_APP)
       ISLE/emscripten/messagebox.cpp
       ISLE/emscripten/window.cpp
     )
+    if(ISLE_EXTENSIONS)
+      target_sources(isle PRIVATE
+        extensions/src/multiplayer/platforms/emscripten/wasm_exports.cpp
+      )
+    endif()
     target_compile_definitions(isle PRIVATE "ISLE_EMSCRIPTEN_HOST=\"${ISLE_EMSCRIPTEN_HOST}\"")
     set_property(TARGET isle PROPERTY SUFFIX ".html")
   endif()

ISLE/emscripten/filesystem.cpp

@@ -89,10 +89,10 @@ void Emscripten_SetupFilesystem()
 	}
 
 #ifdef EXTENSIONS
-	if (Extensions::TextureLoader::enabled) {
+	if (Extensions::TextureLoaderExt::enabled) {
 		MxString directory =
-			MxString("/LEGO") + Extensions::TextureLoader::options["texture loader:texture path"].c_str();
-		Extensions::TextureLoader::options["texture loader:texture path"] = directory.GetData();
+			MxString("/LEGO") + Extensions::TextureLoaderExt::options["texture loader:texture path"].c_str();
+		Extensions::TextureLoaderExt::options["texture loader:texture path"] = directory.GetData();
 		wasmfs_create_directory(directory.GetData(), 0644, fetchfs);
 
 		MxU32 i = 0;
@@ -102,17 +102,17 @@ void Emscripten_SetupFilesystem()
 			registerFile(path.GetData());
 
 			if (!preloadFile(path.GetData())) {
-				Extensions::TextureLoader::excludedFiles.emplace_back(file);
+				Extensions::TextureLoaderExt::AddExcludedFile(file);
 			}
 
 			Emscripten_SendExtensionProgress("HD Textures", (++i * 100) / sizeOfArray(g_textures));
 		}
 	}
 
-	if (Extensions::SiLoader::enabled) {
+	if (Extensions::SiLoaderExt::enabled) {
 		wasmfs_create_directory("/LEGO/extra", 0644, fetchfs);
 
-		for (const auto& file : Extensions::SiLoader::files) {
+		for (const auto& file : Extensions::SiLoaderExt::GetFiles()) {
 			registerFile(file.c_str());
 		}
 	}

ISLE/isleapp.cpp

@@ -37,7 +37,8 @@
 #include "viewmanager/viewmanager.h"
 
 #include <array>
-#include <extensions/extensions.h>
+#include <extensions/multiplayer.h>
+#include <extensions/thirdpersoncamera.h>
 #include <miniwin/miniwindevice.h>
 #include <type_traits>
 #include <vec.h>
@@ -875,6 +876,10 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event)
 		}
 	}
 
+#ifdef EXTENSIONS
+	Extensions::ThirdPersonCameraExt::HandleSDLEvent(event);
+#endif
+
 	return SDL_APP_CONTINUE;
 }
 
@@ -1293,6 +1298,14 @@ inline bool IsleApp::Tick()
 	if (!Lego()) {
 		return true;
 	}
+
+#ifdef EXTENSIONS
+	if (Extensions::IsMultiplayerRejected()) {
+		g_closed = TRUE;
+		return true;
+	}
+#endif
+
 	if (!TickleManager()) {
 		return true;
 	}

LEGO1/lego/legoomni/include/isle.h

@@ -2,6 +2,7 @@
 #define ISLE_H
 
 #include "actionsfwd.h"
+#include "extensions/fwd.h"
 #include "legogamestate.h"
 #include "legonamedplane.h"
 #include "legostate.h"
@@ -164,6 +165,7 @@ class Isle : public LegoWorld {
 	void SwitchToInfocenter();
 
 	friend class Act1State;
+	friend class Multiplayer::WorldStateSync;
 
 	// SYNTHETIC: LEGO1 0x10030a30
 	// Isle::`scalar deleting destructor'

LEGO1/lego/legoomni/include/islepathactor.h

@@ -1,6 +1,7 @@
 #ifndef ISLEPATHACTOR_H
 #define ISLEPATHACTOR_H
 
+#include "extensions/fwd.h"
 #include "legogamestate.h"
 #include "legopathactor.h"
 #include "mxtypes.h"
@@ -139,6 +140,8 @@ class IslePathActor : public LegoPathActor {
 	// IslePathActor::`scalar deleting destructor'
 
 protected:
+	friend class Extensions::ThirdPersonCamera::Controller;
+
 	LegoWorld* m_world;             // 0x154
 	LegoPathActor* m_previousActor; // 0x158
 	MxFloat m_previousVel;          // 0x15c

LEGO1/lego/legoomni/include/legoanimationmanager.h

@@ -2,6 +2,7 @@
 #define LEGOANIMATIONMANAGER_H
 
 #include "decomp.h"
+#include "extensions/fwd.h"
 #include "lego1_export.h"
 #include "legolocations.h"
 #include "legomain.h"
@@ -203,6 +204,9 @@ class LegoAnimationManager : public MxCore {
 	// LegoAnimationManager::`scalar deleting destructor'
 
 private:
+	friend class Multiplayer::NetworkManager;
+	friend class Multiplayer::Animation::Catalog;
+
 	void Init();
 	MxResult FUN_100605e0(
 		MxU32 p_index,

LEGO1/lego/legoomni/include/legobuildingmanager.h

@@ -2,6 +2,7 @@
 #define LEGOBUILDINGMANAGER_H
 
 #include "decomp.h"
+#include "extensions/fwd.h"
 #include "lego1_export.h"
 #include "misc/legotypes.h"
 #include "mxcore.h"
@@ -98,6 +99,8 @@ class LegoBuildingManager : public MxCore {
 	// LegoBuildingManager::`scalar deleting destructor'
 
 private:
+	friend class Multiplayer::WorldStateSync;
+
 	static char* g_customizeAnimFile;
 	static MxS32 g_maxMove[16];
 	static MxU32 g_maxSound;

LEGO1/lego/legoomni/include/legocachsound.h

@@ -2,6 +2,7 @@
 #define LEGOCACHSOUND_H
 
 #include "decomp.h"
+#include "extensions/fwd.h"
 #include "lego3dsound.h"
 #include "mxcore.h"
 #include "mxstring.h"
@@ -58,6 +59,9 @@ class LegoCacheSound : public MxCore {
 	// LegoCacheSound::`scalar deleting destructor'
 
 private:
+	friend class Multiplayer::Animation::AudioPlayer;
+	friend class Multiplayer::NetworkManager;
+
 	void Init();
 	void CopyData(MxU8* p_data, MxU32 p_dataSize);
 	MxString GetBaseFilename(MxString& p_path);

LEGO1/lego/legoomni/include/legocharactermanager.h

@@ -2,6 +2,7 @@
 #define LEGOCHARACTERMANAGER_H
 
 #include "decomp.h"
+#include "extensions/fwd.h"
 #include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 #include "mxvariable.h"
@@ -98,6 +99,8 @@ class LegoCharacterManager {
 	static const char* GetCustomizeAnimFile() { return g_customizeAnimFile; }
 
 private:
+	friend class Extensions::Common::CharacterCloner;
+
 	LegoROI* CreateActorROI(const char* p_key);
 	void RemoveROI(LegoROI* p_roi);
 	LegoROI* FindChildROI(LegoROI* p_roi, const char* p_name);

LEGO1/lego/legoomni/include/legoinputmanager.h

@@ -2,6 +2,7 @@
 #define LEGOINPUTMANAGER_H
 
 #include "decomp.h"
+#include "extensions/fwd.h"
 #include "lego1_export.h"
 #include "legoeventnotificationparam.h"
 #include "mxlist.h"
@@ -178,6 +179,9 @@ class LegoInputManager : public MxPresenter {
 	// SYNTHETIC: LEGO1 0x1005b8d0
 	// LegoInputManager::`scalar deleting destructor'
 
+	friend class Extensions::MultiplayerExt;
+	friend class Extensions::ThirdPersonCameraExt;
+
 private:
 	void InitializeHaptics();
 
@@ -204,6 +208,7 @@ class LegoInputManager : public MxPresenter {
 	TouchScheme m_touchScheme = e_none;
 	SDL_Point m_touchVirtualThumb = {0, 0};
 	SDL_FPoint m_touchVirtualThumbOrigin;
+	SDL_FingerID m_touchFinger = 0;
 	std::map<SDL_FingerID, MxU32> m_touchFlags;
 	std::map<SDL_KeyboardID, std::pair<void*, void*>> m_keyboards;
 	std::map<SDL_MouseID, std::pair<void*, SDL_Haptic*>> m_mice;

LEGO1/lego/legoomni/include/legomodelpresenter.h

@@ -1,6 +1,7 @@
 #ifndef LEGOMODELPRESENTER_H
 #define LEGOMODELPRESENTER_H
 
+#include "extensions/fwd.h"
 #include "lego1_export.h"
 #include "mxvideopresenter.h"
 
@@ -62,6 +63,8 @@ class LegoModelPresenter : public MxVideoPresenter {
 	void Destroy(MxBool p_fromDestructor);
 
 private:
+	friend class Multiplayer::Animation::Catalog;
+
 	LegoROI* m_roi;       // 0x64
 	MxBool m_addedToView; // 0x68