Skip to content

Emscripten: Tidy up the JS glue scripts #3586

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

Open
johannschopplich wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −11
Open

Emscripten: Tidy up the JS glue scripts #3586

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
14 changes: 4 additions & 10 deletions resources/emscripten/emscripten-post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Module.initApi = function() {
Module.api_private.uploadSavegame_js = function (slot) {
Module.api_private.createInputElement_js('easyrpg_saveFile', function (file) {
const result = new Uint8Array(file.currentTarget.result);
var buf = Module._malloc(result.length);
const buf = Module._malloc(result.length);
Module.HEAPU8.set(result, buf);
Module.api_private.uploadSavegameStep2(slot, buf, result.length);
Module._free(buf);
Expand All @@ -41,12 +41,9 @@ Module.initApi = function() {
Module.api_private.uploadSoundfont_js = function () {
Module.api_private.createInputElement_js('easyrpg_sfFile', function (file, name) {
const result = new Uint8Array(file.currentTarget.result);
//const name_buf = Module._malloc(name.length + 1);
//stringToUTF8(name, name_buf, name.length + 1);
const content_buf = Module._malloc(result.length);
Module.HEAPU8.set(result, content_buf);
Module.api_private.uploadSoundfontStep2(name, content_buf, result.length);
//Module._free(name_buf);
Module._free(content_buf);
Module.api.refreshScene();
});
Expand All @@ -55,12 +52,9 @@ Module.initApi = function() {
Module.api_private.uploadFont_js = function () {
Module.api_private.createInputElement_js('easyrpg_sfFile', function (file, name) {
const result = new Uint8Array(file.currentTarget.result);
//const name_buf = Module._malloc(name.length + 1);
//stringToUTF8(name, name_buf, name.length + 1);
const content_buf = Module._malloc(result.length);
Module.HEAPU8.set(result, content_buf);
Module.api_private.uploadFontStep2(name, content_buf, result.length);
//Module._free(name_buf);
Module._free(content_buf);
Module.api.refreshScene();
});
Expand All @@ -70,12 +64,12 @@ Module.initApi = function() {
// Display the nice end message forever
Module["onExit"] = function() {
// load image
let imageContent = FS.readFile("/tmp/message.png");
var img = document.createElement('img');
const imageContent = FS.readFile("/tmp/message.png");
const img = document.createElement('img');
img.id = "canvas";
img.src = URL.createObjectURL(new Blob([imageContent], {type: "image/png"}));

// replace canvas
var cvs = document.getElementById('canvas');
const cvs = document.getElementById('canvas');
cvs.parentNode.replaceChild(img, cvs);
}
2 changes: 1 addition & 1 deletion resources/emscripten/emscripten-pre.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Module = { ...Module,
* Parses the current location query to setup a specific game
*/
function parseArgs () {
const items = window.location.search.substr(1).split("&");
const items = window.location.search.slice(1).split("&");
let result = [];

// Store saves in subdirectory `Save`
Expand Down
Loading