Visualize Your Ideas With Code
feat: convert built-in types to webgl (#929)
Jacoba0f0b7d89965
diff --git a/packages/2d/src/lib/components/Node.ts b/packages/2d/src/lib/components/Node.tsindex 5b00588d..9bd22fd1 100644--- a/packages/2d/src/lib/components/Node.ts+++ b/packages/2d/src/lib/components/Node.ts@@ -1567,6 +1567,8 @@ export class Node implements Promisable<Node> {const value = unwrap(uniform);if (typeof value === 'number') {gl.uniform1f(location, value);+ } else if ('toUniform' in value) {+ value.toUniform(gl, location);} else if (value.length === 1) {gl.uniform1f(location, value[0]);} else if (value.length === 2) {diff --git a/packages/2d/src/lib/partials/ShaderConfig.ts b/packages/2d/src/lib/partials/ShaderConfig.tsindex 191876b9..79bd02e2 100644--- a/packages/2d/src/lib/partials/ShaderConfig.ts+++ b/packages/2d/src/lib/partials/ShaderConfig.ts@@ -3,6 +3,7 @@ import {SignalValue,useLogger,useScene,+ WebGLConvertible,} from '@motion-canvas/core';import {Node} from '../components';@@ -60,7 +61,7 @@ export interface ShaderConfig {* uniform vec3 my_vector;* ```*/- uniforms?: Record<string, SignalValue<number | number[]>>;+ uniforms?: Record<string, SignalValue<number | number[] | WebGLConvertible>>;/*** A custom hook run before the shader is used.diff --git a/packages/core/src/types/BBox.ts b/packages/core/src/types/BBox.tsindex f0c9d99b..2ec15f16 100644--- a/packages/core/src/types/BBox.ts+++ b/packages/core/src/types/BBox.ts@@ -2,7 +2,7 @@ import {CompoundSignal, CompoundSignalContext, SignalValue} from '../signals';import {InterpolationFunction, arcLerp, map} from '../tweening';import {PossibleMatrix2D} from './Matrix2D';import {Spacing} from './Spacing';-import {Type} from './Type';+import {Type, WebGLConvertible} from './Type';import {Vector2} from './Vector';export type SerializedBBox = {@@ -25,7 +25,7 @@ export type RectSignal<T> = CompoundSignal<T>;-export class BBox implements Type {+export class BBox implements Type, WebGLConvertible {public static readonly symbol = Symbol.for('@motion-canvas/core/types/Rect');public x = 0;@@ -342,6 +342,13 @@ export class BBox implements Type {return `BBox(${this.x}, ${this.y}, ${this.width}, ${this.height})`;}+ public toUniform(+ gl: WebGL2RenderingContext,+ location: WebGLUniformLocation,+ ): void {+ gl.uniform4f(location, this.x, this.y, this.width, this.height);+ }+public serialize(): SerializedBBox {return {x: this.x, y: this.y, width: this.width, height: this.height};}diff --git a/packages/core/src/types/Color.ts b/packages/core/src/types/Color.tsindex d768d4cf..d52ec5a9 100644--- a/packages/core/src/types/Color.ts+++ b/packages/core/src/types/Color.ts@@ -1,7 +1,7 @@import {Color, ColorSpace, InterpolationMode, mix} from 'chroma-js';import {Signal, SignalContext, SignalValue} from '../signals';import type {InterpolationFunction} from '../tweening';-import type {Type} from './Type';+import type {Type, WebGLConvertible} from './Type';export type SerializedColor = string;@@ -14,7 +14,7 @@ export type PossibleColor =export type ColorSignal<T> = Signal<PossibleColor, Color, T>;declare module 'chroma-js' {- interface Color extends Type {+ interface Color extends Type, WebGLConvertible {serialize(): string;lerp(to: ColorInterface | string,@@ -108,6 +108,14 @@ const ExtendedColor: typeof Color = (() => {return Color.symbol;};+ Color.prototype.toUniform = function (+ this: Color,+ gl: WebGL2RenderingContext,+ location: WebGLUniformLocation,+ ): void {+ gl.uniform4fv(location, this.gl());+ };+Color.prototype.serialize = function (this: Color): SerializedColor {return this.css();};diff --git a/packages/core/src/types/Matrix2D.ts b/packages/core/src/types/Matrix2D.tsindex 7660ae5e..0c30d53c 100644--- a/packages/core/src/types/Matrix2D.ts+++ b/packages/core/src/types/Matrix2D.ts@@ -1,5 +1,5 @@import {DEG2RAD} from '../utils';-import {EPSILON, Type} from './Type';+import {EPSILON, Type, WebGLConvertible} from './Type';import {PossibleVector2, Vector2} from './Vector';export type PossibleMatrix2D =@@ -30,7 +30,7 @@ export type PossibleMatrix2D =* - (rA)^-1 = r^-1 A^-1, r != 0 does not hold for a Matrix2D* - r(AB) = (rA)B = A(rB) does not hold for a Matrix2D*/-export class Matrix2D implements Type {+export class Matrix2D implements Type, WebGLConvertible {public static readonly symbol = Symbol.for('@motion-canvas/core/types/Matrix2D',);@@ -691,6 +691,13 @@ export class Matrix2D implements Type {return Matrix2D.symbol;}+ public toUniform(+ gl: WebGL2RenderingContext,+ location: WebGLUniformLocation,+ ): void {+ gl.uniformMatrix3x2fv(location, false, this.values);+ }+public equals(other: Matrix2D, threshold: number = EPSILON): boolean {return (Math.abs(this.values[0] - other.values[0]) <=diff --git a/packages/core/src/types/Spacing.ts b/packages/core/src/types/Spacing.tsindex 7301bda8..423e9106 100644--- a/packages/core/src/types/Spacing.ts+++ b/packages/core/src/types/Spacing.ts@@ -1,6 +1,6 @@import {CompoundSignal, CompoundSignalContext, SignalValue} from '../signals';import {InterpolationFunction, map} from '../tweening';-import {Type} from './Type';+import {Type, WebGLConvertible} from './Type';export type SerializedSpacing = {top: number;@@ -24,7 +24,7 @@ export type SpacingSignal<T> = CompoundSignal<T>;-export class Spacing implements Type {+export class Spacing implements Type, WebGLConvertible {public static readonly symbol = Symbol.for('@motion-canvas/core/types/Spacing',);@@ -130,6 +130,13 @@ export class Spacing implements Type {return `Spacing(${this.top}, ${this.right}, ${this.bottom}, ${this.left})`;}+ public toUniform(+ gl: WebGL2RenderingContext,+ location: WebGLUniformLocation,+ ): void {+ gl.uniform4f(location, this.top, this.right, this.bottom, this.left);+ }+public serialize(): SerializedSpacing {return {top: this.top,diff --git a/packages/core/src/types/Type.ts b/packages/core/src/types/Type.tsindex 8b5712a5..4e92bfe7 100644--- a/packages/core/src/types/Type.ts+++ b/packages/core/src/types/Type.ts@@ -4,6 +4,10 @@ export interface Type {toSymbol(): symbol;}+export interface WebGLConvertible {+ toUniform(gl: WebGL2RenderingContext, location: WebGLUniformLocation): void;+}+export function isType(value: any): value is Type {return value && typeof value === 'object' && 'toSymbol' in value;}diff --git a/packages/core/src/types/Vector.ts b/packages/core/src/types/Vector.tsindex b373ec06..6201d035 100644--- a/packages/core/src/types/Vector.ts+++ b/packages/core/src/types/Vector.ts@@ -9,7 +9,7 @@ import {clamp, map} from '../tweening/interpolationFunctions';import {DEG2RAD, RAD2DEG} from '../utils';import {Matrix2D, PossibleMatrix2D} from './Matrix2D';import {Direction, Origin} from './Origin';-import {EPSILON, Type} from './Type';+import {EPSILON, Type, WebGLConvertible} from './Type';export type SerializedVector2<T = number> = {x: T;@@ -35,7 +35,7 @@ export type SimpleVector2Signal<T> = Signal<PossibleVector2, Vector2, T>;/*** Represents a two-dimensional vector.*/-export class Vector2 implements Type {+export class Vector2 implements Type, WebGLConvertible {public static readonly symbol = Symbol.for('@motion-canvas/core/types/Vector2',);@@ -481,6 +481,13 @@ export class Vector2 implements Type {return `Vector2(${this.x}, ${this.y})`;}+ public toUniform(+ gl: WebGL2RenderingContext,+ location: WebGLUniformLocation,+ ): void {+ gl.uniform2f(location, this.x, this.y);+ }+public serialize(): SerializedVector2 {return {x: this.x, y: this.y};}