From 6c442930ca3bef5c3e9e6a75d8aa1d93fe4eb3e1 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 12 Jun 2021 09:01:03 +0200 Subject: Better drop shadow, smoother edge for rectangle, drop shadow for download menu --- src/RoundedRectangle.cpp | 74 ++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 28 deletions(-) (limited to 'src/RoundedRectangle.cpp') diff --git a/src/RoundedRectangle.cpp b/src/RoundedRectangle.cpp index 33d7d64..f9b79c4 100644 --- a/src/RoundedRectangle.cpp +++ b/src/RoundedRectangle.cpp @@ -16,29 +16,21 @@ namespace QuickMedia { const sf::Color shadow_color(0, 0, 0, 50); - // Top - drop_shadow_vertices[0].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[1].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[2].color = shadow_color; - drop_shadow_vertices[3].color = shadow_color; - - // Bottom - drop_shadow_vertices[4].color = shadow_color; - drop_shadow_vertices[5].color = shadow_color; - drop_shadow_vertices[6].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[7].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - - // Left - drop_shadow_vertices[8].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[9].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[10].color = shadow_color; - drop_shadow_vertices[11].color = shadow_color; - - // Right - drop_shadow_vertices[12].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[13].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); - drop_shadow_vertices[14].color = shadow_color; - drop_shadow_vertices[15].color = shadow_color; + // Sides + for(size_t i = 0; i < 16; i += 4) { + drop_shadow_vertices[i + 0].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); + drop_shadow_vertices[i + 1].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); + drop_shadow_vertices[i + 2].color = shadow_color; + drop_shadow_vertices[i + 3].color = shadow_color; + } + + // Corners + for(size_t i = 16; i < 32; i += 4) { + drop_shadow_vertices[i + 0].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); + drop_shadow_vertices[i + 1].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); + drop_shadow_vertices[i + 2].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 0); + drop_shadow_vertices[i + 3].color = sf::Color(shadow_color.r, shadow_color.g, shadow_color.b, 100); + } } void RoundedRectangle::set_position(sf::Vector2f pos) { @@ -57,10 +49,10 @@ namespace QuickMedia { drop_shadow_vertices[3].position = pos + sf::Vector2f(radius*0.5f, 0.0f); // Bottom - drop_shadow_vertices[4].position = pos + sf::Vector2f(radius*0.5f, size.y); - drop_shadow_vertices[5].position = pos + size - sf::Vector2f(radius*0.5f, 0.0f); - drop_shadow_vertices[6].position = pos + size - sf::Vector2f(radius*0.5f, 0.0f) + sf::Vector2f(0.0f, shadow_radius); - drop_shadow_vertices[7].position = pos + sf::Vector2f(radius*0.5f, size.y) + sf::Vector2f(0.0f, shadow_radius); + drop_shadow_vertices[4].position = pos + sf::Vector2f(size.x - radius*0.5f, size.y + shadow_radius); + drop_shadow_vertices[5].position = pos + sf::Vector2f(radius*0.5f, size.y + shadow_radius); + drop_shadow_vertices[6].position = pos + sf::Vector2f(radius*0.5f, size.y); + drop_shadow_vertices[7].position = pos + sf::Vector2f(size.x - radius*0.5f, size.y); // Left drop_shadow_vertices[8].position = pos + sf::Vector2f(-shadow_radius, size.y - radius*0.5f); @@ -73,6 +65,32 @@ namespace QuickMedia { drop_shadow_vertices[13].position = pos + sf::Vector2f(size.x + shadow_radius, size.y - radius*0.5f); drop_shadow_vertices[14].position = pos + sf::Vector2f(size.x, size.y - radius*0.5f); drop_shadow_vertices[15].position = pos + sf::Vector2f(size.x, radius*0.5f); + + const float overshoot = 1.7f; + + // Top left + drop_shadow_vertices[16].position = pos + sf::Vector2f(-shadow_radius, radius*0.5f); + drop_shadow_vertices[17].position = pos + sf::Vector2f(-shadow_radius*overshoot, -shadow_radius*overshoot); + drop_shadow_vertices[18].position = pos + sf::Vector2f(radius*0.5f, -shadow_radius); + drop_shadow_vertices[19].position = pos + sf::Vector2f(radius*0.5f, radius*0.5f); + + // Top right + drop_shadow_vertices[20].position = pos + sf::Vector2f(size.x - radius*0.5f, -shadow_radius); + drop_shadow_vertices[21].position = pos + sf::Vector2f(size.x + shadow_radius*overshoot, -shadow_radius*overshoot); + drop_shadow_vertices[22].position = pos + sf::Vector2f(size.x + shadow_radius, radius*0.5f); + drop_shadow_vertices[23].position = pos + sf::Vector2f(size.x - radius*0.5f, radius*0.5f); + + // Bottom right + drop_shadow_vertices[24].position = pos + sf::Vector2f(size.x + shadow_radius, size.y - radius*0.5f); + drop_shadow_vertices[25].position = pos + sf::Vector2f(size.x + shadow_radius*overshoot, size.y + shadow_radius*overshoot); + drop_shadow_vertices[26].position = pos + sf::Vector2f(size.x - radius*0.5f, size.y + shadow_radius); + drop_shadow_vertices[27].position = pos + sf::Vector2f(size.x - radius*0.5f, size.y - radius*0.5f); + + // Bottom left + drop_shadow_vertices[28].position = pos + sf::Vector2f(radius*0.5f, size.y + shadow_radius); + drop_shadow_vertices[29].position = pos + sf::Vector2f(-shadow_radius*overshoot, size.y + shadow_radius*overshoot); + drop_shadow_vertices[30].position = pos + sf::Vector2f(-shadow_radius, size.y - radius*0.5f); + drop_shadow_vertices[31].position = pos + sf::Vector2f(radius*0.5f, size.y - radius*0.5f); } void RoundedRectangle::set_size(sf::Vector2f size) { @@ -104,7 +122,7 @@ namespace QuickMedia { void RoundedRectangle::draw(sf::RenderTarget &target) { if(drop_shadow_enabled) - target.draw(drop_shadow_vertices, 16, sf::Quads); + target.draw(drop_shadow_vertices, 32, sf::Quads); // TODO: Remove these for optimizations. Also do the same in other places where setUniform is called rounded_rectangle_shader->setUniform("radius", radius); -- cgit v1.2.3