Skip to content

Commit a40a2d7

Browse files
cwoffendencwoffenden
authored
Merge branch 'main' into cw-audio-memory64
2 parents e8e6395 + 116c178 commit a40a2d7

14 files changed

+192
-177
lines changed

‎src/lib/libbrowser.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ var LibraryBrowser = {
1919
],
2020
$Browser__postset: `
2121
// exports
22-
Module["requestFullscreen"] = Browser.requestFullscreen;
22+
Module['requestFullscreen'] = Browser.requestFullscreen;
2323
#if ASSERTIONS
24-
Module["requestFullScreen"] = Browser.requestFullScreen;
24+
Module['requestFullScreen'] = Browser.requestFullScreen;
2525
#endif
26-
Module["setCanvasSize"] = Browser.setCanvasSize;
27-
Module["getUserMedia"] = Browser.getUserMedia;
28-
Module["createContext"] = Browser.createContext;
26+
Module['setCanvasSize'] = Browser.setCanvasSize;
27+
Module['getUserMedia'] = Browser.getUserMedia;
28+
Module['createContext'] = Browser.createContext;
2929
`,
3030

3131
$Browser: {
@@ -428,9 +428,9 @@ var LibraryBrowser = {
428428
calculateMouseCoords(pageX, pageY) {
429429
// Calculate the movement based on the changes
430430
// in the coordinates.
431-
var rect = Module["canvas"].getBoundingClientRect();
432-
var cw = Module["canvas"].width;
433-
var ch = Module["canvas"].height;
431+
var rect = Module['canvas'].getBoundingClientRect();
432+
var cw = Module['canvas'].width;
433+
var ch = Module['canvas'].height;
434434

435435
// Neither .scrollX or .pageXOffset are defined in a spec, but
436436
// we prefer .scrollX because it is currently in a spec draft.

‎src/lib/libegl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,10 @@ var LibraryEGL = {
422422
// Existing Android implementation seems to do so at least.
423423
return 1;
424424
case 0x3057: // EGL_WIDTH
425-
{{{ makeSetValue('value', '0', 'Module["canvas"].width', 'i32') }}};
425+
{{{ makeSetValue('value', '0', "Module['canvas'].width", 'i32') }}};
426426
return 1;
427427
case 0x3056: // EGL_HEIGHT
428-
{{{ makeSetValue('value', '0', 'Module["canvas"].height', 'i32') }}};
428+
{{{ makeSetValue('value', '0', "Module['canvas'].height", 'i32') }}};
429429
return 1;
430430
case 0x3090: // EGL_HORIZONTAL_RESOLUTION
431431
{{{ makeSetValue('value', '0', '-1' /* EGL_UNKNOWN */, 'i32') }}};

‎src/lib/libeventloop.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ LibraryJSEventLoop = {
189189
$MainLoop__internal: true,
190190
$MainLoop__deps: ['$setMainLoop', '$callUserCallback', 'emscripten_set_main_loop_timing'],
191191
$MainLoop__postset: `
192-
Module["requestAnimationFrame"] = MainLoop.requestAnimationFrame;
193-
Module["pauseMainLoop"] = MainLoop.pause;
194-
Module["resumeMainLoop"] = MainLoop.resume;
192+
Module['requestAnimationFrame'] = MainLoop.requestAnimationFrame;
193+
Module['pauseMainLoop'] = MainLoop.pause;
194+
Module['resumeMainLoop'] = MainLoop.resume;
195195
MainLoop.init();`,
196196
$MainLoop: {
197197
running: false,

‎src/lib/libfs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ addToLibrary({
4040
FS.createPreloadedFile = FS_createPreloadedFile;
4141
FS.staticInit();
4242
// Set module methods based on EXPORTED_RUNTIME_METHODS
43-
{{{ EXPORTED_RUNTIME_METHODS.filter((func) => func.startsWith('FS_')).map((func) => 'Module["' + func + '"] = FS.' + func.slice(3) + ";\n").reduce((str, func) => str + func, '') }}}`;
43+
{{{ EXPORTED_RUNTIME_METHODS.filter((func) => func.startsWith('FS_')).map((func) => "Module['" + func + "'] = FS." + func.slice(3) + ";\n").reduce((str, func) => str + func, '') }}}`;
4444
},
4545
$FS: {
4646
root: null,

‎src/lib/libglfw.js

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ var LibraryGLFW = {
467467
Browser.calculateMouseEvent(event);
468468
}
469469

470-
if (event.target != Module["canvas"] || !GLFW.active.cursorPosFunc) return;
470+
if (event.target != Module['canvas'] || !GLFW.active.cursorPosFunc) return;
471471

472472
if (GLFW.active.cursorPosFunc) {
473473
#if USE_GLFW == 2
@@ -496,7 +496,7 @@ var LibraryGLFW = {
496496
onMouseenter: (event) => {
497497
if (!GLFW.active) return;
498498

499-
if (event.target != Module["canvas"]) return;
499+
if (event.target != Module['canvas']) return;
500500

501501
#if USE_GLFW == 3
502502
if (GLFW.active.cursorEnterFunc) {
@@ -508,7 +508,7 @@ var LibraryGLFW = {
508508
onMouseleave: (event) => {
509509
if (!GLFW.active) return;
510510

511-
if (event.target != Module["canvas"]) return;
511+
if (event.target != Module['canvas']) return;
512512

513513
#if USE_GLFW == 3
514514
if (GLFW.active.cursorEnterFunc) {
@@ -520,7 +520,7 @@ var LibraryGLFW = {
520520
onMouseButtonChanged: (event, status) => {
521521
if (!GLFW.active) return;
522522

523-
if (event.target != Module["canvas"]) return;
523+
if (event.target != Module['canvas']) return;
524524

525525
// Is this from a touch event?
526526
const isTouchType = event.type === 'touchstart' || event.type === 'touchend' || event.type === 'touchcancel';
@@ -1262,7 +1262,7 @@ var LibraryGLFW = {
12621262
calculateMouseCoords(pageX, pageY) {
12631263
// Calculate the movement based on the changes
12641264
// in the coordinates.
1265-
const rect = Module["canvas"].getBoundingClientRect();
1265+
const rect = Module['canvas'].getBoundingClientRect();
12661266

12671267
// Neither .scrollX or .pageXOffset are defined in a spec, but
12681268
// we prefer .scrollX because it is currently in a spec draft.
@@ -1384,30 +1384,30 @@ var LibraryGLFW = {
13841384
GLFW.scale = GLFW.getDevicePixelRatio();
13851385

13861386

1387-
window.addEventListener("gamepadconnected", GLFW.onGamepadConnected, true);
1388-
window.addEventListener("gamepaddisconnected", GLFW.onGamepadDisconnected, true);
1389-
window.addEventListener("keydown", GLFW.onKeydown, true);
1390-
window.addEventListener("keypress", GLFW.onKeyPress, true);
1391-
window.addEventListener("keyup", GLFW.onKeyup, true);
1392-
window.addEventListener("blur", GLFW.onBlur, true);
1387+
window.addEventListener('gamepadconnected', GLFW.onGamepadConnected, true);
1388+
window.addEventListener('gamepaddisconnected', GLFW.onGamepadDisconnected, true);
1389+
window.addEventListener('keydown', GLFW.onKeydown, true);
1390+
window.addEventListener('keypress', GLFW.onKeyPress, true);
1391+
window.addEventListener('keyup', GLFW.onKeyup, true);
1392+
window.addEventListener('blur', GLFW.onBlur, true);
13931393

13941394
// watch for devicePixelRatio changes
13951395
GLFW.devicePixelRatioMQL = window.matchMedia('(resolution: ' + GLFW.getDevicePixelRatio() + 'dppx)');
13961396
GLFW.devicePixelRatioMQL.addEventListener('change', GLFW.onDevicePixelRatioChange);
13971397

1398-
Module["canvas"].addEventListener("touchmove", GLFW.onMousemove, true);
1399-
Module["canvas"].addEventListener("touchstart", GLFW.onMouseButtonDown, true);
1400-
Module["canvas"].addEventListener("touchcancel", GLFW.onMouseButtonUp, true);
1401-
Module["canvas"].addEventListener("touchend", GLFW.onMouseButtonUp, true);
1402-
Module["canvas"].addEventListener("mousemove", GLFW.onMousemove, true);
1403-
Module["canvas"].addEventListener("mousedown", GLFW.onMouseButtonDown, true);
1404-
Module["canvas"].addEventListener("mouseup", GLFW.onMouseButtonUp, true);
1405-
Module["canvas"].addEventListener('wheel', GLFW.onMouseWheel, true);
1406-
Module["canvas"].addEventListener('mousewheel', GLFW.onMouseWheel, true);
1407-
Module["canvas"].addEventListener('mouseenter', GLFW.onMouseenter, true);
1408-
Module["canvas"].addEventListener('mouseleave', GLFW.onMouseleave, true);
1409-
Module["canvas"].addEventListener('drop', GLFW.onDrop, true);
1410-
Module["canvas"].addEventListener('dragover', GLFW.onDragover, true);
1398+
Module['canvas'].addEventListener('touchmove', GLFW.onMousemove, true);
1399+
Module['canvas'].addEventListener('touchstart', GLFW.onMouseButtonDown, true);
1400+
Module['canvas'].addEventListener('touchcancel', GLFW.onMouseButtonUp, true);
1401+
Module['canvas'].addEventListener('touchend', GLFW.onMouseButtonUp, true);
1402+
Module['canvas'].addEventListener('mousemove', GLFW.onMousemove, true);
1403+
Module['canvas'].addEventListener('mousedown', GLFW.onMouseButtonDown, true);
1404+
Module['canvas'].addEventListener('mouseup', GLFW.onMouseButtonUp, true);
1405+
Module['canvas'].addEventListener('wheel', GLFW.onMouseWheel, true);
1406+
Module['canvas'].addEventListener('mousewheel', GLFW.onMouseWheel, true);
1407+
Module['canvas'].addEventListener('mouseenter', GLFW.onMouseenter, true);
1408+
Module['canvas'].addEventListener('mouseleave', GLFW.onMouseleave, true);
1409+
Module['canvas'].addEventListener('drop', GLFW.onDrop, true);
1410+
Module['canvas'].addEventListener('dragover', GLFW.onDragover, true);
14111411

14121412
// Overriding implementation to account for HiDPI
14131413
Browser.requestFullscreen = GLFW.requestFullscreen;
@@ -1427,30 +1427,30 @@ var LibraryGLFW = {
14271427
},
14281428

14291429
glfwTerminate: () => {
1430-
window.removeEventListener("gamepadconnected", GLFW.onGamepadConnected, true);
1431-
window.removeEventListener("gamepaddisconnected", GLFW.onGamepadDisconnected, true);
1432-
window.removeEventListener("keydown", GLFW.onKeydown, true);
1433-
window.removeEventListener("keypress", GLFW.onKeyPress, true);
1434-
window.removeEventListener("keyup", GLFW.onKeyup, true);
1435-
window.removeEventListener("blur", GLFW.onBlur, true);
1436-
Module["canvas"].removeEventListener("touchmove", GLFW.onMousemove, true);
1437-
Module["canvas"].removeEventListener("touchstart", GLFW.onMouseButtonDown, true);
1438-
Module["canvas"].removeEventListener("touchcancel", GLFW.onMouseButtonUp, true);
1439-
Module["canvas"].removeEventListener("touchend", GLFW.onMouseButtonUp, true);
1440-
Module["canvas"].removeEventListener("mousemove", GLFW.onMousemove, true);
1441-
Module["canvas"].removeEventListener("mousedown", GLFW.onMouseButtonDown, true);
1442-
Module["canvas"].removeEventListener("mouseup", GLFW.onMouseButtonUp, true);
1443-
Module["canvas"].removeEventListener('wheel', GLFW.onMouseWheel, true);
1444-
Module["canvas"].removeEventListener('mousewheel', GLFW.onMouseWheel, true);
1445-
Module["canvas"].removeEventListener('mouseenter', GLFW.onMouseenter, true);
1446-
Module["canvas"].removeEventListener('mouseleave', GLFW.onMouseleave, true);
1447-
Module["canvas"].removeEventListener('drop', GLFW.onDrop, true);
1448-
Module["canvas"].removeEventListener('dragover', GLFW.onDragover, true);
1430+
window.removeEventListener('gamepadconnected', GLFW.onGamepadConnected, true);
1431+
window.removeEventListener('gamepaddisconnected', GLFW.onGamepadDisconnected, true);
1432+
window.removeEventListener('keydown', GLFW.onKeydown, true);
1433+
window.removeEventListener('keypress', GLFW.onKeyPress, true);
1434+
window.removeEventListener('keyup', GLFW.onKeyup, true);
1435+
window.removeEventListener('blur', GLFW.onBlur, true);
1436+
Module['canvas'].removeEventListener('touchmove', GLFW.onMousemove, true);
1437+
Module['canvas'].removeEventListener('touchstart', GLFW.onMouseButtonDown, true);
1438+
Module['canvas'].removeEventListener('touchcancel', GLFW.onMouseButtonUp, true);
1439+
Module['canvas'].removeEventListener('touchend', GLFW.onMouseButtonUp, true);
1440+
Module['canvas'].removeEventListener('mousemove', GLFW.onMousemove, true);
1441+
Module['canvas'].removeEventListener('mousedown', GLFW.onMouseButtonDown, true);
1442+
Module['canvas'].removeEventListener('mouseup', GLFW.onMouseButtonUp, true);
1443+
Module['canvas'].removeEventListener('wheel', GLFW.onMouseWheel, true);
1444+
Module['canvas'].removeEventListener('mousewheel', GLFW.onMouseWheel, true);
1445+
Module['canvas'].removeEventListener('mouseenter', GLFW.onMouseenter, true);
1446+
Module['canvas'].removeEventListener('mouseleave', GLFW.onMouseleave, true);
1447+
Module['canvas'].removeEventListener('drop', GLFW.onDrop, true);
1448+
Module['canvas'].removeEventListener('dragover', GLFW.onDragover, true);
14491449

14501450
if (GLFW.devicePixelRatioMQL)
14511451
GLFW.devicePixelRatioMQL.removeEventListener('change', GLFW.onDevicePixelRatioChange);
14521452

1453-
Module["canvas"].width = Module["canvas"].height = 1;
1453+
Module['canvas'].width = Module['canvas'].height = 1;
14541454
GLFW.windows = null;
14551455
GLFW.active = null;
14561456
},

‎src/lib/libglut.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var LibraryGLUT = {
5252
var newY = Browser.mouseY;
5353
if (newX == lastX && newY == lastY) return;
5454

55-
if (GLUT.buttons == 0 && event.target == Module["canvas"] && GLUT.passiveMotionFunc) {
55+
if (GLUT.buttons == 0 && event.target == Module['canvas'] && GLUT.passiveMotionFunc) {
5656
event.preventDefault();
5757
GLUT.saveModifiers(event);
5858
{{{ makeDynCall('vii', 'GLUT.passiveMotionFunc') }}}(lastX, lastY);
@@ -231,7 +231,7 @@ var LibraryGLUT = {
231231

232232
GLUT.buttons |= (1 << event['button']);
233233

234-
if (event.target == Module["canvas"] && GLUT.mouseFunc) {
234+
if (event.target == Module['canvas'] && GLUT.mouseFunc) {
235235
try {
236236
event.target.setCapture();
237237
} catch (e) {}
@@ -321,20 +321,20 @@ var LibraryGLUT = {
321321
// are only looking at single finger touches to emulate left click,
322322
// so we can use workaround and convert all touch events in mouse
323323
// events. See touchHandler.
324-
window.addEventListener("touchmove", GLUT.touchHandler, true);
325-
window.addEventListener("touchstart", GLUT.touchHandler, true);
326-
window.addEventListener("touchend", GLUT.touchHandler, true);
324+
window.addEventListener('touchmove', GLUT.touchHandler, true);
325+
window.addEventListener('touchstart', GLUT.touchHandler, true);
326+
window.addEventListener('touchend', GLUT.touchHandler, true);
327327
}
328328

329-
window.addEventListener("keydown", GLUT.onKeydown, true);
330-
window.addEventListener("keyup", GLUT.onKeyup, true);
331-
window.addEventListener("mousemove", GLUT.onMousemove, true);
332-
window.addEventListener("mousedown", GLUT.onMouseButtonDown, true);
333-
window.addEventListener("mouseup", GLUT.onMouseButtonUp, true);
329+
window.addEventListener('keydown', GLUT.onKeydown, true);
330+
window.addEventListener('keyup', GLUT.onKeyup, true);
331+
window.addEventListener('mousemove', GLUT.onMousemove, true);
332+
window.addEventListener('mousedown', GLUT.onMouseButtonDown, true);
333+
window.addEventListener('mouseup', GLUT.onMouseButtonUp, true);
334334
// IE9, Chrome, Safari, Opera
335-
window.addEventListener("mousewheel", GLUT.onMouseWheel, true);
335+
window.addEventListener('mousewheel', GLUT.onMouseWheel, true);
336336
// Firefox
337-
window.addEventListener("DOMMouseScroll", GLUT.onMouseWheel, true);
337+
window.addEventListener('DOMMouseScroll', GLUT.onMouseWheel, true);
338338

339339
Browser.resizeListeners.push((width, height) => {
340340
if (GLUT.reshapeFunc) {
@@ -344,22 +344,22 @@ var LibraryGLUT = {
344344

345345
addOnExit(() => {
346346
if (isTouchDevice) {
347-
window.removeEventListener("touchmove", GLUT.touchHandler, true);
348-
window.removeEventListener("touchstart", GLUT.touchHandler, true);
349-
window.removeEventListener("touchend", GLUT.touchHandler, true);
347+
window.removeEventListener('touchmove', GLUT.touchHandler, true);
348+
window.removeEventListener('touchstart', GLUT.touchHandler, true);
349+
window.removeEventListener('touchend', GLUT.touchHandler, true);
350350
}
351351

352-
window.removeEventListener("keydown", GLUT.onKeydown, true);
353-
window.removeEventListener("keyup", GLUT.onKeyup, true);
354-
window.removeEventListener("mousemove", GLUT.onMousemove, true);
355-
window.removeEventListener("mousedown", GLUT.onMouseButtonDown, true);
356-
window.removeEventListener("mouseup", GLUT.onMouseButtonUp, true);
352+
window.removeEventListener('keydown', GLUT.onKeydown, true);
353+
window.removeEventListener('keyup', GLUT.onKeyup, true);
354+
window.removeEventListener('mousemove', GLUT.onMousemove, true);
355+
window.removeEventListener('mousedown', GLUT.onMouseButtonDown, true);
356+
window.removeEventListener('mouseup', GLUT.onMouseButtonUp, true);
357357
// IE9, Chrome, Safari, Opera
358-
window.removeEventListener("mousewheel", GLUT.onMouseWheel, true);
358+
window.removeEventListener('mousewheel', GLUT.onMouseWheel, true);
359359
// Firefox
360-
window.removeEventListener("DOMMouseScroll", GLUT.onMouseWheel, true);
360+
window.removeEventListener('DOMMouseScroll', GLUT.onMouseWheel, true);
361361

362-
Module["canvas"].width = Module["canvas"].height = 1;
362+
Module['canvas'].width = Module['canvas'].height = 1;
363363
});
364364
},
365365

‎src/lib/libsdl.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@ var LibrarySDL = {
374374

375375
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.clip_rect+C_STRUCTS.SDL_Rect.x, '0', 'i32') }}};
376376
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.clip_rect+C_STRUCTS.SDL_Rect.y, '0', 'i32') }}};
377-
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.clip_rect+C_STRUCTS.SDL_Rect.w, 'Module["canvas"].width', 'i32') }}};
378-
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.clip_rect+C_STRUCTS.SDL_Rect.h, 'Module["canvas"].height', 'i32') }}};
377+
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.clip_rect+C_STRUCTS.SDL_Rect.w, "Module['canvas'].width", 'i32') }}};
378+
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.clip_rect+C_STRUCTS.SDL_Rect.h, "Module['canvas'].height" , 'i32') }}};
379379

380380
{{{ makeSetValue('surf', C_STRUCTS.SDL_Surface.refcount, '1', 'i32') }}};
381381

@@ -1444,8 +1444,8 @@ var LibrarySDL = {
14441444
SDL_GetVideoInfo__proxy: 'sync',
14451445
SDL_GetVideoInfo: () => {
14461446
var ret = _calloc({{{ C_STRUCTS.SDL_VideoInfo.__size__ }}}, 1);
1447-
{{{ makeSetValue('ret', C_STRUCTS.SDL_VideoInfo.current_w, 'Module["canvas"].width', 'i32') }}};
1448-
{{{ makeSetValue('ret', C_STRUCTS.SDL_VideoInfo.current_h, 'Module["canvas"].height', 'i32') }}};
1447+
{{{ makeSetValue('ret', C_STRUCTS.SDL_VideoInfo.current_w, "Module['canvas'].width", 'i32') }}};
1448+
{{{ makeSetValue('ret', C_STRUCTS.SDL_VideoInfo.current_h, "Module['canvas'].height", 'i32') }}};
14491449
return ret;
14501450
},
14511451

@@ -1808,7 +1808,7 @@ var LibrarySDL = {
18081808
SDL_WarpMouse: (x, y) => {
18091809
return; // TODO: implement this in a non-buggy way. Need to keep relative mouse movements correct after calling this
18101810
/*
1811-
var rect = Module["canvas"].getBoundingClientRect();
1811+
var rect = Module['canvas'].getBoundingClientRect();
18121812
SDL.events.push({
18131813
type: 'mousemove',
18141814
pageX: x + (window.scrollX + rect.left),

0 commit comments

Comments
 (0)