5 Commits

Author SHA1 Message Date
Emma
3544b7eae4 unregister 2023-02-10 07:38:57 -07:00
Emma
ff463c6cee more methods return this 2023-02-10 07:24:02 -07:00
Emma
6530b928f5 Clickables 2023-02-10 07:16:47 -07:00
Emma
32365812df I'm dumb 2023-02-08 01:25:29 -07:00
Emma
880c0be4f1 added drag start and end events 2023-02-08 01:20:37 -07:00
3 changed files with 72 additions and 12 deletions

View File

@@ -410,16 +410,25 @@ class Doodler {
} }
this.draggables = this.draggables.filter((d)=>d.point !== point); this.draggables = this.draggables.filter((d)=>d.point !== point);
} }
addDragEvents({ onDragEnd , onDragStart , point }) {
const d = this.draggables.find((d)=>d.point === point);
if (d) {
d.onDragEnd = onDragEnd;
d.onDragStart = onDragStart;
}
}
onClick(e) { onClick(e) {
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;
d.onDragStart?.call(null);
} else d.beingDragged = false; } else d.beingDragged = false;
} }
} }
offClick(e) { offClick(e) {
for (const d of this.draggables){ for (const d of this.draggables){
d.beingDragged = false; d.beingDragged = false;
d.onDragEnd?.call(null);
} }
} }
uiElements = new Map(); uiElements = new Map();

View File

@@ -37,6 +37,7 @@ export class Doodler {
} }
private draggables: Draggable[] = []; private draggables: Draggable[] = [];
private clickables: Clickable[] = [];
constructor({ constructor({
width, width,
@@ -222,17 +223,54 @@ export class Doodler {
this.draggables = this.draggables.filter(d => d.point !== point); this.draggables = this.draggables.filter(d => d.point !== point);
} }
registerClickable(p1: Vector, p2: Vector, cb: () => void) {
const top = Math.min(p1.y, p2.y);
const left = Math.min(p1.x, p2.x);
const bottom = Math.max(p1.y, p2.y);
const right = Math.max(p1.x, p2.x);
this.clickables.push({
onClick: cb,
checkBound: (p) => p.y >= top && p.x >= left && p.y <= bottom && p.x <= right
})
}
unregisterClickable(cb: () => void) {
this.clickables = this.clickables.filter(c => c.onClick !== cb);
}
addDragEvents({
onDragEnd,
onDragStart,
point
}: { point: Vector, onDragEnd?: () => void, onDragStart?: () => void }) {
const d = this.draggables.find(d => d.point === point);
if (d) {
d.onDragEnd = onDragEnd;
d.onDragStart = onDragStart;
}
}
onClick(e: MouseEvent) { onClick(e: MouseEvent) {
const mouse = new Vector(this.mouseX, this.mouseY)
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(mouse) <= d.radius) {
d.beingDragged = true; d.beingDragged = true;
d.onDragStart?.call(null);
} else d.beingDragged = false; } else d.beingDragged = false;
} }
for (const c of this.clickables) {
if (c.checkBound(mouse)) {
c.onClick();
}
}
} }
offClick(e: MouseEvent) { offClick(e: MouseEvent) {
for (const d of this.draggables) { for (const d of this.draggables) {
d.beingDragged = false; d.beingDragged = false;
d.onDragEnd?.call(null);
} }
} }
@@ -296,6 +334,13 @@ type Draggable = {
style?: IStyle & { shape: 'square' | 'circle' }; style?: IStyle & { shape: 'square' | 'circle' };
beingDragged?: boolean; beingDragged?: boolean;
id: string; id: string;
onDragStart?: () => void;
onDragEnd?: () => void;
}
type Clickable = {
onClick: () => void;
checkBound: (p: Vector) => boolean;
} }
type uiDrawing = { type uiDrawing = {

View File

@@ -56,9 +56,9 @@ export class Vector {
return v; return v;
} }
} }
add(x: number, y: number, z: number): void; add(x: number, y: number, z: number): Vector;
add(x: number, y: number): void; add(x: number, y: number): Vector;
add(v: Vector): void; add(v: Vector): Vector;
add(v: Vector | number, y?: number, z?: number) { add(v: Vector | number, y?: number, z?: number) {
if (arguments.length === 1 && typeof v !== 'number') { if (arguments.length === 1 && typeof v !== 'number') {
this.x += v.x; this.x += v.x;
@@ -73,10 +73,11 @@ export class Vector {
this.y += y ?? 0; this.y += y ?? 0;
this.z += z ?? 0; this.z += z ?? 0;
} }
return this;
} }
sub(x: number, y: number, z: number): void; sub(x: number, y: number, z: number): Vector;
sub(x: number, y: number): void; sub(x: number, y: number): Vector;
sub(v: Vector): void; sub(v: Vector): Vector;
sub(v: Vector | number, y?: number, z?: number) { sub(v: Vector | number, y?: number, z?: number) {
if (arguments.length === 1 && typeof v !== 'number') { if (arguments.length === 1 && typeof v !== 'number') {
this.x -= v.x; this.x -= v.x;
@@ -91,6 +92,7 @@ export class Vector {
this.y -= y ?? 0; this.y -= y ?? 0;
this.z -= z ?? 0; this.z -= z ?? 0;
} }
return this;
} }
mult(v: number | Vector) { mult(v: number | Vector) {
if (typeof v === 'number') { if (typeof v === 'number') {
@@ -114,6 +116,7 @@ export class Vector {
this.y /= v.y; this.y /= v.y;
this.z /= v.z; this.z /= v.z;
} }
return this;
} }
rotate(angle: number) { rotate(angle: number) {
const prev_x = this.x; const prev_x = this.x;
@@ -121,6 +124,7 @@ export class Vector {
const s = Math.sin(angle); const s = Math.sin(angle);
this.x = c * this.x - s * this.y; this.x = c * this.x - s * this.y;
this.y = s * prev_x + c * this.y; this.y = s * prev_x + c * this.y;
return this;
} }
dist(v: Vector) { dist(v: Vector) {
const dx = this.x - v.x, const dx = this.x - v.x,
@@ -165,6 +169,7 @@ export class Vector {
this.x = lerp_val(this.x, x, amt!); this.x = lerp_val(this.x, x, amt!);
this.y = lerp_val(this.y, y, amt!); this.y = lerp_val(this.y, y, amt!);
this.z = lerp_val(this.z, z!, amt!); this.z = lerp_val(this.z, z!, amt!);
return this;
} }
normalize() { normalize() {
const m = this.mag(); const m = this.mag();
@@ -178,6 +183,7 @@ export class Vector {
this.normalize(); this.normalize();
this.mult(high); this.mult(high);
} }
return this;
} }
heading() { heading() {
return (-Math.atan2(-this.y, this.x)); return (-Math.atan2(-this.y, this.x));