Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/script.ts
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ function renderDemo(
video.source =
"https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4";
video.width = canvas.width;
video.anchor = WebSpinner.Vector2D.zero;
video.anchor = WebSpinner.Vector2D.zero();
canvas.listen.click(() => video.play());
}

Expand Down
8 changes: 0 additions & 8 deletions src/classes/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ export class Color {
return this.#str;
}

static get random() {
return Color.rgb(
Math.random() * 255,
Math.random() * 255,
Math.random() * 255
);
}

static rgb(red: number, green: number, blue: number, alpha?: number) {
return new Color(red, green, blue, alpha);
}
Expand Down
2 changes: 1 addition & 1 deletion src/classes/gradient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export class ConicalGradient extends Gradient {

constructor(
startAngle: Angle = Angle.zero(),
offset: Vector2D = Vector2D.zero
offset: Vector2D = Vector2D.zero()
) {
super();

Expand Down
24 changes: 16 additions & 8 deletions src/classes/mouse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,34 @@ export class MouseTracker extends MouseData {

this.#previous = new MouseData();

(target as HTMLElement).addEventListener("mousedown", (event) => {
const updatePosition = (event: MouseEvent) => {
super.x = event.x;
super.y = event.y;
};

const targetElement = target as HTMLElement;

targetElement.addEventListener("mousedown", (event) => {
super.buttonStates[event.button] = true;

updatePosition(event);
});

(target as HTMLElement).addEventListener("mouseup", (event) => {
targetElement.addEventListener("mouseup", (event) => {
super.buttonStates[event.button] = false;

updatePosition(event);
});

target.addEventListener("mouseenter", (event) => {
targetElement.addEventListener("mouseenter", (event) => {
super.over = true;
});

target.addEventListener("mouseleave", (event) => {
targetElement.addEventListener("mouseleave", (event) => {
super.over = false;
});

window.addEventListener("mousemove", (event) => {
super.x = event.x;
super.y = event.y;
});
window.addEventListener("mousemove", updatePosition);
}

advanceFrame() {
Expand Down
2 changes: 1 addition & 1 deletion src/classes/shadow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Vector2D } from "./vector2d";
export class Shadow {
#blur = createState(0);
#color = Color.gray(0);
#offset = Vector2D.zero;
#offset = Vector2D.zero();
#changeListenerMap = new Map<ChangeListener<Shadow>, () => void>();

constructor(options: Partial<Shadow>) {
Expand Down
5 changes: 1 addition & 4 deletions src/classes/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ export class State<T> {
* @returns
*/

replace<O extends this>(
other: O,
changeListener: ChangeListener<T>
): State<T> {
replace<O extends this>(other: O, changeListener: ChangeListener<T>): O {
if (this.equals(other)) {
if (this === other) return other;

Expand Down
4 changes: 2 additions & 2 deletions src/classes/vector2d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class Vector2D extends State<Vector2DBase> {
return Vector2D.xy(-this.x, -this.y);
}

static get one() {
static one() {
return new Vector2D(1);
}

Expand Down Expand Up @@ -105,7 +105,7 @@ export class Vector2D extends State<Vector2DBase> {
this.handleChange();
}

static get zero() {
static zero() {
return new Vector2D();
}
}
1 change: 1 addition & 0 deletions src/elements/mixable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export class CustomHTMLElement extends HTMLElement {
/**
* @private
*/

registerChange<P extends keyof Writeable<this>>(
propertyName: P,
newValue: this[P]
Expand Down
4 changes: 2 additions & 2 deletions src/elements/visual/bezier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ function hasControlPoints<B extends typeof Canvas2DBaseRenderable>(Base: B) {
"control-b",
];

#controlA = Vector2D.zero;
#controlB = Vector2D.zero;
#controlA = Vector2D.zero();
#controlB = Vector2D.zero();

/**
* Controls the shape at the beginning of the curve.
Expand Down
12 changes: 12 additions & 0 deletions src/elements/visual/canvas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { attributeParser } from "../../utlities/attributeParser";
import { C2DBase } from "./c2dBase";
import { Canvas2DBaseRenderable } from "./renderable";
import { DrawStyle } from "../../classes/gradient";
import { CustomHTMLElement } from "../mixable";

export class Canvas2DCanvasElement extends c2dStandaloneChildren(C2DBase) {
static observedAttributes: string[] = [
Expand Down Expand Up @@ -177,6 +178,17 @@ export class Canvas2DCanvasElement extends c2dStandaloneChildren(C2DBase) {
this.alpha = this.alpha;
}

createChild<E extends typeof CustomHTMLElement>(
ElementClass: E,
options?: Partial<Writeable<InstanceType<E>>> | undefined
): InstanceType<E> {
const child = super.createChild(ElementClass, options);

this.queueRender();

return child;
}

get keyDown() {
return this.#keyboardTracker.down;
}
Expand Down
12 changes: 12 additions & 0 deletions src/elements/visual/renderable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { c2dShapeChildren, c2dStandaloneChildren } from "../../mixins/children";
import { Canvas2DCanvasElement } from "./canvas";
import { C2DBase } from "./c2dBase";
import { Canvas2DShape } from "./shape";
import { CustomHTMLElement } from "../mixable";

export const changedEvent = new Event("change", { bubbles: true });

Expand Down Expand Up @@ -56,6 +57,17 @@ export class Canvas2DBaseRenderable extends C2DBase {
super.addEventListener(type, listener, options);
}

createChild<E extends typeof CustomHTMLElement>(
ElementClass: E,
options?: Partial<Writeable<InstanceType<E>>> | undefined
): InstanceType<E> {
const child = super.createChild(ElementClass, options);

this.dispatchEvent(changedEvent);

return child;
}

/**
* @private
*/
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/fromTo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function hasFrom<B extends typeof Canvas2DBaseRenderable>(Base: B) {
return class extends Base {
static observedAttributes = [...super.observedAttributes, "from"];

#from = Vector2D.zero;
#from = Vector2D.zero();

/**
* Starting point of the element relative to its anchor.
Expand Down
64 changes: 40 additions & 24 deletions src/mixins/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,26 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
"velocity",
];

#anchor = Vector2D.zero;
#anchor = Vector2D.zero();
#angle = Angle.radians(0);
#angularVelocity = Angle.radians(0);
#scale = Vector2D.one;
#velocity = Vector2D.zero;
#scale = Vector2D.one();
#velocity = Vector2D.zero();

constructor(...args: any[]) {
super(...args);

this.#anchor.addChangeListener(this.#anchorChangeListener);

this.#angle.addChangeListener(this.#angleChangeListener);

this.#angularVelocity.addChangeListener(
this.#angularVelocityChangeListener
);

this.#scale.addChangeListener(this.#scaleChangeListener);

this.#velocity.addChangeListener(this.#velocityChangeListener);
}

#angleChangeListener: ChangeListener<number> = () => {
Expand All @@ -51,12 +59,16 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
}

set angle(value) {
const replace = this.#angle.replace.bind(this.#angle);

replace((this.#angle = value), this.#angleChangeListener);
this.#angle.replace((this.#angle = value), this.#angleChangeListener);
}

#angularVelocityChangedTime = -1;

#angularVelocityChangeListener: ChangeListener<number> = () => {
this.#angularVelocityChangedTime = performance.now();

this.registerChange("angularVelocity", this.angularVelocity);
};
/**
* Clockwise rotation per second.
*
Expand All @@ -68,13 +80,10 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
}

set angularVelocity(value) {
if (this.#angularVelocity.equals(value)) {
return;
}

this.#angularVelocityChangedTime = performance.now();

this.registerChange("angularVelocity", (this.#angularVelocity = value));
this.#angularVelocity.replace(
(this.#angularVelocity = value),
this.#angularVelocityChangeListener
);
}

/**
Expand All @@ -92,9 +101,7 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
};

set anchor(value) {
const replace = this.#anchor.replace.bind(this.#anchor);

replace((this.#anchor = value), this.#anchorChangeListener);
this.#anchor.replace((this.#anchor = value), this.#anchorChangeListener);
}

_applyMovement(deltaTime: number) {
Expand Down Expand Up @@ -179,6 +186,10 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
this.angle = Angle.radians(this.#angle.radians - angle.radians);
}

#scaleChangeListener: ChangeListener<Vector2DBase> = () => {
this.registerChange("scale", this.#scale);
};

/**
* Multiplies the size of the element in the x and y direction. This also affects
* line width. Setting scale to a number will set both the x and y scale to that
Expand All @@ -198,15 +209,21 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
if (this.#scale.equals(vectorValue)) return;

this.registerChange("scale", (this.#scale = vectorValue));
} else if (this.#scale.equals(value)) {

return;
} else {
this.registerChange("scale", (this.#scale = value));
}

this.#scale.replace((this.#scale = value), this.#scaleChangeListener);
}

#velocityChangedTime = -1;

#velocityChangeListener: ChangeListener<Vector2DBase> = () => {
this.#velocityChangedTime = performance.now();

this.registerChange("velocity", this.#velocity);
};

/**
* Anchor movement per second.
*
Expand All @@ -218,11 +235,10 @@ export function baseTransform<B extends typeof CustomHTMLElement>(Base: B) {
}

set velocity(value) {
if (this.#velocity.equals(value)) return;

this.registerChange("velocity", (this.#velocity = value));

this.#velocityChangedTime = performance.now();
this.#velocity.replace(
(this.#velocity = value),
this.#velocityChangeListener
);
}
};
}
Expand Down