dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibGfx+LibWeb: Use matrix helpers in TransformationStyleValue::to_matrix

Browse source 
Using the new perspective_matrix() helper resolves a FIXME in
AccumulatedVisualContext as well.
This commit is contained in:
Jelle Raaijmakers 2026-06-11 22:49:58 +02:00 committed by Jelle Raaijmakers
parent f1ade8186a
commit b06cbbf81e
3 changed files with 34 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibGfx/Matrix4x4.h
View file

@ -59,6 +59,16 @@ constexpr static Matrix4x4<T> scale_matrix(Vector3<T> const& s)
0, 0, 0, 1);
}
template<typename T>
constexpr static Matrix4x4<T> perspective_matrix(T distance)
{
return Matrix4x4<T>(
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, -1 / distance, 1);
}
template<typename T>
constexpr static Matrix4x4<T> rotation_matrix(Vector3<T> const& axis, T angle)
{

79
Libraries/LibWeb/CSS/StyleValues/TransformationStyleValue.cpp
View file

@ -11,6 +11,7 @@
*/
#include <AK/StringBuilder.h>
#include <LibGfx/Matrix4x4.h>
#include <LibWeb/CSS/CSSMatrixComponent.h>
#include <LibWeb/CSS/CSSPerspective.h>
#include <LibWeb/CSS/CSSRotate.h>
@ -177,12 +178,7 @@ FloatMatrix4x4 TransformationStyleValue::to_matrix(Optional<Painting::PaintableB
// computing the resolved value of 'transform', and when used as the endpoint of interpolation.
// Note: The intent of the above rules on values less than '1px' is that they cover the cases where
// the 'perspective()' function needs to be converted into a matrix.
if (distance < 1)
distance = 1;
return FloatMatrix4x4(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, -1 / distance, 1);
return Gfx::perspective_matrix(max(distance, 1));
}
break;
case TransformFunction::Matrix:
@ -201,82 +197,47 @@ FloatMatrix4x4 TransformationStyleValue::to_matrix(Optional<Painting::PaintableB
break;
case TransformFunction::Translate:
if (count == 1)
return FloatMatrix4x4(1, 0, 0, get_value(0, width),
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::translation_matrix(Vector3 { get_value(0, width), 0.f, 0.f });
if (count == 2)
return FloatMatrix4x4(1, 0, 0, get_value(0, width),
0, 1, 0, get_value(1, height),
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::translation_matrix(Vector3 { get_value(0, width), get_value(1, height), 0.f });
break;
case TransformFunction::Translate3d:
return FloatMatrix4x4(1, 0, 0, get_value(0, width),
0, 1, 0, get_value(1, height),
0, 0, 1, get_value(2),
0, 0, 0, 1);
break;
return Gfx::translation_matrix(Vector3 { get_value(0, width), get_value(1, height), get_value(2) });
case TransformFunction::TranslateX:
if (count == 1)
return FloatMatrix4x4(1, 0, 0, get_value(0, width),
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::translation_matrix(Vector3 { get_value(0, width), 0.f, 0.f });
break;
case TransformFunction::TranslateY:
if (count == 1)
return FloatMatrix4x4(1, 0, 0, 0,
0, 1, 0, get_value(0, height),
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::translation_matrix(Vector3 { 0.f, get_value(0, height), 0.f });
break;
case TransformFunction::TranslateZ:
if (count == 1)
return FloatMatrix4x4(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, get_value(0),
0, 0, 0, 1);
return Gfx::translation_matrix(Vector3 { 0.f, 0.f, get_value(0) });
break;
case TransformFunction::Scale:
if (count == 1)
return FloatMatrix4x4(get_value(0), 0, 0, 0,
0, get_value(0), 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
if (count == 1) {
auto scale = get_value(0);
return Gfx::scale_matrix(Vector3 { scale, scale, 1.f });
}
if (count == 2)
return FloatMatrix4x4(get_value(0), 0, 0, 0,
0, get_value(1), 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::scale_matrix(Vector3 { get_value(0), get_value(1), 1.f });
break;
case TransformFunction::Scale3d:
if (count == 3)
return FloatMatrix4x4(get_value(0), 0, 0, 0,
0, get_value(1), 0, 0,
0, 0, get_value(2), 0,
0, 0, 0, 1);
return Gfx::scale_matrix(Vector3 { get_value(0), get_value(1), get_value(2) });
break;
case TransformFunction::ScaleX:
if (count == 1)
return FloatMatrix4x4(get_value(0), 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::scale_matrix(Vector3 { get_value(0), 1.f, 1.f });
break;
case TransformFunction::ScaleY:
if (count == 1)
return FloatMatrix4x4(1, 0, 0, 0,
0, get_value(0), 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
return Gfx::scale_matrix(Vector3 { 1.f, get_value(0), 1.f });
break;
case TransformFunction::ScaleZ:
if (count == 1)
return FloatMatrix4x4(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, get_value(0), 0,
0, 0, 0, 1);
return Gfx::scale_matrix(Vector3 { 1.f, 1.f, get_value(0) });
break;
case TransformFunction::Rotate3d:
if (count == 4) {
@ -289,16 +250,16 @@ FloatMatrix4x4 TransformationStyleValue::to_matrix(Optional<Painting::PaintableB
break;
case TransformFunction::RotateX:
if (count == 1)
return Gfx::rotation_matrix({ 1.0f, 0.0f, 0.0f }, get_value(0));
return Gfx::rotation_matrix({ 1.f, 0.f, 0.f }, get_value(0));
break;
case TransformFunction::RotateY:
if (count == 1)
return Gfx::rotation_matrix({ 0.0f, 1.0f, 0.0f }, get_value(0));
return Gfx::rotation_matrix({ 0.f, 1.f, 0.f }, get_value(0));
break;
case TransformFunction::Rotate:
case TransformFunction::RotateZ:
if (count == 1)
return Gfx::rotation_matrix({ 0.0f, 0.0f, 1.0f }, get_value(0));
return Gfx::rotation_matrix({ 0.f, 0.f, 1.f }, get_value(0));
break;
case TransformFunction::Skew:
if (count == 1)

9
Libraries/LibWeb/Painting/AccumulatedVisualContext.cpp
View file

@ -11,8 +11,6 @@
#include <LibIPC/Decoder.h>
#include <LibIPC/Encoder.h>
#include <LibWeb/CSS/ComputedValues.h>
#include <LibWeb/CSS/PropertyID.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/TransformationStyleValue.h>
#include <LibWeb/CSS/VisualViewport.h>
#include <LibWeb/DOM/Document.h>
@ -138,9 +136,10 @@ static Optional<Gfx::FloatMatrix4x4> compute_perspective_matrix(PaintableBox con
// 3. Multiply by the matrix that would be obtained from the 'perspective()' transform function, where the
// length is provided by the value of the perspective property
// NB: Length values less than 1px being clamped to 1px is handled by the perspective() function already.
// FIXME: Create the matrix directly.
perspective_matrix = perspective_matrix * CSS::TransformationStyleValue::create(CSS::PropertyID::Transform, CSS::TransformFunction::Perspective, CSS::StyleValueVector { CSS::LengthStyleValue::create(CSS::Length::make_px(perspective.value())) })->to_matrix({});
// https://drafts.csswg.org/css-transforms-2/#funcdef-perspective
// If the depth value is less than '1px', it must be treated as '1px' for the purpose of rendering, [..]
auto distance = max(perspective->to_float(), 1.f);
perspective_matrix = perspective_matrix * Gfx::perspective_matrix(distance);
// 4. Translate by the negated computed X and Y values of 'perspective-origin'
perspective_matrix = perspective_matrix * Gfx::translation_matrix(Vector3<float>(-computed_x, -computed_y, 0));