Michel2/emularity
1
0
Fork 0
mirror of https://github.com/db48x/emularity.git synced 2026-09-15 11:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

address minor review comments by Alex Vincent

Browse Source
This commit is contained in:
Daniel Brooks
2015-06-24 18:49:18 -07:00
parent 66073a79f4
commit a4bc4aa748
1 changed files with 182 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader.js
+182 -161
View File
@@ -1,6 +1,9 @@
var Module = null;
(function (Promise) {
/**
* IALoader
*/
function IALoader(canvas, game, callbacks, scale) {
// IA actually gives us an object here, and we really ought to be
// looking things up from it instead.
@@ -278,6 +281,9 @@ var Module = null;
return emulator;
}
/**
* BaseLoader
*/
function BaseLoader() {
return Array.prototype.reduce.call(arguments, extend);
}
@@ -355,6 +361,9 @@ var Module = null;
return { emulatorStart: path };
};
/**
* JSMESSLoader
*/
function JSMESSLoader() {
var config = Array.prototype.reduce.call(arguments, extend);
config.emulator_arguments = build_mess_arguments(config.muted, config.mess_driver,
@@ -377,6 +386,9 @@ var Module = null;
return { extra_mess_args: args };
};
/**
* JSMAMELoader
*/
function JSMAMELoader() {
var config = Array.prototype.reduce.call(arguments, extend);
config.emulator_arguments = build_mame_arguments(config.muted, config.mess_driver,
@@ -468,6 +480,9 @@ var Module = null;
return args;
};
/**
* Emulator
*/
function Emulator(canvas, callbacks, loadFiles) {
if (typeof callbacks !== 'object') {
callbacks = { before_emulator: null,
@@ -507,8 +522,9 @@ var Module = null;
// the same size that dosbox/jsmess will set it to, but it avoids
// the case where the size was left at the default 300x150
if (!canvas.hasAttribute("width")) {
canvas.width = parseInt(getComputedStyle(canvas).width, 10);
canvas.height = parseInt(getComputedStyle(canvas).height, 10);
var style = getComputedStyle(canvas);
canvas.width = parseInt(style.width, 10);
canvas.height = parseInt(style.height, 10);
}
this.setScale = function(_scale) {
@@ -774,7 +790,7 @@ var Module = null;
return new Promise(function (resolve, reject) {
var xhr = new XMLHttpRequest();
xhr.open('GET', url, true);
xhr.responseType = rt ? rt : 'arraybuffer';
xhr.responseType = rt || 'arraybuffer';
xhr.onprogress = function (e) {
titleCell.textContent = title +" "+ formatSize(e);
};
@@ -828,13 +844,16 @@ var Module = null;
var resizeCanvas = function (canvas, scale, resolution, aspectRatio) {
if (scale && resolution) {
canvas.style.imageRendering = 'optimizeSpeed';
// optimizeSpeed is the standardized value. different
// browsers support different values; they will all ignore
// values that they don't understand.
canvas.style.imageRendering = '-moz-crisp-edges';
canvas.style.imageRendering = '-o-crisp-edges';
canvas.style.imageRendering = '-webkit-optimize-contrast';
canvas.style.imageRendering = 'optimize-contrast';
canvas.style.imageRendering = 'crisp-edges';
canvas.style.imageRendering = 'pixelated';
canvas.style.imageRendering = 'optimizeSpeed';
canvas.style.width = resolution.width * scale +'px';
canvas.style.height = resolution.height * scale +'px';
@@ -982,9 +1001,8 @@ var Module = null;
* moving the page while the user is playing.
*/
function blockSomeKeys() {
var blocked_keys = [33, 34, 35, 36, 37, 38, 39, 40];
function keypress (e) {
if (blocked_keys.indexOf(e.which) >= 0) {
if (e.which >= 33 && e.which <= 40) {
e.preventDefault();
return false;
}
@@ -1007,6 +1025,9 @@ var Module = null;
}
};
/**
* misc
*/
function BFSOpenZip(loadedData) {
return new BrowserFS.FileSystem.ZipFS(loadedData);
};
@@ -1091,6 +1112,161 @@ var Module = null;
return b;
}
function setup_jsmess_webaudio() {
// jsmess web audio backend v0.2
// katelyn gadd - kg at luminance dot org ; @antumbral on twitter
var jsmess_web_audio = (function () {
var context = null;
var gain_node = null;
var buffer_insert_point = null;
var pending_buffers = [];
var numChannels = 2; // constant in jsmess
var sampleScale = 32766;
var prebufferDuration = 100 / 1000;
function lazy_init () {
if (context || typeof AudioContext == 'undefined')
return;
context = new AudioContext();
gain_node = context.createGain();
gain_node.gain.value = 1.0;
gain_node.connect(context.destination);
};
function set_mastervolume (
// even though it's 'attenuation' the value is negative, so...
attenuation_in_decibels
) {
lazy_init();
if (!context) return;
// http://stackoverflow.com/questions/22604500/web-audio-api-working-with-decibels
// seemingly incorrect/broken. figures. welcome to Web Audio
// var gain_web_audio = 1.0 - Math.pow(10, 10 / attenuation_in_decibels);
// HACK: Max attenuation in JSMESS appears to be 32.
// Hit ' then left/right arrow to test.
// FIXME: This is linear instead of log10 scale.
var gain_web_audio = 1.0 + (+attenuation_in_decibels / +32);
if (gain_web_audio < +0)
gain_web_audio = +0;
else if (gain_web_audio > +1)
gain_web_audio = +1;
gain_node.gain.value = gain_web_audio;
};
function update_audio_stream (
pBuffer, // pointer into emscripten heap. int16 samples
samples_this_frame // int. number of samples at pBuffer address.
) {
lazy_init();
if (!context) return;
var buffer = context.createBuffer(
numChannels, samples_this_frame,
// JSMESS already initializes its mixer to use the context sampling rate.
context.sampleRate
);
for (
var channel_left = buffer.getChannelData(0),
channel_right = buffer.getChannelData(1),
i = 0,
l = samples_this_frame | 0;
i < l;
i++
) {
var offset =
// divide by sizeof(INT16) since pBuffer is offset
// in bytes
((pBuffer / 2) | 0) +
((i * 2) | 0);
var left_sample = HEAP16[offset];
var right_sample = HEAP16[(offset + 1) | 0];
// normalize from signed int16 to signed float
var left_sample_float = left_sample / sampleScale;
var right_sample_float = right_sample / sampleScale;
channel_left[i] = left_sample_float;
channel_right[i] = right_sample_float;
}
pending_buffers.push(buffer);
tick();
};
function tick () {
// Note: this is the time the web audio mixer has mixed up to,
// not the actual current time.
var now = context.currentTime;
// prebuffering
if (buffer_insert_point === null) {
var total_buffered_seconds = 0;
for (var i = 0, l = pending_buffers.length; i < l; i++) {
var buffer = pending_buffers[i];
total_buffered_seconds += buffer.duration;
}
// Buffer not full enough? abort
if (total_buffered_seconds < prebufferDuration)
return;
}
// FIXME/TODO: It's possible for us to burn through the whole
// chunk of prebuffered audio. At that point it seems like
// JSMESS never catches up and our sound glitches forever.
var insert_point = (buffer_insert_point === null)
? now
: buffer_insert_point;
if (pending_buffers.length) {
for (var i = 0, l = pending_buffers.length; i < l; i++) {
var buffer = pending_buffers[i];
var source_node = context.createBufferSource();
source_node.buffer = buffer;
source_node.connect(gain_node);
source_node.start(insert_point);
insert_point += buffer.duration;
}
pending_buffers.length = 0;
buffer_insert_point = insert_point;
if (buffer_insert_point <= now)
buffer_insert_point = now;
}
};
function get_context() {
return context;
};
return {
set_mastervolume: set_mastervolume,
update_audio_stream: update_audio_stream,
get_context: get_context
};
})();
window.jsmess_set_mastervolume = jsmess_web_audio.set_mastervolume;
window.jsmess_update_audio_stream = jsmess_web_audio.update_audio_stream;
window.jsmess_web_audio = jsmess_web_audio;
}
window.IALoader = IALoader;
window.DosBoxLoader = DosBoxLoader;
window.JSMESSLoader = JSMESSLoader;
@@ -1101,158 +1277,3 @@ var Module = null;
// legacy
var JSMESS = JSMESS || {};
JSMESS.ready = function (f) { f(); };
function setup_jsmess_webaudio() {
// jsmess web audio backend v0.2
// katelyn gadd - kg at luminance dot org ; @antumbral on twitter
var jsmess_web_audio = (function () {
var context = null;
var gain_node = null;
var buffer_insert_point = null;
var pending_buffers = [];
var numChannels = 2; // constant in jsmess
var sampleScale = 32766;
var prebufferDuration = 100 / 1000;
function lazy_init () {
if (context || typeof AudioContext == 'undefined')
return;
context = new AudioContext();
gain_node = context.createGain();
gain_node.gain.value = 1.0;
gain_node.connect(context.destination);
};
function set_mastervolume (
// even though it's 'attenuation' the value is negative, so...
attenuation_in_decibels
) {
lazy_init();
if (!context) return;
// http://stackoverflow.com/questions/22604500/web-audio-api-working-with-decibels
// seemingly incorrect/broken. figures. welcome to Web Audio
// var gain_web_audio = 1.0 - Math.pow(10, 10 / attenuation_in_decibels);
// HACK: Max attenuation in JSMESS appears to be 32.
// Hit ' then left/right arrow to test.
// FIXME: This is linear instead of log10 scale.
var gain_web_audio = 1.0 + (+attenuation_in_decibels / +32);
if (gain_web_audio < +0)
gain_web_audio = +0;
else if (gain_web_audio > +1)
gain_web_audio = +1;
gain_node.gain.value = gain_web_audio;
};
function update_audio_stream (
pBuffer, // pointer into emscripten heap. int16 samples
samples_this_frame // int. number of samples at pBuffer address.
) {
lazy_init();
if (!context) return;
var buffer = context.createBuffer(
numChannels, samples_this_frame,
// JSMESS already initializes its mixer to use the context sampling rate.
context.sampleRate
);
for (
var channel_left = buffer.getChannelData(0),
channel_right = buffer.getChannelData(1),
i = 0,
l = samples_this_frame | 0;
i < l;
i++
) {
var offset =
// divide by sizeof(INT16) since pBuffer is offset
// in bytes
((pBuffer / 2) | 0) +
((i * 2) | 0);
var left_sample = HEAP16[offset];
var right_sample = HEAP16[(offset + 1) | 0];
// normalize from signed int16 to signed float
var left_sample_float = left_sample / sampleScale;
var right_sample_float = right_sample / sampleScale;
channel_left[i] = left_sample_float;
channel_right[i] = right_sample_float;
}
pending_buffers.push(buffer);
tick();
};
function tick () {
// Note: this is the time the web audio mixer has mixed up to,
// not the actual current time.
var now = context.currentTime;
// prebuffering
if (buffer_insert_point === null) {
var total_buffered_seconds = 0;
for (var i = 0, l = pending_buffers.length; i < l; i++) {
var buffer = pending_buffers[i];
total_buffered_seconds += buffer.duration;
}
// Buffer not full enough? abort
if (total_buffered_seconds < prebufferDuration)
return;
}
// FIXME/TODO: It's possible for us to burn through the whole
// chunk of prebuffered audio. At that point it seems like
// JSMESS never catches up and our sound glitches forever.
var insert_point = (buffer_insert_point === null)
? now
: buffer_insert_point;
if (pending_buffers.length) {
for (var i = 0, l = pending_buffers.length; i < l; i++) {
var buffer = pending_buffers[i];
var source_node = context.createBufferSource();
source_node.buffer = buffer;
source_node.connect(gain_node);
source_node.start(insert_point);
insert_point += buffer.duration;
}
pending_buffers.length = 0;
buffer_insert_point = insert_point;
if (buffer_insert_point <= now)
buffer_insert_point = now;
}
};
function get_context() {
return context;
};
return {
set_mastervolume: set_mastervolume,
update_audio_stream: update_audio_stream,
get_context: get_context
};
})();
window.jsmess_set_mastervolume = jsmess_web_audio.set_mastervolume;
window.jsmess_update_audio_stream = jsmess_web_audio.update_audio_stream;
window.jsmess_web_audio = jsmess_web_audio;
}