RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

LibGfx+LibSoftGPU: Add and use Vector.xy()

Browse source 
Also use `.xyz()` where appropriate.
This commit is contained in:
Jelle Raaijmakers 2022-03-06 19:12:01 +01:00 • committed by Andreas Kling
parent 439617cf6f
commit d75135663b
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibGfx/VectorN.h
View file

@ -201,7 +201,12 @@ public:
return AK::sqrt(m_data[0] * m_data[0] + m_data[1] * m_data[1] + m_data[2] * m_data[2] + m_data[3] * m_data[3]); return AK::sqrt(m_data[0] * m_data[0] + m_data[1] * m_data[1] + m_data[2] * m_data[2] + m_data[3] * m_data[3]);
} }
[[nodiscard]] constexpr VectorN<3, T> xyz() const requires(N == 4) [[nodiscard]] constexpr VectorN<2, T> xy() const requires(N >= 3)
{
return VectorN<2, T>(x(), y());
}
[[nodiscard]] constexpr VectorN<3, T> xyz() const requires(N >= 4)
{ {
return VectorN<3, T>(x(), y(), z()); return VectorN<3, T>(x(), y(), z());
} }

12
Userland/Libraries/LibSoftGPU/Device.cpp
View file

@ -192,9 +192,9 @@ void Device::rasterize_triangle(const Triangle& triangle)
Vertex const vertex2 = triangle.vertices[2]; Vertex const vertex2 = triangle.vertices[2];
// Calculate area of the triangle for later tests // Calculate area of the triangle for later tests
FloatVector2 const v0 { vertex0.window_coordinates.x(), vertex0.window_coordinates.y() }; FloatVector2 const v0 = vertex0.window_coordinates.xy();
FloatVector2 const v1 { vertex1.window_coordinates.x(), vertex1.window_coordinates.y() }; FloatVector2 const v1 = vertex1.window_coordinates.xy();
FloatVector2 const v2 { vertex2.window_coordinates.x(), vertex2.window_coordinates.y() }; FloatVector2 const v2 = vertex2.window_coordinates.xy();
auto const area = edge_function(v0, v1, v2); auto const area = edge_function(v0, v1, v2);
auto const one_over_area = 1.0f / area; auto const one_over_area = 1.0f / area;
@ -608,7 +608,7 @@ static void generate_texture_coordinates(Vertex& vertex, RasterizerOptions const
} }
case TexCoordGenerationMode::SphereMap: { case TexCoordGenerationMode::SphereMap: {
auto const eye_unit = vertex.eye_coordinates.normalized(); auto const eye_unit = vertex.eye_coordinates.normalized();
FloatVector3 const eye_unit_xyz = { eye_unit.x(), eye_unit.y(), eye_unit.z() }; FloatVector3 const eye_unit_xyz = eye_unit.xyz();
auto const normal = vertex.normal; auto const normal = vertex.normal;
auto reflection = eye_unit_xyz - normal * 2 * normal.dot(eye_unit_xyz); auto reflection = eye_unit_xyz - normal * 2 * normal.dot(eye_unit_xyz);
reflection.set_z(reflection.z() + 1); reflection.set_z(reflection.z() + 1);
@ -617,7 +617,7 @@ static void generate_texture_coordinates(Vertex& vertex, RasterizerOptions const
} }
case TexCoordGenerationMode::ReflectionMap: { case TexCoordGenerationMode::ReflectionMap: {
auto const eye_unit = vertex.eye_coordinates.normalized(); auto const eye_unit = vertex.eye_coordinates.normalized();
FloatVector3 const eye_unit_xyz = { eye_unit.x(), eye_unit.y(), eye_unit.z() }; FloatVector3 const eye_unit_xyz = eye_unit.xyz();
auto const normal = vertex.normal; auto const normal = vertex.normal;
auto reflection = eye_unit_xyz - normal * 2 * normal.dot(eye_unit_xyz); auto reflection = eye_unit_xyz - normal * 2 * normal.dot(eye_unit_xyz);
switch (config_index) { switch (config_index) {
@ -995,7 +995,7 @@ ALWAYS_INLINE void Device::shade_fragments(PixelQuad& quad)
// FIXME: implement GL_TEXTURE_1D, GL_TEXTURE_3D and GL_TEXTURE_CUBE_MAP // FIXME: implement GL_TEXTURE_1D, GL_TEXTURE_3D and GL_TEXTURE_CUBE_MAP
auto const& sampler = m_samplers[i]; auto const& sampler = m_samplers[i];
auto texel = sampler.sample_2d({ quad.texture_coordinates[i].x(), quad.texture_coordinates[i].y() }); auto texel = sampler.sample_2d(quad.texture_coordinates[i].xy());
INCREASE_STATISTICS_COUNTER(g_num_sampler_calls, 1); INCREASE_STATISTICS_COUNTER(g_num_sampler_calls, 1);
// FIXME: Implement more blend modes // FIXME: Implement more blend modes