[common] 设置面板增加 CC_WORKER_AUDIO_SYSTEM_SYNC_INTERVAL 选项

This commit is contained in:
SmallMain 2024-10-30 17:39:35 +08:00
parent 3ffea9ae23
commit e028046dd2
No known key found for this signature in database
2 changed files with 42 additions and 8 deletions

View File

@ -44,6 +44,7 @@ function getSettings() {
CC_WORKER_ASSET_PIPELINE: getMacroBooleanValue(content, "CC_WORKER_ASSET_PIPELINE"), CC_WORKER_ASSET_PIPELINE: getMacroBooleanValue(content, "CC_WORKER_ASSET_PIPELINE"),
CC_WORKER_AUDIO_SYSTEM: getMacroBooleanValue(content, "CC_WORKER_AUDIO_SYSTEM"), CC_WORKER_AUDIO_SYSTEM: getMacroBooleanValue(content, "CC_WORKER_AUDIO_SYSTEM"),
CC_WORKER_SCHEDULER: getMacroBooleanValue(content, "CC_WORKER_SCHEDULER"), CC_WORKER_SCHEDULER: getMacroBooleanValue(content, "CC_WORKER_SCHEDULER"),
CC_WORKER_AUDIO_SYSTEM_SYNC_INTERVAL: getMacroIntegerValue(content, "CC_WORKER_AUDIO_SYSTEM_SYNC_INTERVAL"),
}; };
} }
} }
@ -55,7 +56,7 @@ function syncSettingsToSubWorker() {
for (const key in result) { for (const key in result) {
if (key !== "code") { if (key !== "code") {
content = setMacroBooleanValue(content, key, result[key]); content = setMacroValue(content, key, result[key]);
} }
} }
@ -66,7 +67,7 @@ function syncSettingsToSubWorker() {
function setSettings(macro, value) { function setSettings(macro, value) {
{ {
const content = fs.readFileSync(engineWechatMinigameWorkerMainMacroPath, { encoding: "utf-8" }); const content = fs.readFileSync(engineWechatMinigameWorkerMainMacroPath, { encoding: "utf-8" });
fs.writeFileSync(engineWechatMinigameWorkerMainMacroPath, setMacroBooleanValue(content, macro, value)); fs.writeFileSync(engineWechatMinigameWorkerMainMacroPath, setMacroValue(content, macro, value));
} }
checkAndModifyWorkerFiles(); checkAndModifyWorkerFiles();
@ -79,10 +80,24 @@ function getMacroBooleanValue(text, macro) {
return match ? match[1] === 'true' : null; return match ? match[1] === 'true' : null;
} }
function setMacroBooleanValue(text, macro, value) { function getMacroIntegerValue(text, macro) {
const regex = new RegExp(`globalThis\\.${macro}\\s*=\\s*(true|false);`); const regex = new RegExp(`globalThis\\.${macro}\\s*=\\s*(\\d+);`);
const replacement = `globalThis.${macro} = ${value};`; const match = text.match(regex);
return text.replace(regex, replacement); return match ? parseInt(match[1]) : null;
}
function setMacroValue(text, macro, value) {
if (typeof value === "number") {
const regex = new RegExp(`globalThis\\.${macro}\\s*=\\s*(\\d+);`);
const replacement = `globalThis.${macro} = ${value};`;
return text.replace(regex, replacement);
} else if (typeof value === "boolean") {
const regex = new RegExp(`globalThis\\.${macro}\\s*=\\s*(true|false);`);
const replacement = `globalThis.${macro} = ${value};`;
return text.replace(regex, replacement);
} else {
Editor.error(`setMacroValue: unknown value: ${value}`);
}
} }
function checkAndModifyWorkerFiles() { function checkAndModifyWorkerFiles() {

View File

@ -24,8 +24,13 @@ Editor.Panel.extend({
<ui-prop id="tap" tabindex="-1" name="多线程驱动资源管线" tooltip="启用后将资源管线移至线程中执行,减少由资源下载、缓存与加载导致的卡顿。"> <ui-prop id="tap" tabindex="-1" name="多线程驱动资源管线" tooltip="启用后将资源管线移至线程中执行,减少由资源下载、缓存与加载导致的卡顿。">
<ui-checkbox id="tapc" tabindex="-1"></ui-checkbox> <ui-checkbox id="tapc" tabindex="-1"></ui-checkbox>
</ui-prop> </ui-prop>
<ui-prop id="fs" tabindex="-1" name="多线程驱动音频系统" tooltip="启用后将音频耗时操作移至线程中执行,减少由音频 API 调用导致的卡顿。"> <ui-prop id="fs" tabindex="-1" name="多线程驱动音频系统" tooltip="启用后将音频耗时操作移至线程中执行,减少由音频 API 调用导致的卡顿。" foldable>
<ui-checkbox id="fsc" tabindex="-1"></ui-checkbox> <ui-checkbox id="fsc" tabindex="-1"></ui-checkbox>
<div slot="child">
<ui-prop id="fsi" tabindex="-1" name="属性同步间隔(毫秒)" tooltip="启用后将音频耗时操作移至线程中执行,减少由音频 API 调用导致的卡顿。" indent="1">
<ui-num-input type="int" min="0" value="-1" id="fsii" tabindex="0"></ui-num-input>
</ui-prop>
</div>
</ui-prop> </ui-prop>
<ui-prop id="ts" tabindex="-1" name="线程通信调度器" tooltip="启用后将会对多次数据通信打包发送,这可能会减少因通信次数带来的性能消耗。"> <ui-prop id="ts" tabindex="-1" name="线程通信调度器" tooltip="启用后将会对多次数据通信打包发送,这可能会减少因通信次数带来的性能消耗。">
<ui-checkbox id="tsc" tabindex="-1"></ui-checkbox> <ui-checkbox id="tsc" tabindex="-1"></ui-checkbox>
@ -44,6 +49,8 @@ Editor.Panel.extend({
thread_asset_pipeline_checkbox: '#tapc', thread_asset_pipeline_checkbox: '#tapc',
thread_audio_system: '#fs', thread_audio_system: '#fs',
thread_audio_system_checkbox: '#fsc', thread_audio_system_checkbox: '#fsc',
thread_audio_system_interval: '#fsi',
thread_audio_system_interval_input: '#fsii',
thread_scheduler: '#ts', thread_scheduler: '#ts',
thread_scheduler_checkbox: '#tsc', thread_scheduler_checkbox: '#tsc',
}, },
@ -63,6 +70,7 @@ Editor.Panel.extend({
this.$thread_debug_checkbox.checked = data.CC_WORKER_DEBUG; this.$thread_debug_checkbox.checked = data.CC_WORKER_DEBUG;
this.$thread_asset_pipeline_checkbox.checked = data.CC_WORKER_ASSET_PIPELINE; this.$thread_asset_pipeline_checkbox.checked = data.CC_WORKER_ASSET_PIPELINE;
this.$thread_audio_system_checkbox.checked = data.CC_WORKER_AUDIO_SYSTEM; this.$thread_audio_system_checkbox.checked = data.CC_WORKER_AUDIO_SYSTEM;
this.$thread_audio_system_interval_input.value = data.CC_WORKER_AUDIO_SYSTEM_SYNC_INTERVAL;
this.$thread_scheduler_checkbox.checked = data.CC_WORKER_SCHEDULER; this.$thread_scheduler_checkbox.checked = data.CC_WORKER_SCHEDULER;
this.$thread_debug_checkbox.addEventListener('change', () => { this.$thread_debug_checkbox.addEventListener('change', () => {
@ -73,8 +81,19 @@ Editor.Panel.extend({
this.setSettings("CC_WORKER_ASSET_PIPELINE", this.$thread_asset_pipeline_checkbox.checked); this.setSettings("CC_WORKER_ASSET_PIPELINE", this.$thread_asset_pipeline_checkbox.checked);
}); });
const onAudioSystemEnableChange = (enabled) => {
this.$thread_audio_system_interval_input.disabled = !enabled;
};
onAudioSystemEnableChange(this.$thread_asset_pipeline_checkbox.checked);
this.$thread_audio_system_checkbox.addEventListener('change', () => { this.$thread_audio_system_checkbox.addEventListener('change', () => {
this.setSettings("CC_WORKER_AUDIO_SYSTEM", this.$thread_audio_system_checkbox.checked); const enabled = this.$thread_audio_system_checkbox.checked;
onAudioSystemEnableChange(enabled);
this.setSettings("CC_WORKER_AUDIO_SYSTEM", enabled);
});
this.$thread_audio_system_interval_input.addEventListener('confirm', () => {
this.setSettings("CC_WORKER_AUDIO_SYSTEM_SYNC_INTERVAL", this.$thread_audio_system_interval_input.value);
}); });
this.$thread_scheduler_checkbox.addEventListener('change', () => { this.$thread_scheduler_checkbox.addEventListener('change', () => {