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

Fixed regression: hovered entities are now highlighted again.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-09-21 19:03:30 +02:00
parent dbb5b65b74
commit 3d9b003e39
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/quest_editor/rendering/QuestEntityControls.ts
View File

@ -91,6 +91,7 @@ export class QuestEntityControls implements Disposable {
); );
renderer.dom_element.addEventListener("mousedown", this.mousedown); renderer.dom_element.addEventListener("mousedown", this.mousedown);
renderer.dom_element.addEventListener("mousemove", this.mousemove);
add_entity_dnd_listener(renderer.dom_element, "dragenter", this.dragenter); 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, "dragover", this.dragover);
add_entity_dnd_listener(renderer.dom_element, "dragleave", this.dragleave); add_entity_dnd_listener(renderer.dom_element, "dragleave", this.dragleave);
@ -99,6 +100,7 @@ export class QuestEntityControls implements Disposable {
dispose(): void { dispose(): void {
this.renderer.dom_element.removeEventListener("mousedown", this.mousedown); this.renderer.dom_element.removeEventListener("mousedown", this.mousedown);
this.renderer.dom_element.removeEventListener("mousemove", this.mousemove);
document.removeEventListener("mousemove", this.doc_mousemove); document.removeEventListener("mousemove", this.doc_mousemove);
document.removeEventListener("mouseup", this.doc_mouseup); document.removeEventListener("mouseup", this.doc_mouseup);
remove_entity_dnd_listener(this.renderer.dom_element, "dragenter", this.dragenter); remove_entity_dnd_listener(this.renderer.dom_element, "dragenter", this.dragenter);
@ -128,6 +130,7 @@ export class QuestEntityControls implements Disposable {
private mousedown = (e: MouseEvent) => { private mousedown = (e: MouseEvent) => {
this.process_event(e); this.process_event(e);
this.renderer.dom_element.removeEventListener("mousemove", this.mousemove);
document.addEventListener("mouseup", this.doc_mouseup); document.addEventListener("mouseup", this.doc_mouseup);
document.addEventListener("mousemove", this.doc_mousemove); document.addEventListener("mousemove", this.doc_mousemove);
@ -148,22 +151,22 @@ export class QuestEntityControls implements Disposable {
this.renderer.schedule_render(); this.renderer.schedule_render();
}; };
private mousemove = (e: MouseEvent) => {
this.process_event(e);
if (!this.selected || !this.pick) {
// User is hovering.
this.mark_hovered(this.pick_entity(this.pointer_device_position));
}
};
private doc_mousemove = (e: MouseEvent) => { private doc_mousemove = (e: MouseEvent) => {
this.process_event(e); this.process_event(e);
if (this.selected && this.pick) { if (this.selected && this.pick && this.moved_since_last_mouse_down) {
if (this.moved_since_last_mouse_down) { // User is transforming selected entity.
// User is transforming selected entity. if (e.buttons === 1) {
if (e.buttons === 1) { this.translate_entity(e, this.selected, this.pick);
this.translate_entity(e, this.selected, this.pick);
}
}
} else {
// User is hovering.
const new_pick = this.pick_entity(this.pointer_device_position);
if (this.mark_hovered(new_pick)) {
this.renderer.schedule_render();
} }
} }
}; };
@ -171,6 +174,7 @@ export class QuestEntityControls implements Disposable {
private doc_mouseup = (e: MouseEvent) => { private doc_mouseup = (e: MouseEvent) => {
this.process_event(e); this.process_event(e);
this.renderer.dom_element.addEventListener("mousemove", this.mousemove);
document.removeEventListener("mousemove", this.doc_mousemove); document.removeEventListener("mousemove", this.doc_mousemove);
document.removeEventListener("mouseup", this.doc_mouseup); document.removeEventListener("mouseup", this.doc_mouseup);
@ -297,12 +301,7 @@ export class QuestEntityControls implements Disposable {
this.last_pointer_position.copy(this.pointer_position); this.last_pointer_position.copy(this.pointer_position);
} }
/** private mark_hovered(selection?: Highlighted): void {
* @returns true if a render is required.
*/
private mark_hovered(selection?: Highlighted): boolean {
let render_required = false;
if (!this.selected || !selection_equals(selection, this.selected)) { if (!this.selected || !selection_equals(selection, this.selected)) {
if (!selection_equals(selection, this.hovered)) { if (!selection_equals(selection, this.hovered)) {
if (this.hovered) { if (this.hovered) {
@ -314,13 +313,11 @@ export class QuestEntityControls implements Disposable {
set_color(selection, ColorType.Hovered); set_color(selection, ColorType.Hovered);
} }
render_required = true; this.renderer.schedule_render();
} }
this.hovered = selection; this.hovered = selection;
} }
return render_required;
} }
private select(selection: Highlighted): void { private select(selection: Highlighted): void {