Deploying to built from @ 709bcdb5bc 🚀

This commit is contained in:
pulsejet 2020-10-20 10:23:48 +00:00
parent 46cba1fb96
commit ef59fb7418
4 changed files with 562 additions and 572 deletions

File diff suppressed because one or more lines are too long

View File

@ -1104,4 +1104,5 @@ var mapping = {
"graphics/transitions/019-whorl01": "Graphics/Transitions/019-Whorl01.png?h=92f6e9a57545d15cd4b03dcb1d9c367d", "graphics/transitions/019-whorl01": "Graphics/Transitions/019-Whorl01.png?h=92f6e9a57545d15cd4b03dcb1d9c367d",
"graphics/transitions/020-flat01": "Graphics/Transitions/020-Flat01.png?h=94dd9f75005cdc7236a0b400b71920fd", "graphics/transitions/020-flat01": "Graphics/Transitions/020-Flat01.png?h=94dd9f75005cdc7236a0b400b71920fd",
"graphics/windowskins/windowskin_kn": "Graphics/Windowskins/Windowskin_kn.png?h=6ad592d1b718424e634dda8f7b96aac2", "graphics/windowskins/windowskin_kn": "Graphics/Windowskins/Windowskin_kn.png?h=6ad592d1b718424e634dda8f7b96aac2",
"*/**/**/*": "*/**/**/*?h=",
}; };

View File

@ -9,7 +9,6 @@
<script src="js/drive.js"></script> <script src="js/drive.js"></script>
<script src="js/dpad.js"></script> <script src="js/dpad.js"></script>
<script src="gameasync/mapping.js"></script> <script src="gameasync/mapping.js"></script>
<script src="gameasync/bitmap-map.js"></script>
<title>MKXP</title> <title>MKXP</title>
<style> <style>
@ -238,8 +237,15 @@
const s = document.createElement('script'); const s = document.createElement('script');
s.setAttribute('src', 'mkxp.js'); s.setAttribute('src', 'mkxp.js');
document.body.appendChild(s); document.body.appendChild(s);
getLazyAsset('gameasync/bitmap-map.js', 'Primary assets', () => {
const s = document.createElement('script');
s.setAttribute('src', 'gameasync/bitmap-map.js');
document.body.appendChild(s);
});
}); });
}, 200); }, 200);
var bitmapSizeMapping = {};
if (!is_touch_device()) { if (!is_touch_device()) {
document.getElementById('dpad').style.display = 'none'; document.getElementById('dpad').style.display = 'none';

View File

@ -1,24 +1,3 @@
// https://stackoverflow.com/a/9458996
function _bytesToBase64(bytes) {
var binary = '';
var len = bytes.byteLength;
for (var i = 0; i < len; i++) {
binary += String.fromCharCode(bytes[i]);
}
return window.btoa(binary);
}
// https://stackoverflow.com/a/21797381
function _base64ToBytes(base64) {
var binary_string = window.atob(base64);
var len = binary_string.length;
var bytes = new Uint8Array(len);
for (var i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes;
}
// Canvas used for image generation // Canvas used for image generation
var generationCanvas = document.createElement('canvas') var generationCanvas = document.createElement('canvas')
window.fileAsyncCache = {}; window.fileAsyncCache = {};
@ -37,7 +16,6 @@ window.loadFileAsync = function(fullPath, bitmap, callback) {
// Check if already loaded // Check if already loaded
if (window.fileAsyncCache.hasOwnProperty(mappingKey)) return callback(); if (window.fileAsyncCache.hasOwnProperty(mappingKey)) return callback();
console.log('load', mappingKey);
// Show spinner // Show spinner
if (!bitmap && window.setBusy) window.setBusy(); if (!bitmap && window.setBusy) window.setBusy();
@ -110,14 +88,15 @@ window.loadFileAsync = function(fullPath, bitmap, callback) {
window.saveFile = function(filename) { window.saveFile = function(filename) {
const buf = FS.readFile('/game/' + filename); const buf = FS.readFile('/game/' + filename);
const b64 = _bytesToBase64(buf); localforage.setItem(namespace + filename, buf);
localforage.setItem(namespace + filename, b64);
localforage.getItem(namespace, function(err, res) { localforage.getItem(namespace, function(err, res) {
if (err || !res) res = {}; if (err || !res) res = {};
res[filename] = 1; res[filename] = 1;
localforage.setItem(namespace, res); localforage.setItem(namespace, res);
}); });
(window.saveCloudFile || (()=>{}))(filename, buf);
}; };
var loadFiles = function() { var loadFiles = function() {
@ -132,11 +111,16 @@ var loadFiles = function() {
localforage.getItem(namespace + key, (err, res) => { localforage.getItem(namespace + key, (err, res) => {
if (err) return; if (err) return;
const buf = _base64ToBytes(res); // Don't overwrite existing files
FS.writeFile('/game/' + key, buf); const fname = '/game/' + key;
if (FS.analyzePath(fname).exists) return;
FS.writeFile(fname, res);
}); });
}); });
}); });
(window.loadCloudFiles || (()=>{}))();
} }
var createDummies = function() { var createDummies = function() {
@ -183,7 +167,6 @@ function preloadList(jsonArray) {
// Preload the asset // Preload the asset
FS.createPreloadedFile(path, filename, "gameasync/" + mappingValue, true, true, function() { FS.createPreloadedFile(path, filename, "gameasync/" + mappingValue, true, true, function() {
window.fileAsyncCache[mappingKey] = 1; window.fileAsyncCache[mappingKey] = 1;
console.log('preload', mappingKey);
}, console.error, false, false, () => { }, console.error, false, false, () => {
try { FS.unlink(path + "/" + filename); } catch (err) {} try { FS.unlink(path + "/" + filename); } catch (err) {}
}); });
@ -237,7 +220,7 @@ function getLazyAsset(url, filename, callback) {
pdiv.innerHTML = `${filename} - ${loaded}KB / ${total}KB`; pdiv.innerHTML = `${filename} - ${loaded}KB / ${total}KB`;
clearTimeout(abortTimer); clearTimeout(abortTimer);
abortTimer = setTimeout(retry, 3000); abortTimer = setTimeout(retry, 10000);
}; };
xhr.open('GET', url); xhr.open('GET', url);
xhr.send(); xhr.send();
@ -248,7 +231,7 @@ function getLazyAsset(url, filename, callback) {
pdiv.style.opacity = '0.5'; pdiv.style.opacity = '0.5';
}, 100); }, 100);
abortTimer = setTimeout(retry, 3000); abortTimer = setTimeout(retry, 10000);
if (hideTimer) { if (hideTimer) {
clearTimeout(hideTimer); clearTimeout(hideTimer);