diff options
Diffstat (limited to 'src/RoundedRectangle.cpp')
| -rw-r--r-- | src/RoundedRectangle.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/RoundedRectangle.cpp b/src/RoundedRectangle.cpp index 494a254..afd733f 100644 --- a/src/RoundedRectangle.cpp +++ b/src/RoundedRectangle.cpp @@ -5,7 +5,7 @@ namespace QuickMedia { RoundedRectangle::RoundedRectangle(sf::Vector2f size, float radius, sf::Color color, sf::Shader *rounded_rectangle_shader) : - radius(radius), pos(0.0f, 0.0f), size(size), rounded_rectangle_shader(rounded_rectangle_shader), band_y(0.0f), band_height(0.0f), band_color(sf::Color::Transparent) + radius(radius), pos(0.0f, 0.0f), size(size), rounded_rectangle_shader(rounded_rectangle_shader), band_color(sf::Color::Transparent) { assert(rounded_rectangle_shader); vertices[0].color = color; @@ -47,9 +47,9 @@ namespace QuickMedia { return size; } - void RoundedRectangle::set_band(float y, float height) { - band_y = y; - band_height = height; + void RoundedRectangle::set_band(sf::Vector2f pos, sf::Vector2f size) { + band_pos = pos; + band_size = size; } void RoundedRectangle::set_band_color(sf::Color color) { @@ -57,9 +57,10 @@ namespace QuickMedia { } void RoundedRectangle::draw(sf::RenderTarget &target) { + // TODO: Remove these for optimizations. Also do the same in other places where setUniform is called rounded_rectangle_shader->setUniform("radius", radius); - rounded_rectangle_shader->setUniform("band_y", band_y); - rounded_rectangle_shader->setUniform("band_height", band_height); + rounded_rectangle_shader->setUniform("band_pos", band_pos); + rounded_rectangle_shader->setUniform("band_size", band_size); rounded_rectangle_shader->setUniform("band_color", sf::Glsl::Vec4(band_color.r/255.0f, band_color.g/255.0f, band_color.b/255.0f, band_color.a/255.0f)); rounded_rectangle_shader->setUniform("resolution", size); target.draw(vertices, 4, sf::Quads, rounded_rectangle_shader); |