Skip to content

Commit a4ebd59

Browse files
0xFirekeeper0xFirekeeper
authored
Future-proof dynCalls (#233)
1 parent 6ab283e commit a4ebd59

File tree

5 files changed

+21
-43
lines changed

5 files changed

+21
-43
lines changed

‎Assets/Thirdweb/Plugins/ThreadingPatcher/Plugins/SystemThreadingTimer.jslib

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var SystemThreadingTimerLib = {
1515
setTimeout(function()
1616
{
1717
if (id === vars.currentCallbackId)
18-
Runtime.dynCall('v', vars.callback);
18+
{{{ makeDynCall("v", "vars.callback") }}}();
1919
},
2020
interval);
2121
}

‎Assets/Thirdweb/Plugins/WalletConnectUnity/com.walletconnect.core/Runtime/External/NativeWebSocket/WebSocket.jslib

+5-5
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ var LibraryWebSocket = {
150150
console.log("[JSLIB WebSocket] Connected.");
151151

152152
if (webSocketState.onOpen)
153-
Module.dynCall_vi(webSocketState.onOpen, instanceId);
153+
{{{ makeDynCall("vi", "webSocketState.onOpen") }}}(instanceId);
154154

155155
};
156156

@@ -170,7 +170,7 @@ var LibraryWebSocket = {
170170
HEAPU8.set(dataBuffer, buffer);
171171

172172
try {
173-
Module.dynCall_viii(webSocketState.onMessage, instanceId, buffer, dataBuffer.length);
173+
{{{ makeDynCall("viii", "webSocketState.onMessage") }}}(instanceId, buffer, dataBuffer.length);
174174
} finally {
175175
_free(buffer);
176176
}
@@ -182,7 +182,7 @@ var LibraryWebSocket = {
182182
HEAPU8.set(dataBuffer, buffer);
183183

184184
try {
185-
Module.dynCall_viii(webSocketState.onMessage, instanceId, buffer, dataBuffer.length);
185+
{{{ makeDynCall("viii", "webSocketState.onMessage") }}}(instanceId, buffer, dataBuffer.length);
186186
} finally {
187187
_free(buffer);
188188
}
@@ -204,7 +204,7 @@ var LibraryWebSocket = {
204204
stringToUTF8(msg, buffer, length);
205205

206206
try {
207-
Module.dynCall_vii(webSocketState.onError, instanceId, buffer);
207+
{{{ makeDynCall("vii", "webSocketState.onError") }}}(instanceId, buffer);
208208
} finally {
209209
_free(buffer);
210210
}
@@ -219,7 +219,7 @@ var LibraryWebSocket = {
219219
console.log("[JSLIB WebSocket] Closed.");
220220

221221
if (webSocketState.onClose)
222-
Module.dynCall_vii(webSocketState.onClose, instanceId, ev.code);
222+
{{{ makeDynCall("vii", "webSocketState.onClose") }}}(instanceId, ev.code);
223223

224224
delete instance.ws;
225225

‎Assets/Thirdweb/Plugins/WebGLInputCopy/WebGLInput/Mobile/WebGLInputMobile.jslib

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ var WebGLInputMobile = {
66

77
document.body.addEventListener("touchend", function () {
88
document.body.removeEventListener("touchend", arguments.callee);
9-
Runtime.dynCall("vi", touchend, [id]);
9+
{{{ makeDynCall("vi", "touchend") }}}(id);
1010
});
1111

1212
return id;
1313
},
1414
WebGLInputMobileOnFocusOut: function (id, focusout) {
1515
document.body.addEventListener("focusout", function () {
1616
document.body.removeEventListener("focusout", arguments.callee);
17-
Runtime.dynCall("vi", focusout, [id]);
17+
{{{ makeDynCall("vi", "focusout") }}}(id);
1818
});
1919
},
2020
}

‎Assets/Thirdweb/Plugins/WebGLInputCopy/WebGLInput/WebGLInput.jslib

+6-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
var WebGLInput = {
22
$instances: [],
33
WebGLInputInit : function() {
4-
// use WebAssembly.Table : makeDynCall
5-
// when enable. dynCall is undefined
6-
if(typeof dynCall === "undefined")
7-
{
8-
// make Runtime.dynCall to undefined
9-
Runtime = { dynCall : undefined }
10-
}
11-
else
12-
{
13-
// Remove the `Runtime` object from "v1.37.27: 12/24/2017"
14-
// if Runtime not defined. create and add functon!!
15-
if(typeof Runtime === "undefined") Runtime = { dynCall : dynCall }
16-
}
174
},
185
WebGLInputCreate: function (canvasId, x, y, width, height, fontsize, text, placeholder, isMultiLine, isPassword, isHidden, isMobile) {
196

@@ -112,7 +99,7 @@ var WebGLInput = {
11299
input.setSelectionRange(start + 1, start + 1);
113100
input.oninput(); // call oninput to exe ValueChange function!!
114101
} else {
115-
(!!Runtime.dynCall) ? Runtime.dynCall("vii", cb, [id, e.shiftKey ? -1 : 1]) : {{{ makeDynCall("vii", "cb") }}}(id, e.shiftKey ? -1 : 1);
102+
{{{ makeDynCall("vii", "cb") }}}(id, e.shiftKey ? -1 : 1);
116103
}
117104
}
118105
});
@@ -124,13 +111,13 @@ var WebGLInput = {
124111
WebGLInputOnFocus: function (id, cb) {
125112
var input = instances[id];
126113
input.onfocus = function () {
127-
(!!Runtime.dynCall) ? Runtime.dynCall("vi", cb, [id]) : {{{ makeDynCall("vi", "cb") }}}(id);
114+
{{{ makeDynCall("vi", "cb") }}}(id);
128115
};
129116
},
130117
WebGLInputOnBlur: function (id, cb) {
131118
var input = instances[id];
132119
input.onblur = function () {
133-
(!!Runtime.dynCall) ? Runtime.dynCall("vi", cb, [id]) : {{{ makeDynCall("vi", "cb") }}}(id);
120+
{{{ makeDynCall("vi", "cb") }}}(id);
134121
};
135122
},
136123
WebGLInputIsFocus: function (id) {
@@ -143,7 +130,7 @@ var WebGLInput = {
143130
var bufferSize = lengthBytesUTF8(returnStr) + 1;
144131
var buffer = _malloc(bufferSize);
145132
stringToUTF8(returnStr, buffer, bufferSize);
146-
(!!Runtime.dynCall) ? Runtime.dynCall("vii", cb, [id, buffer]) : {{{ makeDynCall("vii", "cb") }}}(id, buffer);
133+
{{{ makeDynCall("vii", "cb") }}}(id, buffer);
147134
};
148135
},
149136
WebGLInputOnEditEnd:function(id, cb){
@@ -153,7 +140,7 @@ var WebGLInput = {
153140
var bufferSize = lengthBytesUTF8(returnStr) + 1;
154141
var buffer = _malloc(bufferSize);
155142
stringToUTF8(returnStr, buffer, bufferSize);
156-
(!!Runtime.dynCall) ? Runtime.dynCall("vii", cb, [id, buffer]) : {{{ makeDynCall("vii", "cb") }}}(id, buffer);
143+
{{{ makeDynCall("vii", "cb") }}}(id, buffer);
157144
};
158145
},
159146
WebGLInputOnKeyboardEvent:function(id, cb){
@@ -167,7 +154,7 @@ var WebGLInput = {
167154
var shift = e.shiftKey ? 1 : 0;
168155
var ctrl = e.ctrlKey ? 1 : 0;
169156
var alt = e.altKey ? 1 : 0;
170-
(!!Runtime.dynCall) ? Runtime.dynCall("viiiiiii", cb, [id, mode, key, code, shift, ctrl, alt]) : {{{ makeDynCall("viiiiiii", "cb") }}}(id, mode, key, code, shift, ctrl, alt);
157+
{{{ makeDynCall("viiiiiii", "cb") }}}(id, mode, key, code, shift, ctrl, alt);
171158
}
172159
}
173160
input.addEventListener('keydown', function(e) { func(1, e); });

‎Assets/Thirdweb/Plugins/WebGLInputCopy/WebGLWindow/WebGLWindow.jslib

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
#if parseInt(EMSCRIPTEN_VERSION.split('.')[0]) < 2 || (parseInt(EMSCRIPTEN_VERSION.split('.')[0]) == 2 && parseInt(EMSCRIPTEN_VERSION.split('.')[1]) < 0) || (parseInt(EMSCRIPTEN_VERSION.split('.')[0]) == 2 && parseInt(EMSCRIPTEN_VERSION.split('.')[1]) == 0 && parseInt(EMSCRIPTEN_VERSION.split('.')[2]) < 3)
2+
#error "ThirdWeb plugin requires building with Emscripten 2.0.3 and Unity 2021.2 or newer. Please update"
3+
#endif
4+
15
var WebGLWindow = {
26
WebGLWindowInit : function() {
3-
// use WebAssembly.Table : makeDynCall
4-
// when enable. dynCall is undefined
5-
if(typeof dynCall === "undefined")
6-
{
7-
// make Runtime.dynCall to undefined
8-
Runtime = { dynCall : undefined }
9-
}
10-
else
11-
{
12-
// Remove the `Runtime` object from "v1.37.27: 12/24/2017"
13-
// if Runtime not defined. create and add functon!!
14-
if(typeof Runtime === "undefined") Runtime = { dynCall : dynCall }
15-
}
167
},
178
WebGLWindowGetCanvasName: function() {
189
var elements = document.getElementsByTagName('canvas');
@@ -33,17 +24,17 @@ var WebGLWindow = {
3324
},
3425
WebGLWindowOnFocus: function (cb) {
3526
window.addEventListener('focus', function () {
36-
(!!Runtime.dynCall) ? Runtime.dynCall("v", cb, []) : {{{ makeDynCall("v", "cb") }}}();
27+
{{{ makeDynCall("v", "cb") }}}();
3728
});
3829
},
3930
WebGLWindowOnBlur: function (cb) {
4031
window.addEventListener('blur', function () {
41-
(!!Runtime.dynCall) ? Runtime.dynCall("v", cb, []) : {{{ makeDynCall("v", "cb") }}}();
32+
{{{ makeDynCall("v", "cb") }}}();
4233
});
4334
},
4435
WebGLWindowOnResize: function(cb) {
4536
window.addEventListener('resize', function () {
46-
(!!Runtime.dynCall) ? Runtime.dynCall("v", cb, []) : {{{ makeDynCall("v", "cb") }}}();
37+
{{{ makeDynCall("v", "cb") }}}();
4738
});
4839
},
4940
WebGLWindowInjectFullscreen : function () {

0 commit comments

Comments
 (0)