Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 22:58:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added thread status display to the thread select dropdown.

Browse Source
This commit is contained in:
jtuu 2020-04-28 00:23:41 +03:00
parent 876a4687a1
commit 5bf2af14c6
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/quest_editor/QuestRunner.ts
View File

@ -73,6 +73,7 @@ export class QuestRunner {
private readonly _debugging_thread_id: WritableProperty<number | undefined> = property(
undefined,
);
private readonly _active_thread_id: WritableProperty<number | undefined> = property(undefined);
private readonly debugger: Debugger;
@ -96,6 +97,7 @@ export class QuestRunner {
readonly pause_location: Property<number | undefined> = this._pause_location;
readonly thread_ids: ListProperty<number> = this._thread_ids;
readonly debugging_thread_id: Property<number | undefined> = this._debugging_thread_id;
readonly active_thread_id: Property<number | undefined> = this._active_thread_id;
get game_state(): GameState {
return this._game_state;
@ -168,6 +170,7 @@ export class QuestRunner {
this._state.val = QuestRunnerState.Stopped;
this._pause_location.val = undefined;
this._debugging_thread_id.val = undefined;
this._active_thread_id.val = undefined;
this._thread_ids.clear();
this.npcs.splice(0, this.npcs.length);
this.objects.splice(0, this.objects.length);
@ -326,8 +329,9 @@ export class QuestRunner {
};
private update_thread_info(): void {
this._thread_ids.splice(0, this._thread_ids.length.val, ...this.vm.get_thread_ids());
this._debugging_thread_id.val = this.vm.get_debugging_thread_id();
this._active_thread_id.val = this.vm.get_current_thread_id();
this._thread_ids.splice(0, this._thread_ids.length.val, ...this.vm.get_thread_ids());
}
private create_vm_io = (): VirtualMachineIO => {

2
src/quest_editor/controllers/QuestEditorToolBarController.ts
View File

@ -57,6 +57,7 @@ export class QuestEditorToolBarController extends Controller {
readonly can_stop: Property<boolean>;
readonly thread_ids: ListProperty<number>;
readonly debugging_thread_id: Property<number | undefined>;
readonly active_thread_id: Property<number | undefined>;
readonly can_select_thread: Property<boolean>;
readonly save_as_dialog_visible: Property<boolean> = this._save_as_dialog_visible;
readonly filename: Property<string> = this._filename;
@ -121,6 +122,7 @@ export class QuestEditorToolBarController extends Controller {
this.thread_ids = quest_editor_store.quest_runner.thread_ids;
this.debugging_thread_id = quest_editor_store.quest_runner.debugging_thread_id;
this.active_thread_id = quest_editor_store.quest_runner.active_thread_id;
this.can_select_thread = quest_editor_store.quest_runner.thread_ids.map(
ids => ids.length > 0 && quest_editor_store.quest_runner.running.val,
);

9
src/quest_editor/gui/QuestEditorToolBarView.ts
View File

@ -113,7 +113,10 @@ export class QuestEditorToolBarView extends View {
const thread_select = this.disposable(
new Select({
items: ctrl.thread_ids,
to_label: num => "Thread #" + num,
to_label: id => {
const status = ctrl.active_thread_id.val === id ? "Active" : "Yielded";
return `Thread #${id} (${status})`;
},
}),
);
@ -238,7 +241,9 @@ export class QuestEditorToolBarView extends View {
stop_button.enabled.bind_to(ctrl.can_stop),
thread_select.selected.observe(({ value }) => ctrl.select_thread(value!)),
thread_select.selected.bind_to(ctrl.debugging_thread_id),
thread_select.selected.bind_to(
ctrl.active_thread_id.map(_ => ctrl.debugging_thread_id.val),
),
thread_select.enabled.bind_to(ctrl.can_select_thread),
dialog.ondismiss.observe(ctrl.dismiss_result_dialog),