Skip to content

Commit 91a8b7c

Browse files
committed
fix(SimpleWeb.jslib): Use makeDynCall for Unity 2022+
makeDynCall is a preprocessor macro that will insert the correct dyncall in 2022 and newer Unity versions
1 parent 2c8b8ec commit 91a8b7c

File tree

1 file changed

+8
-4
lines changed
  • Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin

1 file changed

+8
-4
lines changed

Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/Webgl/plugin/SimpleWeb.jslib

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ function Connect(addressPtr, openCallbackPtr, closeCallBackPtr, messageCallbackP
4444
webSocket.onopen = function(event)
4545
{
4646
console.log("Connected to " + address);
47-
dynCall('vi', openCallbackPtr, [index]);
47+
// dynCall('vi', openCallbackPtr, [index]);
48+
{{{ makeDynCall('vi', 'openCallbackPtr') }}}(index);
4849
};
4950

5051
webSocket.onclose = function(event)
5152
{
5253
console.log("Disconnected from " + address);
53-
dynCall('vi', closeCallBackPtr, [index]);
54+
// dynCall('vi', closeCallBackPtr, [index]);
55+
{{{ makeDynCall('vi', 'closeCallBackPtr') }}}(index);
5456
};
5557

5658
webSocket.onmessage = function(event)
@@ -63,7 +65,8 @@ function Connect(addressPtr, openCallbackPtr, closeCallBackPtr, messageCallbackP
6365
var dataBuffer = new Uint8Array(HEAPU8.buffer, bufferPtr, arrayLength);
6466
dataBuffer.set(array);
6567

66-
dynCall('viii', messageCallbackPtr, [index, bufferPtr, arrayLength]);
68+
// dynCall('viii', messageCallbackPtr, [index, bufferPtr, arrayLength]);
69+
{{{ makeDynCall('viii', 'messageCallbackPtr') }}}(index, bufferPtr, arrayLength);
6770
_free(bufferPtr);
6871
}
6972
else
@@ -75,7 +78,8 @@ function Connect(addressPtr, openCallbackPtr, closeCallBackPtr, messageCallbackP
7578
webSocket.onerror = function(event)
7679
{
7780
console.error('Socket Error', event);
78-
dynCall('vi', errorCallbackPtr, [index]);
81+
// dynCall('vi', errorCallbackPtr, [index]);
82+
{{{ makeDynCall('vi', 'errorCallbackPtr') }}}(index);
7983
};
8084

8185
return index;

0 commit comments

Comments
 (0)