Skip to content

Move preloadedAudios/preloadedImages inside Browser. NFC #22855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Move preloadedAudios/preloadedImages inside Browser. NFC #22855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions site/source/docs/api_reference/preamble.js.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,6 @@ The :ref:`emscripten-memory-model` uses a typed array buffer (``ArrayBuffer``) t
function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned)
function SAFE_FT_MASK(value, mask)
function CHECK_OVERFLOW(value, bits, ignore, sig)
Module["preloadedImages"]
Module["preloadedAudios"]


.. PRIVATE NOTES (not rendered) :
Expand Down
13 changes: 7 additions & 6 deletions src/library_browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@ var LibraryBrowser = {
Module["setCanvasSize"] = Browser.setCanvasSize;
Module["getUserMedia"] = Browser.getUserMedia;
Module["createContext"] = Browser.createContext;
var preloadedImages = {};
var preloadedAudios = {};`,
`,

$Browser: {
useWebGL: false,
isFullscreen: false,
pointerLock: false,
moduleContextCreatedCallbacks: [],
workers: [],
preloadedImages: {},
preloadedAudios: {},

init() {
if (Browser.initted) return;
Expand Down Expand Up @@ -73,7 +74,7 @@ var LibraryBrowser = {
canvas.height = img.height;
var ctx = canvas.getContext('2d');
ctx.drawImage(img, 0, 0);
preloadedImages[name] = canvas;
Browser.preloadedImages[name] = canvas;
URL.revokeObjectURL(url);
onload?.(byteArray);
};
Expand All @@ -94,13 +95,13 @@ var LibraryBrowser = {
function finish(audio) {
if (done) return;
done = true;
preloadedAudios[name] = audio;
Browser.preloadedAudios[name] = audio;
onload?.(byteArray);
}
function fail() {
if (done) return;
done = true;
preloadedAudios[name] = new Audio(); // empty shim
Browser.preloadedAudios[name] = new Audio(); // empty shim
onerror?.();
}
var b = new Blob([byteArray], { type: Browser.getMimetype(name) });
Expand Down Expand Up @@ -881,7 +882,7 @@ var LibraryBrowser = {
$getPreloadedImageData: (path, w, h) => {
path = PATH_FS.resolve(path);

var canvas = /** @type {HTMLCanvasElement} */(preloadedImages[path]);
var canvas = /** @type {HTMLCanvasElement} */(Browser.preloadedImages[path]);
Copy link
Collaborator

@brendandahl brendandahl Nov 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing dependency on $Browser?

Copy link
Collaborator Author

@sbc100 sbc100 Nov 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All symbols in this file implicitly depend on $Browser thanks to the autoAddDeps(LibraryBrowser, '$Browser'); line at the bottom.

if (!canvas) return 0;

var ctx = canvas.getContext("2d");
Expand Down
10 changes: 5 additions & 5 deletions src/library_sdl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2156,7 +2156,7 @@ var LibrarySDL = {
// We support JPG, PNG, TIF because browsers do
IMG_Init: (flags) => flags,

IMG_Load_RW__deps: ['SDL_LockSurface', 'SDL_FreeRW', '$PATH_FS', '$stackSave', '$stackRestore', '$stringToUTF8OnStack', '$stackAlloc'],
IMG_Load_RW__deps: ['$Browser', 'SDL_LockSurface', 'SDL_FreeRW', '$PATH_FS', '$stackSave', '$stackRestore', '$stringToUTF8OnStack', '$stackAlloc'],
IMG_Load_RW__proxy: 'sync',
IMG_Load_RW: (rwopsID, freeSrc) => {
var sp = stackSave();
Expand Down Expand Up @@ -2209,7 +2209,7 @@ var LibrarySDL = {

if (!raw) {
filename = PATH_FS.resolve(filename);
raw = preloadedImages[filename];
raw = Browser.preloadedImages[filename];
if (!raw) {
if (raw === null) err('Trying to reuse preloaded image, but freePreloadedMediaOnUse is set!');
#if STB_IMAGE
Expand All @@ -2222,7 +2222,7 @@ var LibrarySDL = {
return 0;
#endif
} else if (Module['freePreloadedMediaOnUse']) {
preloadedImages[filename] = null;
Browser.preloadedImages[filename] = null;
}
}

Expand Down Expand Up @@ -2702,7 +2702,7 @@ var LibrarySDL = {

if (rwops.filename !== undefined) {
filename = PATH_FS.resolve(rwops.filename);
var raw = preloadedAudios[filename];
var raw = Browser.preloadedAudios[filename];
if (!raw) {
if (raw === null) err('Trying to reuse preloaded audio, but freePreloadedMediaOnUse is set!');
if (!Module['noAudioDecoding']) warnOnce('Cannot find preloaded audio ' + filename);
Expand All @@ -2716,7 +2716,7 @@ var LibrarySDL = {
}
}
if (Module['freePreloadedMediaOnUse']) {
preloadedAudios[filename] = null;
Browser.preloadedAudios[filename] = null;
}
audio = raw;
}
Expand Down
Loading