The selected entity can now be deleted with the delete key.

FEATURES.md

@@ -57,10 +57,12 @@ Features that are in ***bold italics*** are planned and not yet implemented.
     - ***MVP: a single line***
 - ***Show positions and radii from the relevant script instructions***
 
-## NPC/object manipulation
+## NPC/Object Manipulation
 
-- ***Creation***
+- Creation
-- ***Deletion***
+    - Drag and drop from a list of NPCs/objects
+- Deletion
+    - "Delete" key binding
 - Translation
     - Via 3D view
     - Via entity view

src/quest_editor/actions/RemoveEntityAction.ts

@@ -0,0 +1,30 @@
+import { Action } from "../../core/undo/Action";
+import { QuestEntityModel } from "../model/QuestEntityModel";
+import { entity_data } from "../../core/data_formats/parsing/quest/entities";
+import { quest_editor_store } from "../stores/QuestEditorStore";
+
+export class RemoveEntityAction implements Action {
+    readonly description: string;
+
+    constructor(private entity: QuestEntityModel) {
+        this.description = `Delete ${entity_data(entity.type).name}`;
+    }
+
+    undo(): void {
+        const quest = quest_editor_store.current_quest.val;
+
+        if (quest) {
+            quest.add_entity(this.entity);
+
+            quest_editor_store.set_selected_entity(this.entity);
+        }
+    }
+
+    redo(): void {
+        const quest = quest_editor_store.current_quest.val;
+
+        if (quest) {
+            quest.remove_entity(this.entity);
+        }
+    }
+}

src/quest_editor/gui/EntityInfoView.ts

@@ -163,7 +163,7 @@ export class EntityInfoView extends ResizableWidget {
             ),
 
             x_input.value.observe(({ value }) =>
-                quest_editor_store.push_translate_entity_action(
+                quest_editor_store.translate_entity(
                     entity,
                     entity.section.val,
                     entity.section.val,
@@ -174,7 +174,7 @@ export class EntityInfoView extends ResizableWidget {
             ),
 
             y_input.value.observe(({ value }) =>
-                quest_editor_store.push_translate_entity_action(
+                quest_editor_store.translate_entity(
                     entity,
                     entity.section.val,
                     entity.section.val,
@@ -185,7 +185,7 @@ export class EntityInfoView extends ResizableWidget {
             ),
 
             z_input.value.observe(({ value }) =>
-                quest_editor_store.push_translate_entity_action(
+                quest_editor_store.translate_entity(
                     entity,
                     entity.section.val,
                     entity.section.val,

src/quest_editor/gui/QuestInfoView.ts

@@ -74,19 +74,19 @@ export class QuestInfoView extends ResizableWidget {
                 if (q) {
                     this.quest_disposer.add_all(
                         this.id_input.value.bind_to(q.id),
-                        this.id_input.value.observe(quest_editor_store.push_edit_id_action),
+                        this.id_input.value.observe(quest_editor_store.id_changed),
 
                         this.name_input.value.bind_to(q.name),
-                        this.name_input.value.observe(quest_editor_store.push_edit_name_action),
+                        this.name_input.value.observe(quest_editor_store.name_changed),
 
                         this.short_description_input.value.bind_to(q.short_description),
                         this.short_description_input.value.observe(
-                            quest_editor_store.push_edit_short_description_action,
+                            quest_editor_store.short_description_changed,
                         ),
 
                         this.long_description_input.value.bind_to(q.long_description),
                         this.long_description_input.value.observe(
-                            quest_editor_store.push_edit_long_description_action,
+                            quest_editor_store.long_description_changed,
                         ),
                     );
                 }

src/quest_editor/rendering/QuestEntityControls.ts

@@ -93,6 +93,7 @@ export class QuestEntityControls implements Disposable {
 
         renderer.dom_element.addEventListener("mousedown", this.mousedown);
         renderer.dom_element.addEventListener("mousemove", this.mousemove);
+        renderer.dom_element.addEventListener("keyup", this.keyup);
         add_entity_dnd_listener(renderer.dom_element, "dragenter", this.dragenter);
         add_entity_dnd_listener(renderer.dom_element, "dragover", this.dragover);
         add_entity_dnd_listener(renderer.dom_element, "dragleave", this.dragleave);
@@ -104,6 +105,7 @@ export class QuestEntityControls implements Disposable {
         this.renderer.dom_element.removeEventListener("mousemove", this.mousemove);
         document.removeEventListener("mousemove", this.doc_mousemove);
         document.removeEventListener("mouseup", this.doc_mouseup);
+        this.renderer.dom_element.removeEventListener("keyup", this.keyup);
         remove_entity_dnd_listener(this.renderer.dom_element, "dragenter", this.dragenter);
         remove_entity_dnd_listener(this.renderer.dom_element, "dragover", this.dragover);
         remove_entity_dnd_listener(this.renderer.dom_element, "dragleave", this.dragleave);
@@ -191,6 +193,14 @@ export class QuestEntityControls implements Disposable {
         this.renderer.schedule_render();
     };
 
+    private keyup = (e: KeyboardEvent) => {
+        const entity = quest_editor_store.selected_entity.val;
+
+        if (entity && e.key === "Delete") {
+            quest_editor_store.remove_entity(entity);
+        }
+    };
+
     private dragenter = (e: EntityDragEvent) => {
         this.process_event(e.event);
 
@@ -461,7 +471,7 @@ export class QuestEntityControls implements Disposable {
             this.pick.mode === PickMode.Transforming
         ) {
             const entity = this.selected.entity;
-            quest_editor_store.push_translate_entity_action(
+            quest_editor_store.translate_entity(
                 entity,
                 this.pick.initial_section,
                 entity.section.val,

src/quest_editor/rendering/QuestRenderer.ts

@@ -63,7 +63,6 @@ export class QuestRenderer extends Renderer {
         // listener registration. This is a fragile work-around for the fact that camera-controls
         // doesn't support intercepting pointer events.
         this.init_camera_controls();
-
     }
 
     dispose(): void {

src/quest_editor/stores/QuestEditorStore.ts

@@ -24,8 +24,9 @@ import { EditNameAction } from "../actions/EditNameAction";
 import { EditIdAction } from "../actions/EditIdAction";
 import { Episode } from "../../core/data_formats/parsing/quest/Episode";
 import { create_new_quest } from "./quest_creation";
-import Logger = require("js-logger");
 import { CreateEntityAction } from "../actions/CreateEntityAction";
+import { RemoveEntityAction } from "../actions/RemoveEntityAction";
+import Logger = require("js-logger");
 
 const logger = Logger.get("quest_editor/gui/QuestEditorStore");
 
@@ -224,31 +225,31 @@ export class QuestEditorStore implements Disposable {
         document.body.removeChild(a);
     };
 
-    push_edit_id_action = (event: PropertyChangeEvent<number>) => {
+    id_changed = (event: PropertyChangeEvent<number>) => {
         if (this.current_quest.val) {
             this.undo.push(new EditIdAction(this.current_quest.val, event)).redo();
         }
     };
 
-    push_edit_name_action = (event: PropertyChangeEvent<string>) => {
+    name_changed = (event: PropertyChangeEvent<string>) => {
         if (this.current_quest.val) {
             this.undo.push(new EditNameAction(this.current_quest.val, event)).redo();
         }
     };
 
-    push_edit_short_description_action = (event: PropertyChangeEvent<string>) => {
+    short_description_changed = (event: PropertyChangeEvent<string>) => {
         if (this.current_quest.val) {
             this.undo.push(new EditShortDescriptionAction(this.current_quest.val, event)).redo();
         }
     };
 
-    push_edit_long_description_action = (event: PropertyChangeEvent<string>) => {
+    long_description_changed = (event: PropertyChangeEvent<string>) => {
         if (this.current_quest.val) {
             this.undo.push(new EditLongDescriptionAction(this.current_quest.val, event)).redo();
         }
     };
 
-    push_translate_entity_action = (
+    translate_entity = (
         entity: QuestEntityModel,
         old_section: SectionModel | undefined,
         new_section: SectionModel | undefined,
@@ -274,6 +275,10 @@ export class QuestEditorStore implements Disposable {
         this.undo.push(new CreateEntityAction(entity));
     };
 
+    remove_entity = (entity: QuestEntityModel) => {
+        this.undo.push(new RemoveEntityAction(entity)).redo();
+    };
+
     private async set_quest(quest?: QuestModel, filename?: string): Promise<void> {
         this.undo.reset();