artin/EmulatorJS
1
0
Fork 0
mirror of https://github.com/EmulatorJS/EmulatorJS.git synced 2026-02-06 11:17:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to ship retroarch.cfg configurable values

Browse Source
This commit is contained in:
Ethan O'Brien 2024-12-10 09:16:58 -06:00
parent b865862bdb
commit d3fd718a93
2 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
data/src/GameManager.js
View File

@ -119,20 +119,33 @@ class EJS_GameManager {
} catch(e) {}
}
getRetroArchCfg() {
return "autosave_interval = 60\n" +
"screenshot_directory = \"/\"\n" +
"block_sram_overwrite = false\n" +
"video_gpu_screenshot = false\n" +
"audio_latency = 64\n" +
"video_top_portrait_viewport = true\n" +
"video_vsync = true\n" +
"video_smooth = false\n" +
"fastforward_ratio = 3.0\n" +
"slowmotion_ratio = 3.0\n" +
(this.EJS.rewindEnabled ? "rewind_enable = true\n" : "") +
(this.EJS.rewindEnabled ? "rewind_granularity = 6\n" : "") +
"savefile_directory = \"/data/saves\"\n" +
"video_rotation = " + this.EJS.videoRotation + "\n";
let cfg = "autosave_interval = 60\n" +
"screenshot_directory = \"/\"\n" +
"block_sram_overwrite = false\n" +
"video_gpu_screenshot = false\n" +
"audio_latency = 64\n" +
"video_top_portrait_viewport = true\n" +
"video_vsync = true\n" +
"video_smooth = false\n" +
"fastforward_ratio = 3.0\n" +
"slowmotion_ratio = 3.0\n" +
(this.EJS.rewindEnabled ? "rewind_enable = true\n" : "") +
(this.EJS.rewindEnabled ? "rewind_granularity = 6\n" : "") +
"savefile_directory = \"/data/saves\"\n" +
"video_rotation = " + this.EJS.videoRotation + "\n";
if (this.EJS.retroarchOpts && Array.isArray(this.EJS.retroarchOpts)) {
this.EJS.retroarchOpts.forEach(option => {
let selected = this.EJS.preGetSetting(option.name);
console.log(selected);
if (!selected) {
selected = option.default;
}
const value = option.isString === false ? selected : '"' + selected + '"';
cfg += option.name + " = " + value + "\n"
})
}
return cfg;
}
initShaders() {
if (!this.EJS.config.shaders) return;

42
data/src/emulator.js
View File

@ -233,8 +233,8 @@ class EmulatorJS {
this.debug = (window.EJS_DEBUG_XX === true);
if (this.debug || (window.location && ['localhost', '127.0.0.1'].includes(location.hostname))) this.checkForUpdates();
this.netplayEnabled = (window.EJS_DEBUG_XX === true) && (window.EJS_EXPERIMENTAL_NETPLAY === true);
this.settingsLanguage = window.EJS_settingsLanguage || false;
this.config = config;
this.config.settingsLanguage = window.EJS_settingsLanguage || false;
this.currentPopup = null;
this.isFastForward = false;
this.isSlowMotion = false;
@ -546,6 +546,7 @@ class EmulatorJS {
this.coreName = core.name;
this.repository = core.repo;
this.defaultCoreOpts = core.options;
this.retroarchOpts = core.retroarchOpts;
} else if (k === "license.txt") {
this.license = new TextDecoder().decode(data[k]);
}
@ -3851,7 +3852,7 @@ class EmulatorJS {
try {
coreSpecific = JSON.parse(coreSpecific);
if (!coreSpecific || !coreSpecific.settings) {
return false;
return null;
}
return coreSpecific.settings[setting];
} catch (e) {
@ -3861,7 +3862,7 @@ class EmulatorJS {
if (this.config.defaultOptions && this.config.defaultOptions[setting]) {
return this.config.defaultOptions[setting];
}
return false;
return null;
}
loadSettings() {
if (!window.localStorage || this.config.disableLocalStorage) return;
@ -4459,12 +4460,12 @@ class EmulatorJS {
}, 'disabled');
}
const coreOptions = createSettingParent(true, "Core Options", home);
let coreOpts;
try {
coreOpts = this.gameManager.getCoreOptions();
} catch(e){}
if (coreOpts) {
const coreOptions = createSettingParent(true, "Core Options", home);
coreOpts.split('\n').forEach((line, index) => {
let option = line.split('; ');
let name = option[0];
@ -4474,11 +4475,38 @@ class EmulatorJS {
if (options.length === 1) return;
let availableOptions = {};
for (let i=0; i<options.length; i++) {
availableOptions[options[i]] = this.localization(options[i], this.settingsLanguage);
availableOptions[options[i]] = this.localization(options[i], this.config.settingsLanguage);
}
addToMenu(this.localization(optionName, this.settingsLanguage),
addToMenu(this.localization(optionName, this.config.settingsLanguage),
name.split("|")[0], availableOptions,
(name.split("|").length > 1) ? name.split("|")[1] : options[0].replace('(Default) ', ''), coreOptions, true);
(name.split("|").length > 1) ? name.split("|")[1] : options[0].replace('(Default) ', ''),
coreOptions,
true);
})
}
/*
this.retroarchOpts = [
{
title: "Audio Latency", // String
name: "audio_latency", // String - value to be set in retroarch.cfg
// options should ALWAYS be strings here...
options: ["8", "16", "32", "64", "128"], // values
options: {"8": "eight", "16": "sixteen", "32": "thirty-two", "64": "sixty-four", "128": "one hundred-twenty-eight"}, // This also works
default: "128", // Default
isString: false // Surround value with quotes in retroarch.cfg file?
}
];*/
if (this.retroarchOpts && Array.isArray(this.retroarchOpts)) {
const retroarchOptsMenu = createSettingParent(true, "RetroArch Core Options (requires reload)", home);
this.retroarchOpts.forEach(option => {
addToMenu(this.localization(option.title, this.config.settingsLanguage),
option.name,
option.options,
option.default,
retroarchOptsMenu,
true);
})
}