@remotion/effects 4.0.483 → 4.0.485

package/dist/corner-pin/corner-pin-shaders.d.ts

@@ -1,2 +1,2 @@
 export declare const CORNER_PIN_VS = "#version 300 es\nlayout(location = 0) in vec2 aPos;\nlayout(location = 1) in vec2 aUv;\nout vec2 vUv;\n\nvoid main() {\n\tvUv = aUv;\n\tgl_Position = vec4(aPos, 0.0, 1.0);\n}\n";
-export declare const CORNER_PIN_FS = "#version 300 es\nprecision highp float;\n\nin vec2 vUv;\nout vec4 fragColor;\n\nuniform sampler2D uSource;\nuniform vec2 uTopLeft;\nuniform vec2 uTopRight;\nuniform vec2 uBottomRight;\nuniform vec2 uBottomLeft;\n\nfloat cross2(vec2 a, vec2 b) {\n\treturn a.x * b.y - a.y * b.x;\n}\n\nbool solveBilinearInverse(vec2 p, out vec2 uv) {\n\tvec2 a = uBottomLeft;\n\tvec2 b = uBottomRight - uBottomLeft;\n\tvec2 c = uTopLeft - uBottomLeft;\n\tvec2 d = uBottomLeft - uBottomRight + uTopRight - uTopLeft;\n\tvec2 q = p - a;\n\n\tfloat linearDenominator = cross2(b, c);\n\tif (abs(cross2(b, d)) < 0.000001) {\n\t\tif (abs(linearDenominator) < 0.000001) {\n\t\t\treturn false;\n\t\t}\n\n\t\tuv.x = cross2(q, c) / linearDenominator;\n\t\tuv.y = cross2(q, b) / cross2(c, b);\n\t\treturn true;\n\t}\n\n\tfloat qa = -cross2(b, d);\n\tfloat qb = cross2(q, d) - cross2(b, c);\n\tfloat qc = cross2(q, c);\n\tfloat discriminant = qb * qb - 4.0 * qa * qc;\n\n\tif (discriminant < 0.0) {\n\t\treturn false;\n\t}\n\n\tfloat sqrtDiscriminant = sqrt(discriminant);\n\tfloat u1 = (-qb + sqrtDiscriminant) / (2.0 * qa);\n\tfloat u2 = (-qb - sqrtDiscriminant) / (2.0 * qa);\n\tfloat u = u1;\n\tif (u1 < -0.001 || u1 > 1.001) {\n\t\tu = u2;\n\t}\n\n\tvec2 denominator = c + d * u;\n\tfloat v = abs(denominator.x) > abs(denominator.y)\n\t\t? (q.x - b.x * u) / denominator.x\n\t\t: (q.y - b.y * u) / denominator.y;\n\n\tuv = vec2(u, v);\n\treturn true;\n}\n\nvoid main() {\n\tvec2 sourceUv;\n\tif (!solveBilinearInverse(vUv, sourceUv)) {\n\t\tfragColor = vec4(0.0);\n\t\treturn;\n\t}\n\n\tif (\n\t\tsourceUv.x < 0.0 ||\n\t\tsourceUv.x > 1.0 ||\n\t\tsourceUv.y < 0.0 ||\n\t\tsourceUv.y > 1.0\n\t) {\n\t\tfragColor = vec4(0.0);\n\t\treturn;\n\t}\n\n\tfragColor = texture(uSource, sourceUv);\n}\n";
+export declare const CORNER_PIN_FS = "#version 300 es\nprecision highp float;\n\nin vec2 vUv;\nout vec4 fragColor;\n\nuniform sampler2D uSource;\nuniform vec2 uTopLeft;\nuniform vec2 uTopRight;\nuniform vec2 uBottomRight;\nuniform vec2 uBottomLeft;\n\nbool solveProjectiveInverse(vec2 p, out vec2 uv) {\n\tvec2 p0 = uBottomLeft;\n\tvec2 p1 = uBottomRight;\n\tvec2 p2 = uTopRight;\n\tvec2 p3 = uTopLeft;\n\n\tvec2 dx1 = p1 - p2;\n\tvec2 dx2 = p3 - p2;\n\tvec2 dx3 = p0 - p1 + p2 - p3;\n\n\tfloat g = 0.0;\n\tfloat h = 0.0;\n\n\tif (abs(dx3.x) > 0.000001 || abs(dx3.y) > 0.000001) {\n\t\tfloat denominator = dx1.x * dx2.y - dx2.x * dx1.y;\n\t\tif (abs(denominator) < 0.000001) {\n\t\t\treturn false;\n\t\t}\n\n\t\tg = (dx3.x * dx2.y - dx2.x * dx3.y) / denominator;\n\t\th = (dx1.x * dx3.y - dx3.x * dx1.y) / denominator;\n\t}\n\n\tfloat a = p1.x - p0.x + g * p1.x;\n\tfloat b = p3.x - p0.x + h * p3.x;\n\tfloat c = p0.x;\n\tfloat d = p1.y - p0.y + g * p1.y;\n\tfloat e = p3.y - p0.y + h * p3.y;\n\tfloat f = p0.y;\n\n\tfloat inverseX =\n\t\t(e - f * h) * p.x +\n\t\t(c * h - b) * p.y +\n\t\t(b * f - c * e);\n\tfloat inverseY =\n\t\t(f * g - d) * p.x +\n\t\t(a - c * g) * p.y +\n\t\t(c * d - a * f);\n\tfloat inverseW =\n\t\t(d * h - e * g) * p.x +\n\t\t(b * g - a * h) * p.y +\n\t\t(a * e - b * d);\n\n\tif (abs(inverseW) < 0.000001) {\n\t\treturn false;\n\t}\n\n\tuv = vec2(inverseX / inverseW, inverseY / inverseW);\n\treturn true;\n}\n\nvoid main() {\n\tvec2 sourceUv;\n\tif (!solveProjectiveInverse(vUv, sourceUv)) {\n\t\tfragColor = vec4(0.0);\n\t\treturn;\n\t}\n\n\tif (\n\t\tsourceUv.x < 0.0 ||\n\t\tsourceUv.x > 1.0 ||\n\t\tsourceUv.y < 0.0 ||\n\t\tsourceUv.y > 1.0\n\t) {\n\t\tfragColor = vec4(0.0);\n\t\treturn;\n\t}\n\n\tfragColor = texture(uSource, sourceUv);\n}\n";

package/dist/esm/corner-pin.mjs

@@ -63,57 +63,60 @@ uniform vec2 uTopRight;
 uniform vec2 uBottomRight;
 uniform vec2 uBottomLeft;
 
-float cross2(vec2 a, vec2 b) {
-	return a.x * b.y - a.y * b.x;
-}
+bool solveProjectiveInverse(vec2 p, out vec2 uv) {
+	vec2 p0 = uBottomLeft;
+	vec2 p1 = uBottomRight;
+	vec2 p2 = uTopRight;
+	vec2 p3 = uTopLeft;
+
+	vec2 dx1 = p1 - p2;
+	vec2 dx2 = p3 - p2;
+	vec2 dx3 = p0 - p1 + p2 - p3;
 
-bool solveBilinearInverse(vec2 p, out vec2 uv) {
-	vec2 a = uBottomLeft;
-	vec2 b = uBottomRight - uBottomLeft;
-	vec2 c = uTopLeft - uBottomLeft;
-	vec2 d = uBottomLeft - uBottomRight + uTopRight - uTopLeft;
-	vec2 q = p - a;
+	float g = 0.0;
+	float h = 0.0;
 
-	float linearDenominator = cross2(b, c);
-	if (abs(cross2(b, d)) < 0.000001) {
-		if (abs(linearDenominator) < 0.000001) {
+	if (abs(dx3.x) > 0.000001 || abs(dx3.y) > 0.000001) {
+		float denominator = dx1.x * dx2.y - dx2.x * dx1.y;
+		if (abs(denominator) < 0.000001) {
 			return false;
 		}
 
-		uv.x = cross2(q, c) / linearDenominator;
-		uv.y = cross2(q, b) / cross2(c, b);
-		return true;
+		g = (dx3.x * dx2.y - dx2.x * dx3.y) / denominator;
+		h = (dx1.x * dx3.y - dx3.x * dx1.y) / denominator;
 	}
 
-	float qa = -cross2(b, d);
-	float qb = cross2(q, d) - cross2(b, c);
-	float qc = cross2(q, c);
-	float discriminant = qb * qb - 4.0 * qa * qc;
+	float a = p1.x - p0.x + g * p1.x;
+	float b = p3.x - p0.x + h * p3.x;
+	float c = p0.x;
+	float d = p1.y - p0.y + g * p1.y;
+	float e = p3.y - p0.y + h * p3.y;
+	float f = p0.y;
 
-	if (discriminant < 0.0) {
-		return false;
-	}
+	float inverseX =
+		(e - f * h) * p.x +
+		(c * h - b) * p.y +
+		(b * f - c * e);
+	float inverseY =
+		(f * g - d) * p.x +
+		(a - c * g) * p.y +
+		(c * d - a * f);
+	float inverseW =
+		(d * h - e * g) * p.x +
+		(b * g - a * h) * p.y +
+		(a * e - b * d);
 
-	float sqrtDiscriminant = sqrt(discriminant);
-	float u1 = (-qb + sqrtDiscriminant) / (2.0 * qa);
-	float u2 = (-qb - sqrtDiscriminant) / (2.0 * qa);
-	float u = u1;
-	if (u1 < -0.001 || u1 > 1.001) {
-		u = u2;
+	if (abs(inverseW) < 0.000001) {
+		return false;
 	}
 
-	vec2 denominator = c + d * u;
-	float v = abs(denominator.x) > abs(denominator.y)
-		? (q.x - b.x * u) / denominator.x
-		: (q.y - b.y * u) / denominator.y;
-
-	uv = vec2(u, v);
+	uv = vec2(inverseX / inverseW, inverseY / inverseW);
 	return true;
 }
 
 void main() {
 	vec2 sourceUv;
-	if (!solveBilinearInverse(vUv, sourceUv)) {
+	if (!solveProjectiveInverse(vUv, sourceUv)) {
 		fragColor = vec4(0.0);
 		return;
 	}