fixed issue of being able to add a point to draggables twice

This commit is contained in:
Emma 2023-02-07 16:09:45 -07:00
parent ee281b2b19
commit 0d6717896e
2 changed files with 2 additions and 7 deletions

View File

@ -390,6 +390,7 @@ class Doodler {
mouseX = 0; mouseX = 0;
mouseY = 0; mouseY = 0;
registerDraggable(point, radius, style) { registerDraggable(point, radius, style) {
if (this.draggables.find((d)=>d.point === point)) return;
const id = this.addUIElement('circle', point, radius, { const id = this.addUIElement('circle', point, radius, {
fillColor: '#5533ff50', fillColor: '#5533ff50',
strokeColor: '#5533ff50' strokeColor: '#5533ff50'
@ -410,9 +411,6 @@ class Doodler {
this.draggables = this.draggables.filter((d)=>d.point !== point); this.draggables = this.draggables.filter((d)=>d.point !== point);
} }
onClick(e) { onClick(e) {
const rect = this._canvas.getBoundingClientRect();
e.clientX - rect.left;
e.clientY - rect.top;
for (const d of this.draggables){ for (const d of this.draggables){
if (d.point.dist(new Vector(this.mouseX, this.mouseY)) <= d.radius) { if (d.point.dist(new Vector(this.mouseX, this.mouseY)) <= d.radius) {
d.beingDragged = true; d.beingDragged = true;

View File

@ -209,6 +209,7 @@ export class Doodler {
registerDraggable(point: Vector, radius: number, style?: IStyle & { shape: 'square' | 'circle' }) { registerDraggable(point: Vector, radius: number, style?: IStyle & { shape: 'square' | 'circle' }) {
if (this.draggables.find(d => d.point === point)) return;
const id = this.addUIElement('circle', point, radius, { fillColor: '#5533ff50', strokeColor: '#5533ff50' }) const id = this.addUIElement('circle', point, radius, { fillColor: '#5533ff50', strokeColor: '#5533ff50' })
this.draggables.push({ point, radius, style, id }); this.draggables.push({ point, radius, style, id });
} }
@ -222,10 +223,6 @@ export class Doodler {
} }
onClick(e: MouseEvent) { onClick(e: MouseEvent) {
const rect = this._canvas.getBoundingClientRect();
const mouseX = e.clientX - rect.left;
const mouseY = e.clientY - rect.top;
for (const d of this.draggables) { for (const d of this.draggables) {
if (d.point.dist(new Vector(this.mouseX, this.mouseY)) <= d.radius) { if (d.point.dist(new Vector(this.mouseX, this.mouseY)) <= d.radius) {
d.beingDragged = true; d.beingDragged = true;