Fixed some bugs, added fade out for key press visualization

Author: JekiTheMonkey

Headers/Application.hpp

@@ -26,6 +26,7 @@ class Application
 
         static unsigned getWindowWidth();
         static unsigned getWindowHeight();
+        static sf::IntRect getWindowRect();
 
         static bool parameterIdMatches(LogicalParameter::ID id);
 

Headers/GfxButton.hpp

@@ -4,13 +4,13 @@
 #include <SFML/Graphics/Transformable.hpp>
 #include <SFML/Graphics/Sprite.hpp>
 #include <SFML/Graphics/Text.hpp>
+#include <SFML/Graphics/RectangleShape.hpp>
 
 #include "ResourceIdentifiers.hpp"
 
 #include <array>
 #include <memory>
 
-#include <SFML/Graphics/RectangleShape.hpp>
 
 
 class GfxButton : public sf::Drawable, public sf::Transformable
@@ -60,8 +60,6 @@ class GfxButton : public sf::Drawable, public sf::Transformable
         void resetAssets();
         void scaleSprites();
 
-        void removeOutOfViewPressRects();
-
         // Light animation
         void lightKey();
         void fadeKey();
@@ -79,10 +77,37 @@ class GfxButton : public sf::Drawable, public sf::Transformable
         std::array<std::unique_ptr<sf::Text>, TextID::TextIdCounter> mTexts;
 
 
+    private:
+        class RectEmitter : public sf::Drawable
+        {
+            public:
+                RectEmitter();
+
+                void update(bool buttonPressed);
+                void draw(sf::RenderTarget &target, sf::RenderStates states) const override;
+
+                void setPosition(sf::Vector2f position);
+                void create(sf::Vector2f buttonSize);
+
+
+            private:
+                sf::Transform getPressRectTransform(sf::Transform transform) const;
+                float getVertexProgress(size_t vertexNumber, float vertexHeight) const;
+
+
+            private:
+                sf::VertexArray mVertecies;
+                std::vector<size_t> mAvailableRectIndices;
+                std::vector<size_t> mUsedRectIndices;
+                sf::Vector2f mEmitterPosition;
+                sf::Vector2f mLastRectSize;
+        };
+
+
     private:
         const TextureHolder &mTextures;
         const FontHolder &mFonts;
-        std::vector<sf::RectangleShape> mPressRects;
+        RectEmitter mEmitter;
         sf::RectangleShape mBounds;
 
         bool mLastKeyState;

Headers/LogicalParameter.hpp

@@ -178,6 +178,7 @@ struct LogicalParameter
             KeyPressVisToggle,
             KeyPressVisSpeed,
             KeyPressVisRotation,
+            KeyPressVisFadeLineLen,
             KeyPressVisOrig,
             KeyPressVisColor,
 

Headers/ParameterLine.hpp

@@ -198,6 +198,7 @@ class ParameterLine : public sf::Drawable, public sf::Transformable, public std:
             KeyPressVisToggle,
             KeyPressVisSpeed,
             KeyPressVisRotation,
+            KeyPressVisFadeLineLen,
             KeyPressVisOrig,
             KeyPressVisColor,
             KeyPressVisMty,

Headers/Settings.hpp

@@ -118,6 +118,7 @@ namespace Settings
     extern bool KeyPressVisToggle;
     extern float KeyPressVisSpeed;
     extern float KeyPressVisRotation;
+    extern float KeyPressVisFadeLineLen;
     extern sf::Vector2f KeyPressVisOrig;
     extern sf::Color KeyPressVisColor;
 

Source/Application.cpp

@@ -486,6 +486,12 @@ unsigned Application::getWindowHeight()
     return height > 0 ? height : 100;
 }
 
+sf::IntRect Application::getWindowRect()
+{
+    return { { }, sf::Vector2i(getWindowWidth(), getWindowHeight()) };
+}
+
+
 bool Application::parameterIdMatches(LogicalParameter::ID id)
 {
     return

Source/Button.cpp

@@ -194,5 +194,7 @@ bool Button::parameterIdMatches(LogicalParameter::ID id)
         id == LogicalParameter::ID::BtnGfxBtnos14 ||
         id == LogicalParameter::ID::BtnGfxSz14 ||
         id == LogicalParameter::ID::BtnGfxBtnos15 ||
-        id == LogicalParameter::ID::BtnGfxSz15;
+        id == LogicalParameter::ID::BtnGfxSz15 ||
+        id == LogicalParameter::ID::KeyPressVisRotation ||
+        id == LogicalParameter::ID::KeyPressVisFadeLineLen;
 }