Change dynCall to makeDynCall

.gitignore

@@ -78,4 +78,7 @@ node_modules
 metaList
 package-lock.json
 package-lock.json.meta
-Assets/Plugins
+Assets/Plugins
+Assets/PlayroomKit/node_modules.meta
+/.idea
+Assets/chromedriver*

Assets/PlayroomKit/Examples/2d-platformer/2d-platformer.unity

@@ -247,6 +247,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1488774288987972495, guid: 1b30fa3a265114a45a7e23165a20aecc, type: 3}
+      propertyPath: webDriverDirectory
+      value: Assets/
+      objectReference: {fileID: 0}
+    - target: {fileID: 1488774288987972495, guid: 1b30fa3a265114a45a7e23165a20aecc, type: 3}
+      propertyPath: includeJavaScriptFiles.Array.data[0]
+      value: Playroomkit/modules/PlayroomMockBridge.js
+      objectReference: {fileID: 0}
     - target: {fileID: 1957495583081457048, guid: 1b30fa3a265114a45a7e23165a20aecc, type: 3}
       propertyPath: m_Name
       value: PlayroomMockManager

Assets/PlayroomKit/Examples/2d-platformer/scripts/GameManager2d.cs

@@ -47,7 +47,6 @@ private void Initialize()
         PlayroomKit.InsertCoin(new PlayroomKit.InitOptions()
         {
             maxPlayersPerRoom = 2,
-
             defaultPlayerStates = new() {
                         {"score", 0},
                     },

Assets/PlayroomKit/Examples/discord-activity/discord-activity.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1429187865}
-  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.5748165, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -287,6 +287,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1488774288987972495, guid: 1b30fa3a265114a45a7e23165a20aecc, type: 3}
+      propertyPath: webDriverDirectory
+      value: Assets/
+      objectReference: {fileID: 0}
+    - target: {fileID: 1488774288987972495, guid: 1b30fa3a265114a45a7e23165a20aecc, type: 3}
+      propertyPath: includeJavaScriptFiles.Array.data[0]
+      value: Playroomkit/modules/PlayroomMockBridge.js
+      objectReference: {fileID: 0}
     - target: {fileID: 1957495583081457048, guid: 1b30fa3a265114a45a7e23165a20aecc, type: 3}
       propertyPath: m_Name
       value: PlayroomMockManager

Assets/PlayroomKit/modules/MockModeBrowser.cs

@@ -58,6 +58,25 @@ private static void MockOnPlayerJoinBrowser(Action<Player> onPlayerJoinCallback)
             UnityBrowserBridge.Instance.ExecuteJS($"OnPlayerJoin('{gameObjectName}')");
 #endif
         }
+
+        private static void MockOnPlayerQuitBrowser(Action<Player> onPlayerJoinCallback)
+        {
+            if (!OnPlayerJoinCallbacks.Contains(onPlayerJoinCallback)) OnPlayerJoinCallbacks.Add(onPlayerJoinCallback);
+
+            var gameObjectName = GetGameObject("devManager").name;
+
+#if UNITY_EDITOR
+            UnityBrowserBridge.Instance.ExecuteJS($"OnPlayerQuit('{gameObjectName}')");
+#endif
+        }
+
+        private static void MockOnPlayerQuitLocal(Action<string> onPlayerQuitCallback)
+        {
+            Debug.Log("On Player Quit");
+            var testPlayer = GetPlayer(PlayerId);
+            testPlayer.OnQuitCallbacks.Add(onPlayerQuitCallback);
+            __OnQuitInternalHandler(PlayerId);
+        }
 
         /// <summary>
         /// This function is used by GetPlayerID in PlayroomKitDevManager, GetPlayer is only invoked

Assets/PlayroomKit/src/index.js

@@ -16,14 +16,15 @@ mergeInto(LibraryManager.library, {
     onLaunchCallBackKey = UTF8ToString(onLaunchCallBackKey);
     onQuitInternalCallbackKey = UTF8ToString(onQuitInternalCallbackKey);
 
+
     function OnLaunchCallBack() {
       var key = _ConvertString(onLaunchCallBackKey);
-      dynCall("vi", onLaunchCallBack, [key]);
+      {{{ makeDynCall('vi', 'onLaunchCallBack') }}}(key)
     }
 
     function OnDisconnectCallback() {
       var key = _ConvertString(onQuitInternalCallbackKey);
-      dynCall("vi", onDisconnectCallback, [key]);
+      {{{ makeDynCall('vi', 'onDisconnectCallback') }}}(key)
     }
     this.onPlayerJoinCallBacks = {};
     var options = optionsJson ? JSON.parse(UTF8ToString(optionsJson)) : {};
@@ -44,7 +45,7 @@ mergeInto(LibraryManager.library, {
           stringToUTF8(id, buffer, bufferSize);
 
           player.onQuit(() => {
-            dynCall("vi", onQuitInternalCallback, [buffer]);
+            {{{ makeDynCall('vi', 'onQuitInternalCallback') }}}(buffer)
           });
         });
       })
@@ -53,7 +54,7 @@ mergeInto(LibraryManager.library, {
         var bufferSize = lengthBytesUTF8(jsonString) + 1;
         var buffer = _malloc(bufferSize);
         stringToUTF8(jsonString, buffer, bufferSize);
-        dynCall("vi", onError, [buffer]);
+        {{{ makeDynCall('vi','onError') }}}(buffer)
       });
   },
 
@@ -139,8 +140,8 @@ mergeInto(LibraryManager.library, {
         var bufferSize = lengthBytesUTF8(id) + 1;
         var buffer = _malloc(bufferSize);
         stringToUTF8(id, buffer, bufferSize);
-
-        dynCall("vi", functionPtr, [buffer]);
+        
+        {{{ makeDynCall('vi', 'functionPtr') }}}(buffer)
       });
     } catch (error) {
       console.log(error);
@@ -701,7 +702,7 @@ mergeInto(LibraryManager.library, {
 
     Playroom.onDisconnect((e) => {
       console.log(`Disconnected!`, e.code, e.reason);
-      dynCall("v", callback, []);
+      {{{ makeDynCall('v', 'callback') }}}()
     });
   },
 
@@ -720,8 +721,8 @@ mergeInto(LibraryManager.library, {
         stateVal = JSON.stringify(stateVal);
 
         var key = _ConvertString(stateKey);
-
-        dynCall("vii", onStateSetCallback, [key, stringToNewUTF8(stateVal)]);
+        
+        {{{ makeDynCall('vii', 'onStateSetCallback') }}}(key, stringToNewUTF8(stateVal))
       })
       .catch((error) => {
         console.error("Error Waiting for state:", error);
@@ -757,7 +758,7 @@ mergeInto(LibraryManager.library, {
     stateKey = UTF8ToString(stateKey);
     Playroom.waitForPlayerState(playerState, stateKey)
       .then(() => {
-        dynCall("v", onStateSetCallback, []);
+        {{{ makeDynCall('v', 'onStateSetCallback') }}}()
       })
       .catch((error) => {
         console.error("Error waiting for state:", error);
@@ -789,7 +790,7 @@ mergeInto(LibraryManager.library, {
     playerState
       .kick()
       .then(() => {
-        dynCall("v", onKickCallBack, []);
+        {{{ makeDynCall('v', 'onKickCallback') }}}()
       })
       .catch((error) => {
         console.error("Error kicking player:", error);
@@ -807,7 +808,7 @@ mergeInto(LibraryManager.library, {
     var keys = keysToExclude ? JSON.parse(UTF8ToString(keysToExclude)) : [];
     Playroom.resetStates(keys)
       .then(() => {
-        dynCall("v", onStatesReset, []);
+        {{{ makeDynCall('v', 'onStatesReset') }}}()
       })
       .catch((error) => {
         console.error("Error resetting states:", error);
@@ -826,7 +827,7 @@ mergeInto(LibraryManager.library, {
     var keys = keysToExclude ? JSON.parse(UTF8ToString(keysToExclude)) : [];
     Playroom.resetPlayersStates(keys)
       .then(() => {
-        dynCall("v", onStatesReset, []);
+        {{{ makeDynCall('v', 'onStatesReset') }}}()
       })
       .catch((error) => {
         console.error("Error resetting players states:", error);
@@ -852,7 +853,7 @@ mergeInto(LibraryManager.library, {
       var buffer = _malloc(bufferSize);
       stringToUTF8(id, buffer, bufferSize);
 
-      dynCall("vii", callback, [stringToNewUTF8(dataJson), buffer]);
+      {{{ makeDynCall('vii', 'callback') }}}(stringToNewUTF8(dataJson), buffer)
 
       return onResponseReturn;
     }
@@ -885,7 +886,7 @@ mergeInto(LibraryManager.library, {
 
       function onResponseCallback(responseData) {
         console.log("Response received: ", responseData);
-        dynCall("v", callbackOnResponse, []);
+        {{{ makeDynCall('v', 'callbackOnResponse') }}}()
       }
 
       Playroom.RPC.call(UTF8ToString(name), data, mode, onResponseCallback);
@@ -905,7 +906,7 @@ mergeInto(LibraryManager.library, {
     Playroom.startMatchmaking()
       .then(() => {
         console.log(`Player has joined a public room`);
-        dynCall("v", callback, []);
+        {{{ makeDynCall('v', 'callback') }}}()
       })
       .catch((error) => {
         console.error(`JS: Error starting match making ${error}`);