Skip to content

Visualize Your Ideas With Code

refactor: replace Size with Vector2

aarthificiald6ab0d96a83f
diff --git a/packages/2d/src/components/Image.ts b/packages/2d/src/components/Image.ts
index 04198751..e8964ab9 100644
--- a/packages/2d/src/components/Image.ts
+++ b/packages/2d/src/components/Image.ts
@@ -86,9 +86,7 @@ export class Image extends Rect {
public getColorAtPoint(position: Vector2): any {
const context = this.imageDrawnCanvas();
- const relativePosition = position.add(
- this.computedSize().vector.scale(0.5),
- );
+ const relativePosition = position.add(this.computedSize().scale(0.5));
const data = context.getImageData(
relativePosition.x,
relativePosition.y,
diff --git a/packages/2d/src/components/Layout.ts b/packages/2d/src/components/Layout.ts
index fd72219d..9ce3788a 100644
--- a/packages/2d/src/components/Layout.ts
+++ b/packages/2d/src/components/Layout.ts
@@ -3,7 +3,6 @@ import {
Origin,
PossibleSpacing,
Rect,
- Size,
Spacing,
transformAngle,
Vector2,
@@ -76,7 +75,7 @@ export interface LayoutProps extends NodeProps {
x?: SignalValue<number>;
y?: SignalValue<number>;
position?: SignalValue<Vector2>;
- size?: SignalValue<Size>;
+ size?: SignalValue<Vector2>;
rotation?: SignalValue<number>;
offsetX?: SignalValue<number>;
offsetY?: SignalValue<number>;
@@ -298,11 +297,11 @@ export class Layout extends Node {
lock && this.releaseSize();
}
- @compound(['width', 'height'], Size)
- @property(undefined, Size.lerp, Size)
+ @compound(['width', 'height'], Vector2)
+ @property(undefined, Vector2.lerp, Vector2)
public declare readonly size: Property<
{width: Length; height: Length},
- Size,
+ Vector2,
this
>;
@@ -319,23 +318,23 @@ export class Layout extends Node {
value: SignalValue<{width: Length; height: Length}>,
time: number,
timingFunction: TimingFunction,
- interpolationFunction: InterpolationFunction<Size>,
+ interpolationFunction: InterpolationFunction<Vector2>,
): ThreadGenerator {
const size = this.customSize();
- let from: Size;
+ let from: Vector2;
if (typeof size.height !== 'number' || typeof size.width !== 'number') {
from = this.size();
} else {
- from = <Size>size;
+ from = <Vector2>size;
}
- let to: Size;
+ let to: Vector2;
if (
typeof value === 'object' &&
typeof value.height === 'number' &&
typeof value.width === 'number'
) {
- to = <Size>value;
+ to = <Vector2>value;
} else {
this.size(value);
to = this.size();
@@ -469,7 +468,7 @@ export class Layout extends Node {
const size = this.computedSize();
const offset = this.offset();
- return size.vector.scale(0.5).mul(offset);
+ return size.scale(0.5).mul(offset);
}
/**
@@ -530,9 +529,9 @@ export class Layout extends Node {
}
@computed()
- protected computedSize(): Size {
+ protected computedSize(): Vector2 {
this.requestLayoutUpdate();
- return new Size(this.getComputedLayout());
+ return new Vector2(this.getComputedLayout());
}
/**
@@ -588,7 +587,7 @@ export class Layout extends Node {
protected override getCacheRect(): Rect {
const size = this.computedSize();
- return new Rect(size.vector.scale(-0.5), size);
+ return new Rect(size.scale(-0.5), size);
}
protected override draw(context: CanvasRenderingContext2D) {
@@ -609,12 +608,12 @@ export class Layout extends Node {
public getOriginDelta(origin: Origin) {
const size = this.computedSize().scale(0.5);
- const offset = this.offset().mul(size.vector);
+ const offset = this.offset().mul(size);
if (origin === Origin.Middle) {
return offset.flipped;
}
- const newOffset = originToOffset(origin).mul(size.vector);
+ const newOffset = originToOffset(origin).mul(size);
return newOffset.sub(offset);
}
@@ -626,8 +625,8 @@ export class Layout extends Node {
*/
public moveOffset(offset: Vector2) {
const size = this.computedSize().scale(0.5);
- const oldOffset = this.offset().mul(size.vector);
- const newOffset = offset.mul(size.vector);
+ const oldOffset = this.offset().mul(size);
+ const newOffset = offset.mul(size);
this.offset(offset);
this.position(this.position().add(newOffset).sub(oldOffset));
}
diff --git a/packages/core/src/Project.ts b/packages/core/src/Project.ts
index 8fd4bbe0..0cc33217 100644
--- a/packages/core/src/Project.ts
+++ b/packages/core/src/Project.ts
@@ -1,15 +1,15 @@
import {Scene} from './scenes';
import {Meta, Metadata} from './Meta';
import {EventDispatcher, ValueDispatcher} from './events';
-import {Size, CanvasColorSpace, CanvasOutputMimeType} from './types';
+import {CanvasColorSpace, CanvasOutputMimeType, Vector2} from './types';
import {AudioManager} from './media';
import {ifHot} from './utils';
const EXPORT_FRAME_LIMIT = 256;
const EXPORT_RETRY_DELAY = 1000;
-export const ProjectSize: Record<string, Size> = {
- FullHD: new Size(1920, 1080),
+export const ProjectSize: Record<string, Vector2> = {
+ FullHD: new Vector2(1920, 1080),
};
export interface ProjectConfig {
@@ -18,7 +18,7 @@ export interface ProjectConfig {
audio?: string;
audioOffset?: number;
canvas?: HTMLCanvasElement;
- size?: Size;
+ size?: Vector2;
background?: string | false;
}
@@ -104,9 +104,9 @@ export class Project {
this.updateCanvas();
}
- public setSize(size: Size): void;
+ public setSize(size: Vector2): void;
public setSize(width: number, height: number): void;
- public setSize(value: Size | number, height?: number): void {
+ public setSize(value: Vector2 | number, height?: number): void {
if (typeof value === 'object') {
this.width = value.width;
this.height = value.height;
@@ -118,8 +118,8 @@ export class Project {
this.reloadAll();
}
- public getSize(): Size {
- return new Size(this.width, this.height);
+ public getSize(): Vector2 {
+ return new Vector2(this.width, this.height);
}
public readonly name: string;
diff --git a/packages/core/src/media/loadImage.ts b/packages/core/src/media/loadImage.ts
index 8919a437..a0bc921c 100644
--- a/packages/core/src/media/loadImage.ts
+++ b/packages/core/src/media/loadImage.ts
@@ -1,9 +1,10 @@
-import {SerializedSize} from '../types';
-
const canvas = document.createElement('canvas');
const context = canvas.getContext('2d');
-export type ImageDataSource = CanvasImageSource & SerializedSize;
+export type ImageDataSource = CanvasImageSource & {
+ width: number;
+ height: number;
+};
export function loadImage(source: string): Promise<HTMLImageElement> {
const image = new Image();
diff --git a/packages/core/src/scenes/GeneratorScene.ts b/packages/core/src/scenes/GeneratorScene.ts
index 63716531..400f8024 100644
--- a/packages/core/src/scenes/GeneratorScene.ts
+++ b/packages/core/src/scenes/GeneratorScene.ts
@@ -14,7 +14,7 @@ import {endScene, setProject, startScene} from '../utils';
import {CachedSceneData, Scene, SceneMetadata, SceneRenderEvent} from './Scene';
import {LifecycleEvents} from './LifecycleEvents';
import {Threadable} from './Threadable';
-import {Size} from '../types';
+import {Vector2} from '../types';
import {SceneState} from './SceneState';
export interface ThreadGeneratorFactory<T> {
@@ -203,7 +203,7 @@ export abstract class GeneratorScene<T>
await this.next();
}
- public getSize(): Size {
+ public getSize(): Vector2 {
return this.project.getSize();
}
diff --git a/packages/core/src/scenes/Scene.ts b/packages/core/src/scenes/Scene.ts
index 3131e5df..faddd035 100644
--- a/packages/core/src/scenes/Scene.ts
+++ b/packages/core/src/scenes/Scene.ts
@@ -2,7 +2,7 @@ import type {Project} from '../Project';
import {Meta, Metadata} from '../Meta';
import {SavedTimeEvent, TimeEvents} from './TimeEvents';
import {SubscribableEvent, SubscribableValueEvent} from '../events';
-import {Size} from '../types';
+import {Vector2} from '../types';
import {LifecycleEvents} from './LifecycleEvents';
export interface SceneMetadata extends Metadata {
@@ -210,7 +210,7 @@ export interface Scene<T = unknown> {
*
* Usually return `this.project.getSize()`.
*/
- getSize(): Size;
+ getSize(): Vector2;
/**
* Is this scene in the {@link SceneState.AfterTransitionIn} state?
diff --git a/packages/core/src/types/Rect.ts b/packages/core/src/types/Rect.ts
index 6f88a252..f0da9655 100644
--- a/packages/core/src/types/Rect.ts
+++ b/packages/core/src/types/Rect.ts
@@ -1,5 +1,4 @@
import {Vector2} from './Vector';
-import {Size} from './Size';
import {arcLerp, map} from '../tweening';
export type SerializedRect = {
@@ -12,7 +11,6 @@ export type SerializedRect = {
export type PossibleRect =
| SerializedRect
| [number, number, number, number]
- | Size
| Vector2;
export class Rect {
@@ -58,14 +56,12 @@ export class Rect {
ratio?: number,
) {
ratio ??=
- (from.position.sub(to.position).ctg +
- from.size.vector.sub(to.size.vector).ctg) /
- 2;
+ (from.position.sub(to.position).ctg + from.size.sub(to.size).ctg) / 2;
return Rect.lerp(from, to, arcLerp(value, reverse, ratio));
}
- public static fromSizeCentered(size: Size): Rect {
+ public static fromSizeCentered(size: Vector2): Rect {
return new Rect(-size.width / 2, -size.height / 2, size.width, size.height);
}
@@ -124,7 +120,7 @@ export class Rect {
}
public get size() {
- return new Size(this.width, this.height);
+ return new Vector2(this.width, this.height);
}
public get left() {
@@ -161,23 +157,23 @@ export class Rect {
this.height = value - this.y;
}
- public get topLeft() {
+ public get topLeft(): Vector2 {
return this.position;
}
- public get topRight() {
+ public get topRight(): Vector2 {
return new Vector2(this.x + this.width, this.y);
}
- public get bottomLeft() {
+ public get bottomLeft(): Vector2 {
return new Vector2(this.x, this.y + this.height);
}
- public get bottomRight() {
+ public get bottomRight(): Vector2 {
return new Vector2(this.x + this.width, this.y + this.height);
}
- public get corners() {
+ public get corners(): [Vector2, Vector2, Vector2, Vector2] {
return [this.topLeft, this.topRight, this.bottomRight, this.bottomLeft];
}
@@ -192,12 +188,11 @@ export class Rect {
public constructor();
public constructor(from: PossibleRect);
- public constructor(position: Vector2, size: Size);
- public constructor(from: Vector2, to: Vector2);
+ public constructor(position: Vector2, size: Vector2);
public constructor(x: number, y?: number, width?: number, height?: number);
public constructor(
one?: PossibleRect | number,
- two: Vector2 | Size | number = 0,
+ two: Vector2 | number = 0,
three = 0,
four = 0,
) {
@@ -217,23 +212,14 @@ export class Rect {
this.x = one.x;
this.y = one.y;
- if (two instanceof Size) {
- this.width = two.width;
- this.height = two.height;
- } else if (two instanceof Vector2) {
- this.width = two.x - one.x;
- this.height = two.y - one.y;
+ if (two instanceof Vector2) {
+ this.width = two.x;
+ this.height = two.y;
}
return;
}
- if (one instanceof Size) {
- this.width = one.width;
- this.height = one.height;
- return;
- }
-
if (Array.isArray(one)) {
this.x = one[0];
this.y = one[1];
diff --git a/packages/core/src/types/Size.ts b/packages/core/src/types/Size.ts
deleted file mode 100644
index 7b961958..00000000
--- a/packages/core/src/types/Size.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import {Vector2} from './Vector';
-import {Rect} from './Rect';
-import {Direction, Origin} from './Origin';
-import {map} from '../tweening';
-
-export type SerializedSize = {
- width: number;
- height: number;
-};
-
-export type PossibleSize = SerializedSize | [number, number] | Vector2 | Rect;
-
-export class Size {
- public width = 0;
- public height = 0;
-
- public static lerp(from: Size, to: Size, value: number) {
- return new Size(
- map(from.width, to.width, value),
- map(from.height, to.height, value),
- );
- }
-
- public get vector() {
- return new Vector2(this);
- }
-
- public get flip() {
- return new Size(this.height, this.width);
- }
-
- public constructor();
- public constructor(from: PossibleSize);
- public constructor(width: number, height?: number);
- public constructor(one?: PossibleSize | number, two = 0) {
- if (one === undefined || one === null) {
- return;
- }
-
- if (typeof one === 'number') {
- this.width = one;
- this.height = two;
- return;
- }
-
- if (one instanceof Vector2) {
- this.width = one.x;
- this.height = one.y;
- return;
- }
-
- if (Array.isArray(one)) {
- this.width = one[0];
- this.height = one[1];
- return;
- }
-
- this.width = one.width;
- this.height = one.height;
- }
-
- public getOriginOffset(origin: Origin | Direction) {
- const offset = Vector2.fromOrigin(origin);
- offset.x *= this.width / 2;
- offset.y *= this.height / 2;
-
- return offset;
- }
-
- public scale(value: number) {
- return new Size(this.width * value, this.height * value);
- }
-
- public transform(matrix: DOMMatrix) {
- return new Size(
- this.width * matrix.m11 + this.height * matrix.m21,
- this.width * matrix.m12 + this.height * matrix.m22,
- );
- }
-}
diff --git a/packages/core/src/types/Spacing.ts b/packages/core/src/types/Spacing.ts
index 98743e51..2e16947f 100644
--- a/packages/core/src/types/Spacing.ts
+++ b/packages/core/src/types/Spacing.ts
@@ -1,6 +1,3 @@
-import type {Size} from './Size';
-import type {Rect} from './Rect';
-import type {Vector2} from './Vector';
import {map} from '../tweening';
export type SerializedSpacing = {
diff --git a/packages/core/src/types/Vector.ts b/packages/core/src/types/Vector.ts
index f90c56d3..23f1b091 100644
--- a/packages/core/src/types/Vector.ts
+++ b/packages/core/src/types/Vector.ts
@@ -1,4 +1,3 @@
-import {Size} from './Size';
import {Rect} from './Rect';
import {arcLerp, map} from '../tweening';
import {Direction, Origin} from './Origin';
@@ -10,9 +9,9 @@ export type SerializedVector2 = {
export type PossibleVector2 =
| SerializedVector2
+ | {width: number; height: number}
| number
| [number, number]
- | Size
| Rect;
export class Vector2 {
@@ -85,6 +84,22 @@ export class Vector2 {
return Math.sqrt(x * x + y * y);
}
+ public get width(): number {
+ return this.x;
+ }
+
+ public set width(value: number) {
+ this.x = value;
+ }
+
+ public get height(): number {
+ return this.y;
+ }
+
+ public set height(value: number) {
+ this.y = value;
+ }
+
public get magnitude(): number {
return Vector2.magnitude(this.x, this.y);
}
@@ -127,22 +142,30 @@ export class Vector2 {
return;
}
- if (one instanceof Size) {
- this.x = one.width;
- this.y = one.height;
- return;
- }
-
if (Array.isArray(one)) {
this.x = one[0];
this.y = one[0];
return;
}
+ if ('width' in one) {
+ this.x = one.width;
+ this.y = one.height;
+ return;
+ }
+
this.x = one.x;
this.y = one.y;
}
+ public getOriginOffset(origin: Origin | Direction) {
+ const offset = Vector2.fromOrigin(origin);
+ offset.x *= this.x / 2;
+ offset.y *= this.y / 2;
+
+ return offset;
+ }
+
public scale(value: number) {
return new Vector2(this.x * value, this.y * value);
}
diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts
index c424b9d2..0181bc86 100644
--- a/packages/core/src/types/index.ts
+++ b/packages/core/src/types/index.ts
@@ -2,6 +2,5 @@ export * from './Canvas';
export * from './Matrix';
export * from './Origin';
export * from './Rect';
-export * from './Size';
export * from './Spacing';
export * from './Vector';