CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 19:24:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3508 from RobLoach/core-switching

Browse Source 
Add Core Switching to Emscripten
This commit is contained in:
Andrés 2016-09-05 00:16:23 -05:00 committed by GitHub
commit 0a06d52f5e
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/emscripten/webplayer.html → pkg/emscripten/index.html
View File

@ -12,8 +12,14 @@
<div class="container">
<a class="navbar-brand" href="#">RetroArch</a>
<ul class="nav navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="#">Gambatte <span class="sr-only">(current)</span></a>
<li class="nav-item gambatte">
<a class="nav-link" href="./?core=gambatte">Gambatte</a>
</li>
<li class="nav-item snes9x2010">
<a class="nav-link" href="./?core=snes9x2010">Snex9x 2010</a>
</li>
<li class="nav-item vba_next">
<a class="nav-link vba_next" href="./?core=vba_next">VBA Next</a>
</li>
</ul>
</div>
@ -28,7 +34,7 @@
<div class="container">
<div class="row">
<div class="col-sm-12 form-group btn-group text-xs-center p-t-2" id="openrom">
<button class="btn btn-primary" id="btnStart" onclick="startRetroArch()">Start RetroArch</button>
<button class="btn btn-primary disabled" id="btnStart" onclick="startRetroArch()">Start RetroArch</button>
<button class="btn btn-secondary" id="btnAuth" onclick="dropboxInit()">Sync DropBox</button>
<button class="btn btn-secondary" id="btnLoad" disabled=true onclick="document.getElementById('rom').click()">Add Content</button>
<input class="btn btn-secondary" style="display: none" type="file" id="rom" name="upload" onclick="document.getElementById('btnLoad').click();" onchange="selectFiles(event.target.files)" multiple />
@ -46,10 +52,9 @@
<script src="//code.jquery.com/jquery-3.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.3.4/js/tether.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.3/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.3/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/dropbox.js/0.10.2/dropbox.min.js"></script>
<script src="browserfs.js"></script>
<script src="webplayer.js"></script>
<script src="gambatte_libretro.js"></script>
</body>
</html>

33
pkg/emscripten/webplayer.js
View File

@ -47,8 +47,8 @@ var showError = function(error) {
function dropboxInit()
{
document.getElementById('btnStart').disabled = true;
document.getElementById('btnAuth').disabled = true;
client.authDriver(new Dropbox.AuthDriver.Redirect());
document.getElementById('btnAuth').disabled = true;
client.authDriver(new Dropbox.AuthDriver.Redirect());
client.authenticate({ rememberUser: true }, function(error, client)
{
if (error)
@ -114,6 +114,15 @@ function setupFileSystem()
}
}
/**
* Retrieve the value of the given GET parameter.
*/
function getParam(name) {
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
if (results) {
return results[1] || null;
}
}
function setupFolderStructure()
{
@ -140,7 +149,7 @@ function stat(path)
function startRetroArch()
{
document.getElementById('canvas_div').style.display = 'block';
document.getElementById('btnLoad').disabled = false;
document.getElementById('btnLoad').disabled = false;
setupFileSystem();
setupFolderStructure();
@ -205,3 +214,21 @@ var Module =
this.totalDependencies = Math.max(this.totalDependencies, left);
}
};
// When the browser has loaded everything.
$(function() {
// Find which core to load.
var core = getParam('core');
if (!core) {
core = 'gambatte';
}
// Show the current core as the active core.
$('.nav-item.' + core).addClass('active');
// Load the Core's related JavaScript.
$.getScript(core + '_libretro.js', function () {
// Activate the Start RetroArch button.
$('#btnStart').removeClass('disabled');
});
});